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

Alinto · Mar 13, 2018 · c1e9e35 · c1e9e35
1 parent 5545c9f
commit c1e9e35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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);
           }
         }));