Bug 1322838 - Check for selected directory better. r=aceman a=jorgk

mail/components/addrbook/content/abCommon.js

@@ -66,23 +66,23 @@ var DirPaneController =
       case "cmd_delete":
       case "button_delete": {
         let selectedDir = getSelectedDirectory();
+        if (!selectedDir)
+          return false;
         let selectedDirURI = selectedDir.URI;
 
         // Context-sensitive labels for Edit > Delete menuitem.
         // We only have ABs or Mailing Lists in the directory pane.
         // For contacts and mixed selections, the label is set in
         // ResultsPaneController in abResultsPane.js.
-        if (command == "cmd_delete" && selectedDir) {
+        if (command == "cmd_delete") {
           goSetMenuValue(command, selectedDir.isMailList ?
                                   "valueList" : "valueAddressBook");
         }
 
-        // If there's no directory selected, or if it's one of these special ABs,
+        // If it's one of these special ABs, return false to disable deletion.
-        // return false to disable deletion.
+        if (selectedDirURI == kPersonalAddressbookURI ||
-        if (!selectedDir ||
+            selectedDirURI == kCollectedAddressbookURI ||
-             (selectedDirURI == kPersonalAddressbookURI) ||
+            selectedDirURI == (kAllDirectoryRoot + "?"))
-             (selectedDirURI == kCollectedAddressbookURI) ||
-             (selectedDirURI == (kAllDirectoryRoot + "?")))
           return false;
 
         // If the directory is a mailing list, and it is read-only,

suite/mailnews/addrbook/abCommon.js

@@ -55,19 +55,19 @@ var DirPaneController =
       case "cmd_delete":
       case "button_delete": {
         let selectedDir = getSelectedDirectory();
+        if (!selectedDir)
+          return false;
         let selectedDirURI = selectedDir.URI;
 
         // Context-sensitive labels for Edit > Delete menuitem.
-        if (command == "cmd_delete" && selectedDir) {
+        if (command == "cmd_delete") {
           goSetMenuValue(command, selectedDir.isMailList ?
                                   "valueList" : "valueAddressBook");
         }
 
-        // If there's no directory selected, or if it's one of these special ABs,
+        // If it's one of these special ABs, return false to disable deletion.
-        // return false to disable deletion.
+        if (selectedDirURI == kPersonalAddressbookURI ||
-        if (!selectedDir ||
+            selectedDirURI == kCollectedAddressbookURI)
-             (selectedDirURI == kPersonalAddressbookURI) ||
-             (selectedDirURI == kCollectedAddressbookURI))
           return false;
 
         // If the directory is a mailing list, and it is read-only,