From 6ac116e91de6c05ab96c7b226d2ee20569f169b5 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Wed, 1 Mar 2017 14:56:55 -0300
Subject: [PATCH] added the file description edit

---
 client/methods/updateMessage.js               | 22 ++++++++++---------
 .../server/methods/updateMessage.js           |  2 +-
 .../rocketchat-ui/lib/chatMessages.coffee     |  8 ++++---
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/client/methods/updateMessage.js b/client/methods/updateMessage.js
index 878625ab7fa..d0074db17ee 100644
--- a/client/methods/updateMessage.js
+++ b/client/methods/updateMessage.js
@@ -52,16 +52,18 @@ Meteor.methods({
 
 			message = RocketChat.callbacks.run('beforeSaveMessage', message);
 
-			if (originalMessage.attachments[0].description) {
-				ChatMessage.update({
-					_id: message._id,
-					'u._id': Meteor.userId()
-				}, {
-					$set: {
-						'editedAt': message.editedAt,
-						'editedBy': message.editedBy
-					}
-				});
+			if (originalMessage.attachments) {
+				if (originalMessage.attachments[0].description !== undefined) {
+					ChatMessage.update({
+						_id: message._id,
+						'u._id': Meteor.userId()
+					}, {
+						$set: {
+							'editedAt': message.editedAt,
+							'editedBy': message.editedBy
+						}
+					});
+				}
 			} else {
 				ChatMessage.update({
 					_id: message._id,
diff --git a/packages/rocketchat-lib/server/methods/updateMessage.js b/packages/rocketchat-lib/server/methods/updateMessage.js
index abb01b6b5a6..93eccd430b3 100644
--- a/packages/rocketchat-lib/server/methods/updateMessage.js
+++ b/packages/rocketchat-lib/server/methods/updateMessage.js
@@ -34,7 +34,7 @@ Meteor.methods({
 		}
 
 		if (originalMessage.attachments) {
-			if (originalMessage.attachments.description) {
+			if (originalMessage.attachments[0].description !== undefined) {
 				message.attachments = originalMessage.attachments;
 				message.attachments[0].description = message.msg;
 				message.msg = originalMessage.msg;
diff --git a/packages/rocketchat-ui/lib/chatMessages.coffee b/packages/rocketchat-ui/lib/chatMessages.coffee
index 844ff680944..2b22a3b5f37 100644
--- a/packages/rocketchat-ui/lib/chatMessages.coffee
+++ b/packages/rocketchat-ui/lib/chatMessages.coffee
@@ -210,7 +210,9 @@ class @ChatMessages
 		# If edited message was emptied we ask for deletion
 		else if this.editing.element
 			message = this.getMessageById this.editing.id
-
+			if message.attachments? and message.attachments[0].description?
+				this.update(this.editing.id, rid, '', true)
+				return
 			# Restore original message in textbox in case delete is canceled
 			this.resetToDraft this.editing.id
 
@@ -271,8 +273,8 @@ class @ChatMessages
 			if error
 				return handleError(error)
 
-	update: (id, rid, msg) ->
-		if _.trim(msg) isnt ''
+	update: (id, rid, msg, isDescription) ->
+		if _.trim(msg) isnt '' or isDescription is true
 			Meteor.call 'updateMessage', { _id: id, msg: msg, rid: rid }
 			this.clearEditing()
 			this.stopTyping(rid)