diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-08-14 15:13:04 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-08-14 15:13:04 -0400 |
commit | 9036dd99aa8ba2d9cdd6066a833862bbd9e2653a (patch) | |
tree | 41a18a9bcbbcc7cd961cc424878ac37aade5c288 /web/react/components/post_body.jsx | |
parent | b9aef9f2a6b90663cb7ba4ff9e42560c145b631d (diff) | |
parent | 26a8e19a357aee9e1b39623e604ce92bdfaa00df (diff) | |
download | chat-9036dd99aa8ba2d9cdd6066a833862bbd9e2653a.tar.gz chat-9036dd99aa8ba2d9cdd6066a833862bbd9e2653a.tar.bz2 chat-9036dd99aa8ba2d9cdd6066a833862bbd9e2653a.zip |
Merge pull request #382 from mattermost/revert-360-mm-375d
Revert "MM-375 Adds text formatting features using a modified version…
Diffstat (limited to 'web/react/components/post_body.jsx')
-rw-r--r-- | web/react/components/post_body.jsx | 78 |
1 files changed, 30 insertions, 48 deletions
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx index fab6833e6..860c96d84 100644 --- a/web/react/components/post_body.jsx +++ b/web/react/components/post_body.jsx @@ -4,69 +4,59 @@ var FileAttachmentList = require('./file_attachment_list.jsx'); var UserStore = require('../stores/user_store.jsx'); var utils = require('../utils/utils.jsx'); -var formatText = require('../../static/js/marked/lib/marked.js'); module.exports = React.createClass({ componentWillReceiveProps: function(nextProps) { var linkData = utils.extractLinks(nextProps.post.message); - this.setState({links: linkData.links, message: linkData.text}); + this.setState({ links: linkData["links"], message: linkData["text"] }); }, getInitialState: function() { var linkData = utils.extractLinks(this.props.post.message); - return {links: linkData.links, message: linkData.text}; + return { links: linkData["links"], message: linkData["text"] }; }, render: function() { var post = this.props.post; var filenames = this.props.post.filenames; var parentPost = this.props.parentPost; var inner = utils.textToJsx(this.state.message); - var allowTextFormatting = config.AllowTextFormatting; - var comment = ''; - var postClass = ''; + var comment = ""; + var reply = ""; + var postClass = ""; if (parentPost) { var profile = UserStore.getProfile(parentPost.user_id); - var apostrophe = ''; - var name = '...'; + var apostrophe = ""; + var name = "..."; if (profile != null) { if (profile.username.slice(-1) === 's') { apostrophe = "'"; } else { apostrophe = "'s"; } - name = <a className='theme' onClick={utils.searchForTerm.bind(this, profile.username)}>{profile.username}</a>; + name = <a className="theme" onClick={function(){ utils.searchForTerm(profile.username); }}>{profile.username}</a>; } - var message = ''; - if (parentPost.message) { - message = utils.replaceHtmlEntities(parentPost.message); + var message = "" + if(parentPost.message) { + message = utils.replaceHtmlEntities(parentPost.message) } else if (parentPost.filenames.length) { message = parentPost.filenames[0].split('/').pop(); if (parentPost.filenames.length === 2) { - message += ' plus 1 other file'; + message += " plus 1 other file"; } else if (parentPost.filenames.length > 2) { - message += ' plus ' + (parentPost.filenames.length - 1) + ' other files'; + message += " plus " + (parentPost.filenames.length - 1) + " other files"; } } - if (allowTextFormatting) { - message = formatText(message, {sanitize: true, mangle: false, gfm: true, breaks: true, tables: false, smartypants: true, renderer: utils.customMarkedRenderer({disable: true})}); - comment = ( - <p className='post-link'> - <span>Commented on {name}{apostrophe} message: <a className='theme' onClick={this.props.handleCommentClick} dangerouslySetInnerHTML={{__html: message}} /></span> - </p> - ); - } else { - comment = ( - <p className='post-link'> - <span>Commented on {name}{apostrophe} message: <a className='theme' onClick={this.props.handleCommentClick}>{message}</a></span> - </p> - ); - } + comment = ( + <p className="post-link"> + <span>Commented on {name}{apostrophe} message: <a className="theme" onClick={this.props.handleCommentClick}>{message}</a></span> + </p> + ); - postClass += ' post-comment'; + postClass += " post-comment"; } var embed; @@ -74,26 +64,18 @@ module.exports = React.createClass({ embed = utils.getEmbed(this.state.links[0]); } - var innerHolder = <p key={post.id + '_message'} className={postClass}><span>{inner}</span></p>; - if (allowTextFormatting) { - innerHolder = <div key={post.id + '_message'} className={postClass}><span>{inner}</span></div>; - } - - var fileAttachmentHolder = ''; - if (filenames && filenames.length > 0) { - fileAttachmentHolder = (<FileAttachmentList - filenames={filenames} - modalId={'view_image_modal_' + post.id} - channelId={post.channel_id} - userId={post.user_id} />); - } - return ( - <div className='post-body'> - {comment} - {innerHolder} - {fileAttachmentHolder} - {embed} + <div className="post-body"> + { comment } + <p key={post.id+"_message"} className={postClass}><span>{inner}</span></p> + { filenames && filenames.length > 0 ? + <FileAttachmentList + filenames={filenames} + modalId={"view_image_modal_" + post.id} + channelId={post.channel_id} + userId={post.user_id} /> + : "" } + { embed } </div> ); } |