From c2e7e2941e01651e141d45bfbcc447c51dcf1afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A3o=20Gottwald?= Date: Tue, 3 Jul 2012 18:12:09 +0200 Subject: [PATCH] Backed out changeset c36c02221c6a --- browser/base/content/tabbrowser.xml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 35a5793df7d..1e4f4b28f3a 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -1410,17 +1410,14 @@ this.tabs.length - this._removingTabs.length : this.visibleTabs.length - 1) - gBrowser._numPinnedTabs; - var alwaysPrompt = !aAll; + if (tabsToClose <= 1) + return true; + const pref = "browser.tabs.warnOnClose"; + var shouldPrompt = Services.prefs.getBoolPref(pref); - if (!alwaysPrompt) { - if (tabsToClose <= 1) - return true; - - var shouldPrompt = Services.prefs.getBoolPref(pref); - if (!shouldPrompt) - return true; - } + if (!shouldPrompt) + return true; var ps = Services.prompt; @@ -1443,13 +1440,11 @@ + (ps.BUTTON_TITLE_CANCEL * ps.BUTTON_POS_1), bundle.getString("tabs.closeButtonMultiple"), null, null, - alwaysPrompt ? null : - bundle.getString('tabs.closeWarningPromptMe'), + bundle.getString('tabs.closeWarningPromptMe'), warnOnClose); var reallyClose = (buttonPressed == 0); - // don't set the pref unless they press OK and it's false - if (!alwaysPrompt && reallyClose && !warnOnClose.value) + if (reallyClose && !warnOnClose.value) Services.prefs.setBoolPref(pref, false); return reallyClose;