Skip to content
Snippets Groups Projects
Commit 6f27eb10 authored by Gabriel Engel's avatar Gabriel Engel
Browse files

Merge pull request #2073 from wicked539/develop 

Closes #1981; Message edit mode remains after deleting the message
parents cd829c3f 9bbc8d84
No related merge requests found
Hide whitespace changes
Inline Side-by-side
packages/rocketchat-lib/client/MessageAction.coffee
+ 2
− 0
View file @ 6f27eb10
...@@ -113,6 +113,8 @@ Meteor.startup -> ...@@ -113,6 +113,8 @@ Meteor.startup ->
timer: 1000 timer: 1000
showConfirmButton: false showConfirmButton: false
if chatMessages[Session.get('openedRoom')].editing.id is message._id
chatMessages[Session.get('openedRoom')].clearEditing(message)
chatMessages[Session.get('openedRoom')].deleteMsg(message) chatMessages[Session.get('openedRoom')].deleteMsg(message)
validation: (message) -> validation: (message) ->
return RocketChat.authz.hasAtLeastOnePermission('delete-message', message.rid ) or RocketChat.settings.get('Message_AllowDeleting') and message.u?._id is Meteor.userId() return RocketChat.authz.hasAtLeastOnePermission('delete-message', message.rid ) or RocketChat.settings.get('Message_AllowDeleting') and message.u?._id is Meteor.userId()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment