Fix the extensions.tabutils.closeLastWindowWithLastTab on Fx31+

https://hg.mozilla.org/releases/mozilla-release/diff/09863b96e772/browser/base/content/tabbrowser.xml
yfdyh000 · Feb 17, 2015 · 546c18e · 546c18e
1 parent 4782531
commit 546c18e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/chrome/content/tabutils.js b/chrome/content/tabutils.js
@@ -981,7 +981,9 @@ tabutils._tabClosingOptions = function() {
   TU_hookCode("gBrowser.updateCurrentBrowser", /.*dispatchEvent[\s\S]*_tabAttrModified.*/, "$&};if (window.windowState != window.STATE_MINIMIZED) {");
 
   //Don't close the last primary window with the las tab
-  TU_hookCode("gBrowser._beginRemoveTab", "_closeWindowWithLastTab", "$& && " + (function() { //Bug 607893
+  TU_hookCode("gBrowser._beginRemoveTab", 
+      /_closeWindowWithLastTab|Services\.prefs\.getBoolPref\("browser\.tabs\.closeWindowWithLastTab"\)/, // Bug 997681 [Fx31]
+      "$& && " + (function() { //Implement to Bug 607893
     (TU_getPref("extensions.tabutils.closeLastWindowWithLastTab", false) || function() {
       var winEnum = Services.wm.getEnumerator("navigator:browser");
       while (winEnum.hasMoreElements()) {