From c4a95218fac1be751d684ddc1520eb0381f285c4 Mon Sep 17 00:00:00 2001 From: Beaudan Brown Date: Wed, 4 Sep 2019 15:54:22 +1000 Subject: [PATCH] Make even smaller --- js/views/conversation_view.js | 36 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js index f2408024b..94299aab8 100644 --- a/js/views/conversation_view.js +++ b/js/views/conversation_view.js @@ -1296,34 +1296,26 @@ ? i18n('deletePublicWarning') : i18n('deleteWarning'); - const resolve = this.model.isPublic() - ? async () => { + const dialog = new Whisper.ConfirmationDialogView({ + message: warningMessage, + okText: i18n('delete'), + resolve: async () => { + if (this.model.isPublic()) { const success = await this.model.deletePublicMessage(message); if (!success) { // Message failed to delete from server, show error? return; } - await window.Signal.Data.removeMessage(message.id, { - Message: Whisper.Message, - }); - message.trigger('unload'); - this.resetPanel(); - this.updateHeader(); - } - : () => { - window.Signal.Data.removeMessage(message.id, { - Message: Whisper.Message, - }); - message.trigger('unload'); + } else { this.model.messageCollection.remove(message.id); - this.resetPanel(); - this.updateHeader(); - }; - - const dialog = new Whisper.ConfirmationDialogView({ - message: warningMessage, - okText: i18n('delete'), - resolve, + } + await window.Signal.Data.removeMessage(message.id, { + Message: Whisper.Message, + }); + message.trigger('unload'); + this.resetPanel(); + this.updateHeader(); + }, }); this.$el.prepend(dialog.el);