From c1e9e355ecb07f49c67149297db3ab5968d5453f Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 13 Mar 2018 13:05:53 -0400 Subject: [PATCH] (fix) prevent deletion of special folders using del key (fixes #4396) --- NEWS | 6 ++++++ UI/WebServerResources/js/Mailer/MailboxesController.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 7480cbe71a..5c5c494673 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +4.0.1 (2018-03-XX) +------------------ + +Bug fixes + - [web] prevent deletion of special folders using del key + 4.0.0 (2018-03-07) ------------------ diff --git a/UI/WebServerResources/js/Mailer/MailboxesController.js b/UI/WebServerResources/js/Mailer/MailboxesController.js index 18ebbecae6..8dadbeb269 100644 --- a/UI/WebServerResources/js/Mailer/MailboxesController.js +++ b/UI/WebServerResources/js/Mailer/MailboxesController.js @@ -53,7 +53,7 @@ key: hotkey, description: l('Delete selected message or folder'), callback: function() { - if (Mailbox.selectedFolderController && Mailbox.selectedFolder && !Mailbox.selectedFolder.hasSelectedMessage()) + if (Mailbox.selectedFolderController && Mailbox.selectedFolder && Mailbox.selectedFolder.$isEditable && !Mailbox.selectedFolder.hasSelectedMessage()) Mailbox.selectedFolderController.confirmDelete(Mailbox.selectedFolder); } }));