From f8e542e8a932ade8b8a3db0c5f227ad8781b9ac5 Mon Sep 17 00:00:00 2001 From: rockhouse Date: Fri, 26 Jun 2015 20:33:26 +0200 Subject: [PATCH] Prevent system msg from being deleted and enable reactivity again --- client/lib/collections.coffee | 3 +++ client/methods/updateMessage.coffee | 4 ++-- client/views/app/room.coffee | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/client/lib/collections.coffee b/client/lib/collections.coffee index 1b5c116c1a2..e312eedc8af 100644 --- a/client/lib/collections.coffee +++ b/client/lib/collections.coffee @@ -13,3 +13,6 @@ Meteor.startup -> changed: (record) -> ChatMessageHistory.update {_id: record._id, msg: {$ne: record.msg}}, record + + removed: (record) -> + ChatMessageHistory.remove {_id: record._id} diff --git a/client/methods/updateMessage.coffee b/client/methods/updateMessage.coffee index 61721f46b73..edad5230784 100644 --- a/client/methods/updateMessage.coffee +++ b/client/methods/updateMessage.coffee @@ -21,7 +21,7 @@ Meteor.methods throw new Meteor.Error 203, t('general.User_logged_out') Tracker.nonreactive -> - - ChatMessageHistory.remove + + ChatMessage.remove _id: message.id 'u._id': Meteor.userId() diff --git a/client/views/app/room.coffee b/client/views/app/room.coffee index 3929dbdd511..bdbe1dcdecc 100644 --- a/client/views/app/room.coffee +++ b/client/views/app/room.coffee @@ -442,6 +442,8 @@ Template.room.events Session.set('showUserInfo', $(e.currentTarget).data('username')) 'click .delete-message': (event) -> + msg = event.currentTarget.parentNode.parentNode + return if msg.classList.contains("system") swal { title: t('Are_you_sure') text: t('You_will_not_be_able_to_recover') @@ -454,7 +456,7 @@ Template.room.events html: false }, -> swal t('Deleted'), t('Your_entry_has_been_deleted'), 'success' - ChatMessages.deleteMsg(event.currentTarget.parentNode.parentNode) + ChatMessages.deleteMsg(msg) Template.room.onCreated -> console.log 'room.onCreated' if window.rocketDebug