Changed PostStore to not clear a deleted post's message

5 files changed, 27 insertions, 22 deletions

diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index ed672cd34..3dfc91970 100644
--- a/web/react/components/create_post.jsx
+++ b/web/react/components/create_post.jsx
@@ -40,10 +40,6 @@ const holders = defineMessages({
     write: {
         id: 'create_post.write',
         defaultMessage: 'Write a message...'
-    },
-    deleteMsg: {
-        id: 'create_post.deleteMsg',
-        defaultMessage: '(message deleted)'
     }
 });
 
@@ -70,7 +66,6 @@ class CreatePost extends React.Component {
         this.sendMessage = this.sendMessage.bind(this);
 
         PostStore.clearDraftUploads();
-        PostStore.deleteMessage(this.props.intl.formatMessage(holders.deleteMsg));
 
         const draft = this.getCurrentDraft();
 
@@ -511,4 +506,4 @@ CreatePost.propTypes = {
     intl: intlShape.isRequired
 };
 
-export default injectIntl(CreatePost);
\ No newline at end of file
+export default injectIntl(CreatePost);
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 16f8528b2..d71ac6ec7 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -44,7 +44,6 @@ class PostBody extends React.Component {
 
         this.state = {
             links: linkData.links,
-            message: linkData.text,
             post: this.props.post,
             hasUserProfiles: profiles && Object.keys(profiles).length > 1
         };
@@ -106,7 +105,9 @@ class PostBody extends React.Component {
         if (this.props.post.filenames.length === 0 && this.state.links && this.state.links.length > 0) {
             this.embed = this.createEmbed(linkData.links[0]);
         }
-        this.setState({links: linkData.links, message: linkData.text});
+        this.setState({
+            links: linkData.links
+        });
     }
 
     createEmbed(link) {
@@ -310,6 +311,23 @@ class PostBody extends React.Component {
             );
         }
 
+        let message;
+        if (this.props.post.state === Constants.POST_DELETED) {
+            message = (
+                <FormattedMessage
+                    id='post_body.deleted'
+                    defaultMessage='(message deleted)'
+                />
+            );
+        } else {
+            message = (
+                <span
+                    onClick={TextFormatting.handleClick}
+                    dangerouslySetInnerHTML={{__html: TextFormatting.formatText(this.props.post.message)}}
+                />
+            );
+        }
+
         return (
             <div>
                 {comment}
@@ -320,11 +338,7 @@ class PostBody extends React.Component {
                         className={postClass}
                     >
                         {loading}
-                        <span
-                            ref='message_span'
-                            onClick={TextFormatting.handleClick}
-                            dangerouslySetInnerHTML={{__html: TextFormatting.formatText(this.state.message)}}
-                        />
+                        {message}
                     </div>
                     <PostBodyAdditionalContent
                         post={this.state.post}
@@ -346,4 +360,4 @@ PostBody.propTypes = {
     handleCommentClick: React.PropTypes.func.isRequired
 };
 
-export default injectIntl(PostBody);
\ No newline at end of file
+export default injectIntl(PostBody);
diff --git a/web/react/stores/post_store.jsx b/web/react/stores/post_store.jsx
index 93e565403..a504fef89 100644
--- a/web/react/stores/post_store.jsx
+++ b/web/react/stores/post_store.jsx
@@ -341,7 +341,6 @@ class PostStoreClass extends EventEmitter {
         if (post.id in postList.posts) {
             // make sure to copy the post so that component state changes work properly
             postList.posts[post.id] = Object.assign({}, post, {
-                message: this.delete_message, // TODO
                 state: Constants.POST_DELETED,
                 filenames: [],
                 ephemeral: true
@@ -534,9 +533,6 @@ class PostStoreClass extends EventEmitter {
 
         return commentCount;
     }
-    deleteMessage(msg) {
-        this.delete_message = msg;
-    }
 }
 
 var PostStore = new PostStoreClass();
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index aaffc6ea7..91fa3ae09 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -562,7 +562,6 @@
   "create_post.comment": "Comment",
   "create_post.post": "Post",
   "create_post.write": "Write a message...",
-  "create_post.deleteMsg": "(message deleted)",
   "create_post.tutorialTip": "<h4>Sending Messages</h4><p>Type here to write a message and press <strong>Enter</strong> to post it.</p><p>Click the <strong>Attachment</strong> button to upload an image or a file.</p>",
   "delete_channel.channel": "channel",
   "delete_channel.group": "group",
@@ -768,6 +767,7 @@
   "members_popover.title": "Members",
   "post_attachment.collapse": "▲ collapse text",
   "post_attachment.more": "▼ read more",
+  "post_body.deleted": "(message deleted)",
   "post_body.plusOne": " plus 1 other file",
   "post_body.plusMore": " plus {count} other files",
   "post_body.commentedOn": "Commented on {name}{apostrophe} message: ",
@@ -1220,4 +1220,4 @@
   "intro_messages.beginning": "Beginning of {name}",
   "intro_messages.invite": "Invite others to this {type}",
   "intro_messages.setHeader": "Set a Header"
-}
\ No newline at end of file
+}
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index 981e1f06f..98cb2db66 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -589,7 +589,6 @@
   "create_comment.file": "Subiendo archivo",
   "create_comment.files": "Subiendo archivos",
   "create_post.comment": "Comentario",
-  "create_post.deleteMsg": "(mensaje eliminado)",
   "create_post.post": "Mensaje",
   "create_post.tutorialTip": "<h4>Enviar Mensajes</h4> <p>Escribe aquí para redactar un mensaje y presiona <strong>Retorno</strong> para enviarlo.</p><p>Pincha el botón de <strong>Adjuntar</strong> para subir una imagen o archivo.</p>",
   "create_post.write": "Escribe un mensaje...",
@@ -809,6 +808,7 @@
   "post_attachment.collapse": "▲ colapsar texto",
   "post_attachment.more": "▼ leer más",
   "post_body.commentedOn": "Comentó el mensaje de {name}{apostrophe}: ",
+  "post_body.deleted": "(mensaje eliminado)",
   "post_body.plusMore": " más {count} otros archivos",
   "post_body.plusOne": " más 1 archivo",
   "post_body.retry": "Reintentar",
@@ -1220,4 +1220,4 @@
   "view_image_popover.download": "Descargar",
   "view_image_popover.file": "Archivo {count} de {total}",
   "view_image_popover.publicLink": "Obtener Enlace Público"
-}
\ No newline at end of file
+}