nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1349761 - uninitialize ctrlTab only if it has been initialized before, r=dao.

Browse source
This commit is contained in:
Florian Queze 2017-03-23 13:00:27 +01:00
parent 449b1552c1
commit 9721c4ea62
2 changed files with 12 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

21
browser/base/content/browser-ctrlTab.js
View file

@ -204,16 +204,17 @@ var ctrlTab = {
}, },
uninit: function ctrlTab_uninit() { uninit: function ctrlTab_uninit() {
this._recentlyUsedTabs = null; if (this._recentlyUsedTabs) {
this._init(false); this._recentlyUsedTabs = null;
this._init(false);
}
}, },
prefName: "browser.ctrlTab.previews", prefName: "browser.ctrlTab.previews",
readPref: function ctrlTab_readPref() { readPref: function ctrlTab_readPref() {
var enable = var enable =
gPrefService.getBoolPref(this.prefName) && gPrefService.getBoolPref(this.prefName) &&
(!gPrefService.prefHasUserValue("browser.ctrlTab.disallowForScreenReaders") || !gPrefService.getBoolPref("browser.ctrlTab.disallowForScreenReaders", false);
!gPrefService.getBoolPref("browser.ctrlTab.disallowForScreenReaders"));
if (enable) if (enable)
this.init(); this.init();
@ -535,15 +536,15 @@ var ctrlTab = {
_init: function ctrlTab__init(enable) { _init: function ctrlTab__init(enable) {
var toggleEventListener = enable ? "addEventListener" : "removeEventListener"; var toggleEventListener = enable ? "addEventListener" : "removeEventListener";
window[toggleEventListener]("SSWindowRestored", this, false); window[toggleEventListener]("SSWindowRestored", this);
var tabContainer = gBrowser.tabContainer; var tabContainer = gBrowser.tabContainer;
tabContainer[toggleEventListener]("TabOpen", this, false); tabContainer[toggleEventListener]("TabOpen", this);
tabContainer[toggleEventListener]("TabAttrModified", this, false); tabContainer[toggleEventListener]("TabAttrModified", this);
tabContainer[toggleEventListener]("TabSelect", this, false); tabContainer[toggleEventListener]("TabSelect", this);
tabContainer[toggleEventListener]("TabClose", this, false); tabContainer[toggleEventListener]("TabClose", this);
document[toggleEventListener]("keypress", this, false); document[toggleEventListener]("keypress", this);
gBrowser.mTabBox.handleCtrlTab = !enable; gBrowser.mTabBox.handleCtrlTab = !enable;
if (enable) if (enable)

2
browser/base/content/browser-sets.inc
View file

@ -338,7 +338,7 @@
<key id="key_fullZoomReset" key="&fullZoomResetCmd.commandkey;" command="cmd_fullZoomReset" modifiers="accel"/> <key id="key_fullZoomReset" key="&fullZoomResetCmd.commandkey;" command="cmd_fullZoomReset" modifiers="accel"/>
<key key="&fullZoomResetCmd.commandkey2;" command="cmd_fullZoomReset" modifiers="accel"/> <key key="&fullZoomResetCmd.commandkey2;" command="cmd_fullZoomReset" modifiers="accel"/>
<key id="key_showAllTabs" command="Browser:ShowAllTabs" keycode="VK_TAB" modifiers="control,shift"/> <key id="key_showAllTabs" command="Browser:ShowAllTabs" keycode="VK_TAB" modifiers="control,shift" disabled="true"/>
<key id="key_switchTextDirection" key="&bidiSwitchTextDirectionItem.commandkey;" command="cmd_switchTextDirection" modifiers="accel,shift" /> <key id="key_switchTextDirection" key="&bidiSwitchTextDirectionItem.commandkey;" command="cmd_switchTextDirection" modifiers="accel,shift" />