diff options
author | Florian Orben <florian.orben@gmail.com> | 2015-11-05 23:32:44 +0100 |
---|---|---|
committer | Florian Orben <florian.orben@gmail.com> | 2015-11-05 23:33:21 +0100 |
commit | b085bc2d56bdc98101b8cb50848aee248d42af28 (patch) | |
tree | 9e19e790ed53aa1fbaa4b5c0c5574e03ae801577 /web/react/components/post_body.jsx | |
parent | 4b6eb56415c2085bc9078836b70b833b1e01a60d (diff) | |
download | chat-b085bc2d56bdc98101b8cb50848aee248d42af28.tar.gz chat-b085bc2d56bdc98101b8cb50848aee248d42af28.tar.bz2 chat-b085bc2d56bdc98101b8cb50848aee248d42af28.zip |
PLT-857: Support for Incoming Webhooks - Try #2
Diffstat (limited to 'web/react/components/post_body.jsx')
-rw-r--r-- | web/react/components/post_body.jsx | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx index 4da13dace..5a157b792 100644 --- a/web/react/components/post_body.jsx +++ b/web/react/components/post_body.jsx @@ -7,7 +7,7 @@ const Utils = require('../utils/utils.jsx'); const Constants = require('../utils/constants.jsx'); const TextFormatting = require('../utils/text_formatting.jsx'); const twemoji = require('twemoji'); -const PostAttachmentList = require('./post_attachment_list.jsx'); +const PostBodyAdditionalContent = require('./post_body_additional_content.jsx'); export default class PostBody extends React.Component { constructor(props) { @@ -317,15 +317,6 @@ export default class PostBody extends React.Component { ); } - let postAttachments = ''; - if (post.attachments && post.attachments.length) { - postAttachments = ( - <PostAttachmentList - attachments={post.attachments} - /> - ); - } - return ( <div className='post-body'> {comment} @@ -341,7 +332,9 @@ export default class PostBody extends React.Component { dangerouslySetInnerHTML={{__html: TextFormatting.formatText(this.state.message)}} /> </div> - {postAttachments} + <PostBodyAdditionalContent + post={post} + /> {fileAttachmentHolder} {embed} </div> |