diff --git a/content/treestyletab/treestyletab.js b/content/treestyletab/treestyletab.js index 8c25e14d..b8600843 100644 --- a/content/treestyletab/treestyletab.js +++ b/content/treestyletab/treestyletab.js @@ -2134,11 +2134,17 @@ catch(e) { get shouldListenKeyEventsForAutoExpandByFocusChange() { - return !this.getPref('browser.ctrlTab.previews') && + return !this.ctrlTabPreviewsEnabled && !this.getTreePref('autoCollapseExpandSubTreeOnSelect.whileFocusMovingByShortcut') && this.getTreePref('autoCollapseExpandSubTreeOnSelect'); }, + get ctrlTabPreviewsEnabled() + { + return 'allTabs' in window && + this.getPref('browser.ctrlTab.previews'); + }, + // autohide updateAutoHideKeyListeners : function() @@ -2161,7 +2167,7 @@ catch(e) { get shouldListenKeyEventsForAutoHide() { - return !this.getPref('browser.ctrlTab.previews') && + return !this.ctrlTabPreviewsEnabled && ( this.getTreePref('tabbar.autoShow.accelKeyDown') || this.getTreePref('tabbar.autoShow.tabSwitch') ||