Bug 731553 - warnAboutClosingTabs should ignore tabs that already started closing. r=gavin
authorDão Gottwald <dao@mozilla.com>
Thu, 01 Mar 2012 00:35:24 +0100
changeset 88018 55be076aa554ad1d559cf0f412d2b95562a03be7
parent 88017 4e0b2de5f2cbb9acf4e868e6dc1f86326ff1576a
child 88019 d3bf0c140b25c7a66f07049552260d2cff09a5e3
push id22167
push usermak77@bonardo.net
push dateThu, 01 Mar 2012 13:28:21 +0000
treeherdermozilla-central@04caf36509e7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin
bugs731553
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 731553 - warnAboutClosingTabs should ignore tabs that already started closing. r=gavin
browser/base/content/tabbrowser.xml
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1413,17 +1413,19 @@
           ]]>
         </body>
       </method>
 
       <method name="warnAboutClosingTabs">
       <parameter name="aAll"/>
       <body>
         <![CDATA[
-          var tabsToClose = (aAll ? this.tabs.length : this.visibleTabs.length - 1)
+          var tabsToClose = (aAll ?
+                               this.tabs.length - this._removingTabs.length :
+                               this.visibleTabs.length - 1)
                             - gBrowser._numPinnedTabs;
           if (tabsToClose <= 1)
             return true;
 
           const pref = "browser.tabs.warnOnClose";
           var shouldPrompt = Services.prefs.getBoolPref(pref);
 
           if (!shouldPrompt)