added the file description edit

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,

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;

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)