Remove obsolete compatibility codes for Session Manager.

Session Manager: https://addons.mozilla.org/firefox/addon/session-manager/
Because it is completely restructured, TST's compatibility codes are not used anymore.
This commit is contained in:
YUKI Hiroshi 2016-09-05 14:57:02 +09:00
parent 104c46d6aa
commit 85ca3bd88f
2 changed files with 9 additions and 40 deletions

View File

@ -93,38 +93,6 @@ TreeStyleTabWindowHelper.overrideExtensionsPreInit = function TSTWH_overrideExte
} }
} }
// Session Manager
// https://addons.mozilla.org/firefox/addon/session-manager/
// We need to initialize TST before Session Manager restores the last session anyway!
if ('gSessionManager' in window &&
TreeStyleTabUtils.getTreePref('compatibility.SessionManager')) {
if ('onLoad_proxy' in gSessionManager &&
'onLoad' in gSessionManager &&
!gSessionManager.__treestyletab__onLoad) {
gSessionManager.__treestyletab__onLoad = gSessionManager.onLoad;
gSessionManager.onLoad = function(...aArgs) {
TreeStyleTabService.init();
return gSessionManager.__treestyletab__onLoad(...aArgs);
};
}
if ('load' in gSessionManager) {
eval('gSessionManager.load = '+gSessionManager.load.toSource().replace(
'var tabcount = ',
' gBrowser.treeStyleTab.collapseExpandAllSubtree(false, true);\n' +
' {\n'+
' let tabs = gBrowser.treeStyleTab.getTabs(gBrowser).slice(1).reverse();\n' +
' for (let i = 0, maxi = tabs.length; i < maxi; i++)\n' +
' {\n' +
' let tab = tabs[i];\n' +
' gBrowser.removeTab(tab);\n' +
' }\n' +
' }\n' +
' TreeStyleTabService.restoringTree = true;\n' +
'$&'
));
}
}
// TooManyTabs // TooManyTabs
// https://addons.mozilla.org/firefox/addon/toomanytabs-saves-your-memory/ // https://addons.mozilla.org/firefox/addon/toomanytabs-saves-your-memory/
if ('tooManyTabs' in window && if ('tooManyTabs' in window &&
@ -267,16 +235,18 @@ TreeStyleTabWindowHelper.overrideExtensionsAfterBrowserInit = function TSTWH_ove
// Tab Mix Plus // Tab Mix Plus
if ( if (
TreeStyleTabUtils.getTreePref('compatibility.TMP') && TreeStyleTabUtils.getTreePref('compatibility.TMP') &&
'TabmixTabbar' in window 'TabmixTabbar' in window &&
!DNDObserver.__treestyletab__clearDragmark
) { ) {
let DNDObserver = 'TMP_tabDNDObserver' in window ? TMP_tabDNDObserver : TabDNDObserver ; let DNDObserver = 'TMP_tabDNDObserver' in window ? TMP_tabDNDObserver : TabDNDObserver ;
this.updateTabDNDObserver(DNDObserver); this.updateTabDNDObserver(DNDObserver);
eval('DNDObserver.clearDragmark = '+ DNDObserver.__treestyletab__clearDragmark = DNDObserver.clearDragmark;
DNDObserver.clearDragmark.toSource().replace( DNDObserver.clearDragmark = function(...aArgs) {
/(\})(\))?$/, var result = this.__treestyletab__clearDragmark(...aArgs);
'gBrowser.treeStyleTab.tabbarDNDObserver.clearDropPosition(); $1$2' gBrowser.treeStyleTab.tabbarDNDObserver.clearDropPosition();
) return result;
); };
eval('DNDObserver.onDragStart = '+ eval('DNDObserver.onDragStart = '+
DNDObserver.onDragStart.toSource().replace( DNDObserver.onDragStart.toSource().replace(
'event.target.localName != "tab"', 'event.target.localName != "tab"',

View File

@ -706,7 +706,6 @@ pref("extensions.treestyletab.compatibility.RemoveNewTabButton", true);
pref("extensions.treestyletab.compatibility.SBMCounter", true); pref("extensions.treestyletab.compatibility.SBMCounter", true);
pref("extensions.treestyletab.compatibility.Scriptish", false); pref("extensions.treestyletab.compatibility.Scriptish", false);
pref("extensions.treestyletab.compatibility.SelectionLinks", true); pref("extensions.treestyletab.compatibility.SelectionLinks", true);
pref("extensions.treestyletab.compatibility.SessionManager", true);
pref("extensions.treestyletab.compatibility.SnapLinksPlus", true); pref("extensions.treestyletab.compatibility.SnapLinksPlus", true);
pref("extensions.treestyletab.compatibility.STM.warnForNewTabPosition", true); pref("extensions.treestyletab.compatibility.STM.warnForNewTabPosition", true);
pref("extensions.treestyletab.compatibility.STM", true); // Super Tab Mode pref("extensions.treestyletab.compatibility.STM", true); // Super Tab Mode