From 6a5cdd5cdf09317ce259dd146fc4f1cb76d8b9b6 Mon Sep 17 00:00:00 2001
From: Debanshu Kundu <debanshu.kundu@joshtechnologygroup.com>
Date: Mon, 19 Dec 2016 19:35:39 +0530
Subject: PLT-135 Showing "(Edited)" indicator if a message has been edited.
 (#4764)

---
 .../components/post_message_container.jsx          |  2 +-
 .../post_view/components/post_message_view.jsx     | 38 ++++++++++++++++++----
 2 files changed, 32 insertions(+), 8 deletions(-)

(limited to 'webapp/components/post_view')

diff --git a/webapp/components/post_view/components/post_message_container.jsx b/webapp/components/post_view/components/post_message_container.jsx
index 2d17e74c4..4e27cd29a 100644
--- a/webapp/components/post_view/components/post_message_container.jsx
+++ b/webapp/components/post_view/components/post_message_container.jsx
@@ -89,7 +89,7 @@ export default class PostMessageContainer extends React.Component {
         return (
             <PostMessageView
                 options={this.props.options}
-                message={this.props.post.message}
+                post={this.props.post}
                 emojis={this.state.emojis}
                 enableFormatting={this.state.enableFormatting}
                 mentionKeys={this.state.mentionKeys}
diff --git a/webapp/components/post_view/components/post_message_view.jsx b/webapp/components/post_view/components/post_message_view.jsx
index 24f96a8d9..eff791aec 100644
--- a/webapp/components/post_view/components/post_message_view.jsx
+++ b/webapp/components/post_view/components/post_message_view.jsx
@@ -2,14 +2,16 @@
 // See License.txt for license information.
 
 import React from 'react';
+import {FormattedMessage} from 'react-intl';
 
 import * as TextFormatting from 'utils/text_formatting.jsx';
 import * as Utils from 'utils/utils.jsx';
+import * as PostUtils from 'utils/post_utils.jsx';
 
 export default class PostMessageView extends React.Component {
     static propTypes = {
         options: React.PropTypes.object.isRequired,
-        message: React.PropTypes.string.isRequired,
+        post: React.PropTypes.object.isRequired,
         emojis: React.PropTypes.object.isRequired,
         enableFormatting: React.PropTypes.bool.isRequired,
         mentionKeys: React.PropTypes.arrayOf(React.PropTypes.string).isRequired,
@@ -23,7 +25,7 @@ export default class PostMessageView extends React.Component {
             return true;
         }
 
-        if (nextProps.message !== this.props.message) {
+        if (nextProps.post.message !== this.props.post.message) {
             return true;
         }
 
@@ -47,9 +49,28 @@ export default class PostMessageView extends React.Component {
         return false;
     }
 
+    editedIndicator() {
+        return (
+            PostUtils.isEdited(this.props.post) ?
+                <span className='edited'>
+                    <FormattedMessage
+                        id='post_message_view.edited'
+                        defaultMessage='(edited)'
+                    />
+                </span> :
+                ''
+        );
+    }
+
     render() {
         if (!this.props.enableFormatting) {
-            return <span>{this.props.message}</span>;
+            return (
+                <span>
+                    {this.props.post.message}
+                    &nbsp;
+                    {this.editedIndicator()}
+                </span>
+            );
         }
 
         const options = Object.assign({}, this.props.options, {
@@ -62,10 +83,13 @@ export default class PostMessageView extends React.Component {
         });
 
         return (
-            <span
-                onClick={Utils.handleFormattedTextClick}
-                dangerouslySetInnerHTML={{__html: TextFormatting.formatText(this.props.message, options)}}
-            />
+            <div>
+                <span
+                    onClick={Utils.handleFormattedTextClick}
+                    dangerouslySetInnerHTML={{__html: TextFormatting.formatText(this.props.post.message, options)}}
+                />
+                {this.editedIndicator()}
+            </div>
         );
     }
 }
-- 
cgit v1.2.3-1-g7c22