author | Cameron McCormack <cam@mcc.id.au> |
Mon, 29 Nov 2010 15:02:36 +1300 | |
changeset 58768 | a8c06e21635d5d58d147bb23a971639e7e655dce |
parent 58767 | 84fe21efcb57b212f07d8a14d801712dd773b7f0 |
child 58769 | 23aa5649204e52380945e9761843751a092cd2dd |
push id | 17418 |
push user | dgottwald@mozilla.com |
push date | Tue, 07 Dec 2010 13:09:12 +0000 |
treeherder | mozilla-central@6c2e0020c898 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | dao |
bugs | 544833 |
milestone | 2.0b8pre |
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
|
--- a/browser/base/content/browser-tabPreviews.js +++ b/browser/base/content/browser-tabPreviews.js @@ -559,16 +559,24 @@ var ctrlTab = { tabContainer[toggleEventListener]("TabClose", this, false); document[toggleEventListener]("keypress", this, false); gBrowser.mTabBox.handleCtrlTab = !enable; // If we're not running, hide the "Show All Tabs" menu item, // as Shift+Ctrl+Tab will be handled by the tab bar. document.getElementById("menu_showAllTabs").hidden = !enable; + + // Also disable the <key> to ensure Shift+Ctrl+Tab never triggers + // Show All Tabs. + var key_showAllTabs = document.getElementById("key_showAllTabs"); + if (enable) + key_showAllTabs.removeAttribute("disabled"); + else + key_showAllTabs.setAttribute("disabled", "true"); } }; /** * All Tabs panel */ var allTabs = { @@ -623,22 +631,23 @@ var allTabs = { this._initiated = false; }, prefName: "browser.allTabs.previews", readPref: function allTabs_readPref() { var allTabsButton = document.getElementById("alltabs-button"); if (!allTabsButton) return; - if (gPrefService.getBoolPref(this.prefName)) { - allTabsButton.removeAttribute("type"); + + if (gPrefService.getBoolPref(this.prefName)) { + allTabsButton.removeAttribute("type"); allTabsButton.setAttribute("command", "Browser:ShowAllTabs"); - } else { - allTabsButton.setAttribute("type", "menu"); - allTabsButton.removeAttribute("command"); + } else { + allTabsButton.setAttribute("type", "menu"); + allTabsButton.removeAttribute("command"); allTabsButton.removeAttribute("oncommand"); } }, observe: function (aSubject, aTopic, aPrefName) { this.readPref(); }, pick: function allTabs_pick(aPreview) {