stonewareslord/treestyletab
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove obsolete compatibility codes and reduce use of eval()

Browse Source
This commit is contained in:
YUKI Hiroshi 2016-09-06 15:59:09 +09:00
parent 8a3d0dc389
commit 8efb7df9fa
1 changed files with 5 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
content/treestyletab/windowHelperHacks.js
View File

@ -96,38 +96,6 @@ TreeStyleTabWindowHelper.overrideExtensionsBeforeBrowserInit = function TSTWH_ov
'TMP_LastTab' in window) { 'TMP_LastTab' in window) {
TMP_LastTab.TabBar = gBrowser.mTabContainer; TMP_LastTab.TabBar = gBrowser.mTabContainer;
} }
if (TreeStyleTabUtils.getTreePref('compatibility.TMP') &&
'isTabVisible' in gBrowser.mTabContainer &&
'ensureTabIsVisible' in gBrowser.mTabContainer) {
let replaceHorizontalProps = function replaceHorizontalProps(aString)
{
return aString.replace(
/boxObject\.x/g,
'boxObject[posProp]'
).replace(
/boxObject\.screenX/g,
'boxObject[screenPosProp]'
).replace(
/boxObject\.width/g,
'boxObject[sizeProp]'
).replace(
'{',
'{\n' +
' var posProp = gBrowser.treeStyleTab.isVertical ? "y" : "x" ;\n' +
' var screenPosProp = gBrowser.treeStyleTab.isVertical ? "screenY" : "screenX" ;\n' +
' var sizeProp = gBrowser.treeStyleTab.isVertical ? "height" : "width" ;'
)
}
eval('gBrowser.mTabContainer.ensureTabIsVisible = '+
replaceHorizontalProps(gBrowser.mTabContainer.ensureTabIsVisible.toSource().replace(
'boxObject.width < 250',
'$& || gBrowser.treeStyleTab.isVertical'
))
);
eval('gBrowser.mTabContainer.isTabVisible = '+
replaceHorizontalProps(gBrowser.mTabContainer.isTabVisible.toSource())
);
}
}; };
TreeStyleTabWindowHelper.overrideExtensionsAfterBrowserInit = function TSTWH_overrideExtensionsAfterBrowserInit() { TreeStyleTabWindowHelper.overrideExtensionsAfterBrowserInit = function TSTWH_overrideExtensionsAfterBrowserInit() {
@ -587,31 +555,11 @@ TreeStyleTabWindowHelper.overrideExtensionsDelayed = function TSTWH_overrideExte
gBrowser.treeStyleTab.initTabAttributes(t); gBrowser.treeStyleTab.initTabAttributes(t);
gBrowser.treeStyleTab.initTabContentsOrder(t); gBrowser.treeStyleTab.initTabContentsOrder(t);
eval('gBrowser.openInverseLink = '+ gBrowser.__treestyletab__openInverseLink = gBrowser.openInverseLink;
gBrowser.openInverseLink.toSource().replace( gBrowser.openInverseLink = function(...aArgs) {
/(var newTab)/, TreeStyleTabService.readyToOpenChildTabNow(gBrowser);
'TreeStyleTabService.readyToOpenChildTab(aTab); $1' return this.__treestyletab__openInverseLink(...aArgs);
) };
);
eval('gBrowser.TMP_openTabNext = '+
gBrowser.TMP_openTabNext.toSource().replace(
'this.mCurrentTab._tPos + this.tabContainer.nextTab',
' (function() {\n' +
' var tabs = this.treeStyleTab.getDescendantTabs(this.mCurrentTab);\n' +
' if (tabs.length) {\n' +
' var index = TreeStyleTabUtils.prefs.getPref("extensions.tabmix.openTabNextInverse") ?\n' +
' tabs[tabs.length - 1]._tPos :\n' +
' this.mCurrentTab._tPos ;\n' +
' if (index < aTab._tPos) index++;\n' +
' return index;\n' +
' }\n' +
' else {\n' +
' return ($&);\n' +
' }\n' +
' }).call(this)'
)
);
gBrowser.treeStyleTab.internallyTabMovingCount--; gBrowser.treeStyleTab.internallyTabMovingCount--;
} }