Add a pref to let the user choose whether the scope of "unload other …

…tabs" should be "visible tabs" (i.e. tabs in the currently active tab group) or "tabs in the current window".
inverseparadox · Nov 13, 2012 · 5e7aef8 · 5e7aef8
1 parent 550a894
commit 5e7aef8
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/content/preferences.xul b/content/preferences.xul
@@ -29,6 +29,9 @@
       <preference id="extensions.bartab.findClosestLoadedTab"
                   name="extensions.bartab.findClosestLoadedTab"
                   type="bool" />
+      <preference id="extensions.bartab.unloadOnlyVisibleTabs"
+                  name="extensions.bartab.unloadOnlyVisibleTabs"
+                  type="bool" />
     </preferences>
 
     <groupbox id="BarTabGroup">
@@ -145,10 +148,23 @@
       </menulist>
     </row>
 
+    <row align="center">
+      <label value="&unloadingOtherTabs.label;"
+             accesskey="&unloadingOtherTabs.accesskey;"
+             control="menuUnloadingOtherTabs" />
+      <menulist id="menuUnloadingOtherTabs"
+                preference="extensions.bartab.unloadOnlyVisibleTabs">
+        <menupopup>
+          <menuitem label="&unloadAllTabsInWindow.label;" value="false"/>
+          <menuitem label="&unloadOnlyVisibleTabs.label;" value="true"/>
+        </menupopup>
+      </menulist>
+    </row>
+
         </rows>
       </grid>
     </groupbox>
 
   </prefpane>
 
-</prefwindow>
+</prefwindow>
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
@@ -7,6 +7,7 @@ pref("extensions.bartab.whitelist", "");
 pref("extensions.bartab.findClosestLoadedTab", true);
 pref("extensions.bartab.loadOnSelectDelay", 0);
 pref("extensions.bartab.migrated", false);
+pref("extensions.bartab.unloadOnlyVisibleTabs", true);
 
 // https://developer.mozilla.org/en/Localizing_extension_descriptions
 pref("[email protected]", "chrome://bartab/locale/overlay.properties");
diff --git a/locale/en-US/options.dtd b/locale/en-US/options.dtd
@@ -31,3 +31,7 @@
 <!ENTITY closingTabs.label "When closing a tab:">
 <!ENTITY closingTabs.accesskey "C">
 <!ENTITY findClosestLoadedTab.label "select the nearest loaded tab">
+<!ENTITY unloadingOtherTabs.label "When unloading all but the current tab:">
+<!ENTITY unloadingOtherTabs.accesskey "U">
+<!ENTITY unloadAllTabsInWindow.label "Unload tabs from all groups in the current window">
+<!ENTITY unloadOnlyVisibleTabs.label "Unload only tabs from the currently active tab group">
diff --git a/modules/prototypes.js b/modules/prototypes.js
@@ -257,8 +257,14 @@ BarTabHandler.prototype = {
     // unloadTab() mutates the tabs so the only sane thing to do is to
     // copy the list of tabs now and then work off that list.
     var tabs = [];
-    for (let i = 0; i < tabbrowser.visibleTabs.length; i++) {
-      tabs.push(tabbrowser.visibleTabs[i]);
+    if(BarTabUtils.mPrefs.getBoolPref("extensions.bartab.unloadOnlyVisibleTabs")) {
+      for (let i = 0; i < tabbrowser.visibleTabs.length; i++) {
+        tabs.push(tabbrowser.visibleTabs[i]);
+      }
+    } else {
+      for (let i = 0; i < tabbrowser.mTabs.length; i++) {
+        tabs.push(tabbrowser.mTabs[i]);
+      }
     }
     var self = this;
     tabs.forEach(function(tab) {