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

Reduce eval hack

Browse Source
This commit is contained in:
Piro / YUKI Hiroshi 2016-01-22 00:13:56 +09:00
parent 190d8cd71c
commit d5b05b6017
2 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
content/treestyletab/windowHelper.js
View File

@ -505,24 +505,34 @@ var TreeStyleTabWindowHelper = {
));
}, 'treeStyleTab');
TreeStyleTabUtils.doPatching(b.loadTabs, 'b.loadTabs', function(aName, aSource) {
return eval(aName+' = '+aSource.replace(
'var tabNum = ',
'if (this.treeStyleTab.readiedToAttachNewTabGroup)\n' +
' TreeStyleTabService.readyToOpenChildTab(firstTabAdded || this.selectedTab, true);\n' +
'$&'
).replace(
'if (!aLoadInBackground)',
'if (TreeStyleTabService.checkToOpenChildTab(this))\n' +
' TreeStyleTabService.stopToOpenChildTab(this);\n' +
'$&'
).replace(
'this.selectedTab = firstTabAdded;',
'this.selectedTab = aURIs[0].indexOf("about:treestyletab-group") < 0 ? \n' +
' firstTabAdded :\n' +
' TreeStyleTabService.getNextTab(firstTabAdded) ;'
));
}, 'TreeStyleTab');
b.__treestyletab__loadTabs = b.loadTabs;
b.loadTabs = function(aURIs, aLoadInBackground, aReplace, ...aArgs) {
if (aReplace)
this.treeStyleTab.readyToOpenChildTab(this.selectedTab, true);
else
this.treeStyleTab.nextOpenedTabToBeParent = true;
var result;
var tabs = [];
var firstTabAdded;
try {
tabs = this.treeStyleTab.doAndGetNewTabs((function() {
result = this.__treestyletab__loadTabs.apply(this, [aURIs, aLoadInBackground, aReplace].concat(aArgs));
}).bind(this));
firstTabAdded = tabs[0];
}
finally {
if (!aReplace && firstTabAdded) {
this.selectedTab = aURIs[0].indexOf('about:treestyletab-group') == 0 ?
TreeStyleTabService.getNextTab(firstTabAdded) :
firstTabAdded;
}
if (this.treeStyleTab.checkToOpenChildTab(this))
this.treeStyleTab.stopToOpenChildTab(this);
delete this.treeStyleTab.nextOpenedTabToBeParent;
}
return result;
};
TreeStyleTabUtils.doPatching(b._beginRemoveTab, 'b._beginRemoveTab', function(aName, aSource) {
return eval(aName+' = '+aSource.replace(

7
modules/browser.js
View File

@ -3287,8 +3287,15 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
*/
b._lastRelatedTab = lastRelatedTab;
// this is the first tab of loading group.
if (this.nextOpenedTabToBeParent) {
this.readyToOpenChildTab(tab, true);
delete this.nextOpenedTabToBeParent;
}
return true;
},
loadingMultipleTabs : false,
_addedCountInThisLoop : 0,
_addedCountClearTimer : null,
_checkRestoringWindowTimerOnTabAdded : null,