From ea7dc6d39eb8481865f42796e9f5ff1e7836a726 Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk" <neil%parkwaycc.co.uk>
Date: Sat, 31 Mar 2007 23:07:30 +0000
Subject: [PATCH] Bug 191818 File menu missing "Close other tabs" option
 r=shliang sr=jag a=asa

---
 suite/browser/tabbrowser.xml                  | 26 +++++++++++++------
 .../chrome/browser/tabbrowser.properties      |  2 --
 2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/suite/browser/tabbrowser.xml b/suite/browser/tabbrowser.xml
index ee46905e624..1ce9a27cffd 100644
--- a/suite/browser/tabbrowser.xml
+++ b/suite/browser/tabbrowser.xml
@@ -592,17 +592,9 @@
         <![CDATA[
           this.mStrip.collapsed = !aShow;
           if (aShow) {
-            // XXXdwh temporary unclean dependency on specific menu items in navigator.xul
-            document.getElementById("menu_closeWindow").hidden = false;
-            document.getElementById("menu_close").setAttribute("label", this.mStringBundle.getString("tabs.closeTab"));
             if (!this.mTabbedMode)
               this.enterTabbedMode();
           }
-          else {
-            // XXXdwh temporary unclean dependency on specific menu items in navigator.xul
-            document.getElementById("menu_closeWindow").hidden = true;
-            document.getElementById("menu_close").setAttribute("label", this.mStringBundle.getString("tabs.close"));
-          }
         ]]>
         </body>
       </method>
@@ -717,6 +709,24 @@
           ]]>
         </body>
       </method>
+
+      <method name="removeAllTabsBut">
+        <parameter name="aTab"/>
+        <body>
+          <![CDATA[
+            if (aTab.localName != "tab")
+              aTab = this.mCurrentTab;
+            else
+              this.mTabContainer.selectedItem = aTab;
+
+            while (this.mTabContainer.lastChild != aTab)
+              this.removeTab(this.mTabContainer.lastChild);
+
+            while (aTab.previousSibling)
+              this.removeTab(aTab.previousSibling);
+          ]]>
+        </body>
+      </method>
       
       <method name="removeCurrentTab">
         <body>
diff --git a/suite/locales/en-US/chrome/browser/tabbrowser.properties b/suite/locales/en-US/chrome/browser/tabbrowser.properties
index d49de25fa1d..6379cb0ce1d 100644
--- a/suite/locales/en-US/chrome/browser/tabbrowser.properties
+++ b/suite/locales/en-US/chrome/browser/tabbrowser.properties
@@ -1,7 +1,5 @@
 tabs.loading=Loading...
 tabs.untitled=(Untitled)
-tabs.closeTab=Close Tab
-tabs.close=Close
 browsewithcaret.checkMsg=Do not show me this dialog box again.
 browsewithcaret.checkWindowTitle=Caret Browsing
 browsewithcaret.checkLabel=Pressing F7 turns Caret Browsing on or off. This feature places a moveable cursor in web pages, allowing you to select text with the keyboard. Do you want to turn Caret Browsing on?
