(fix) prevent deletion of special folders using del key (fixes #4396)

2018-03-13 13:05:53 -04:00 · 2018-03-13 13:05:53 -04:00 · c1e9e355ec
parent 5545c9f26e
commit c1e9e355ec
2 changed files with 7 additions and 1 deletions
--- a/6
+++ b/6
@ -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)
 ------------------

--- 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);
          }
        }));