From d3ed791ab52eaddb7690869bb1cd982453badd95 Mon Sep 17 00:00:00 2001
From: Florian Orben <florian.orben@gmail.com>
Date: Sat, 31 Oct 2015 03:22:02 +0100
Subject: attachments frontend

---
 web/react/components/post_body.jsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'web/react/components/post_body.jsx')

diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index e4094daf3..4da13dace 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -7,6 +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');
 
 export default class PostBody extends React.Component {
     constructor(props) {
@@ -316,6 +317,15 @@ 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}
@@ -331,6 +341,7 @@ export default class PostBody extends React.Component {
                         dangerouslySetInnerHTML={{__html: TextFormatting.formatText(this.state.message)}}
                     />
                 </div>
+                {postAttachments}
                 {fileAttachmentHolder}
                 {embed}
             </div>
-- 
cgit v1.2.3-1-g7c22


From b085bc2d56bdc98101b8cb50848aee248d42af28 Mon Sep 17 00:00:00 2001
From: Florian Orben <florian.orben@gmail.com>
Date: Thu, 5 Nov 2015 23:32:44 +0100
Subject: PLT-857: Support  for Incoming Webhooks - Try #2

---
 web/react/components/post_body.jsx | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'web/react/components/post_body.jsx')

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>
-- 
cgit v1.2.3-1-g7c22

