Add Ctrl+Alt+[+/-] shortcut keys for Expand/Collapse Stack

ithinc · ithinc · commit e01a7bf30658 · 2014-03-07T12:22:57.000+08:00
diff --git a/chrome/content/tabutils-st.js b/chrome/content/tabutils-st.js
@@ -67,6 +67,7 @@ tabutils._stackTabs = function() {
 
   gBrowser.isStackedTab = function(aTab) aTab.hasAttribute("group") && aTab.getAttribute("group-counter") != 1;
   gBrowser.isCollapsedStack = function(aTab) aTab.hasAttribute("group-collapsed") && aTab.getAttribute("group-counter") > 1;
+  gBrowser.isExpandedStack = function(aTab) this.isStackedTab(aTab) && !aTab.hasAttribute("group-collapsed");
 
   gBrowser.stackTabs = function stackTabs(aTabs, aTab, aExpand) {
     aTabs = aTabs.filter(function(aTab) !aTab.pinned)
@@ -174,7 +175,19 @@ tabutils._stackTabs = function() {
   };
 
   gBrowser.collapseStack = function collapseStack(aTab, aForce) {
-    if (!aTab.hasAttribute("group"))
+    if ("length" in arguments[0]) {
+      let aTabs = Array.filter(arguments[0], function(aTab) aTab.hasAttribute("group-selected"));
+      if (aForce == null)
+        aForce = !aTabs.every(function(aTab) aTab.hasAttribute("group-collapsed"));
+
+      let func = arguments.callee;
+      aTabs.forEach(function(aTab) {
+        func.call(this, aTab, aForce);
+      }, this);
+      return;
+    }
+
+    if (!this.isStackedTab(aTab))
       return;
 
     if (aForce == aTab.hasAttribute("group-collapsed"))
diff --git a/chrome/content/tabutils.js b/chrome/content/tabutils.js
@@ -2449,6 +2449,7 @@ tabutils._tabContextMenu = function() {
       let collapsed = tab.hasAttribute("group-collapsed");
       item.setAttribute("label", collapsed ? item.getAttribute("label_expand") : item.getAttribute("label_collapse"));
       item.setAttribute("accesskey", collapsed ? item.getAttribute("accesskey_expand") : item.getAttribute("accesskey_collapse"));
+      item.setAttribute("key", collapsed ? item.getAttribute("key_expand") : item.getAttribute("key_collapse"));
     }
 
     var item = $("context_readTab");
diff --git a/chrome/content/tabutils.xul b/chrome/content/tabutils.xul
@@ -59,6 +59,8 @@
     <key id="key_faviconizeTab" key="I" modifiers="accel,alt" oncommand="gBrowser.faviconizeTab(gBrowser.mCurrentTab);"/>
     <key id="key_pinTab" key="P" modifiers="accel,alt" oncommand="gBrowser.pinTab(gBrowser.mCurrentTab, !gBrowser.mCurrentTab.pinned);"/>
     <key id="key_unstackTab" key="U" modifiers="accel,alt" oncommand="gBrowser.unstackTabs([gBrowser.mCurrentTab]);"/>
+    <key id="key_expandStack" key="+" modifiers="accel,alt" oncommand="gBrowser.collapseStack(gBrowser.isCollapsedStack(gBrowser.mCurrentTab) ? gBrowser.mCurrentTab : gBrowser.allTabs, false);"/>
+    <key id="key_collapseStack" key="-" modifiers="accel,alt" oncommand="gBrowser.collapseStack(gBrowser.isExpandedStack(gBrowser.mCurrentTab) ? gBrowser.mCurrentTab : gBrowser.allTabs, true);"/>
     <key id="key_moveTabBackward" oncommand="gBrowser.moveTabBackward();" keycode="VK_PAGE_UP" modifiers="accel,shift"/>
     <key id="key_moveTabForward" oncommand="gBrowser.moveTabForward();" keycode="VK_PAGE_DOWN" modifiers="accel,shift"/>
     <key id="key_moveTabToStart" oncommand="gBrowser.moveTabToStart();" keycode="VK_HOME" modifiers="accel,shift"/>
@@ -279,6 +281,8 @@
                   label_expand="&expandStack.label;"
                   accesskey_collapse="&collapseStack.accesskey;"
                   accesskey_expand="&expandStack.accesskey;"
+                  key_collapse="key_collapseStack"
+                  key_expand="key_expandStack"
                   oncommand="gBrowser.collapseStack(gBrowser.mContextTab);"/>
         <menuitem id="context_colorStack"
                   label="&colorStack.label;"
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
@@ -162,6 +162,8 @@ pref("extensions.tabutils.shortcut.key_freezeTab", true);
 pref("extensions.tabutils.shortcut.key_faviconizeTab", true);
 pref("extensions.tabutils.shortcut.key_pinTab", true);
 pref("extensions.tabutils.shortcut.key_unstackTab", true);
+pref("extensions.tabutils.shortcut.key_expandStack", true);
+pref("extensions.tabutils.shortcut.key_collapseStack", true);
 pref("extensions.tabutils.shortcut.key_moveTabBackward", true);
 pref("extensions.tabutils.shortcut.key_moveTabForward", true);
 pref("extensions.tabutils.shortcut.key_moveTabToStart", true);

Original file line number	Diff line number	Diff line change
`@@ -2449,6 +2449,7 @@ tabutils._tabContextMenu = function() {`
`2449`	`2449`	`let collapsed = tab.hasAttribute("group-collapsed");`
`2450`	`2450`	`item.setAttribute("label", collapsed ? item.getAttribute("label_expand") : item.getAttribute("label_collapse"));`
`2451`	`2451`	`item.setAttribute("accesskey", collapsed ? item.getAttribute("accesskey_expand") : item.getAttribute("accesskey_collapse"));`
	`2452`	`+ item.setAttribute("key", collapsed ? item.getAttribute("key_expand") : item.getAttribute("key_collapse"));`
`2452`	`2453`	`}`
`2453`	`2454`
`2454`	`2455`	`var item = $("context_readTab");`