Merge pull request #2585 from Defman21/pr/commando-multifolder-tip

Commando: show a tip when next/previous/current item is not available…
Komodo · Jul 16, 2019 · 89c9134 · 89c9134
2 parents 0a368bf + af430af
commit 89c9134
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/src/modules/commando/content/sdk/commando.js b/src/modules/commando/content/sdk/commando.js
@@ -1699,9 +1699,16 @@
             {
                 resultElem.addItemToSelection(sibling);
                 resultElem.ensureElementIsVisible(sibling);
+                c.tip("Selected " + resultElem.selectedCount + " items");
+            } else if (!selItem.resultData.allowMultiSelect) {
+                c.tip("Cannot expand selection to item meant for single selection only");
+            } else if (sibling || !sibling.resultData.allowMultiSelect) {
+                let tip = 'Cannot expand selection to item meant for single selection only';
+                if (resultElem.selectedCount > 1) {
+                    tip += `, selected ${resultElem.selectedCount} items`;
+                }
+                c.tip(tip);
             }
-
-            c.tip("Selected " + resultElem.selectedCount + " items");
         }
         else
         {
@@ -1770,9 +1777,16 @@
             {
                 resultElem.addItemToSelection(sibling);
                 resultElem.ensureElementIsVisible(sibling);
+                c.tip("Selected " + resultElem.selectedCount + " items");
+            } else if (!selItem.resultData.allowMultiSelect) {
+                c.tip("Cannot expand selection to item meant for single selection only");
+            } else if (sibling || !sibling.resultData.allowMultiSelect) {
+                let tip = 'Cannot expand selection to item meant for single selection only';
+                if (resultElem.selectedCount > 1) {
+                    tip += `, selected ${resultElem.selectedCount} items`;
+                }
+                c.tip(tip);
             }
-
-            c.tip("Selected " + resultElem.selectedCount + " items");
         }
         else
         {