PLT-857: Support for Incoming Webhooks - Try #2

Этот коммит содержится в:
Florian Orben
2015-11-05 23:32:44 +01:00
родитель 4b6eb56415
Коммит b085bc2d56
10 изменённых файлов: 182 добавлений и 41 удалений

Просмотреть файл

@@ -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>