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

Don't redefine gBrowserInit._delayedStartup() with eval() to avoid errors from mismatched variable scopes.

Browse Source 
I don't know why but redefined function with eval() has a variable scope different from its original one, and fails to access gSessionHistoryObserver defined in Firefox's script with "const" statement. So I gave up to use eval() hack.
This commit is contained in:
Piro / YUKI Hiroshi 2015-10-10 19:19:11 +09:00
parent 9985b4a21e
commit ff2d3caed5
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
content/treestyletab/windowHelper.js
View File

@ -3,6 +3,7 @@ XPCOMUtils.defineLazyModuleGetter(this,
'TreeStyleTabUtils', 'resource://treestyletab-modules/utils.js'); 'TreeStyleTabUtils', 'resource://treestyletab-modules/utils.js');
var TreeStyleTabWindowHelper = { var TreeStyleTabWindowHelper = {
runningDelayedStartup : false,
get service() get service()
{ {
@ -12,25 +13,18 @@ var TreeStyleTabWindowHelper = {
preInit : function TSTWH_preInit() preInit : function TSTWH_preInit()
{ {
TreeStyleTabUtils.doPatching(gBrowserInit._delayedStartup, 'gBrowserInit._delayedStartup', function(aName, aSource) { TreeStyleTabUtils.doPatching(gBrowserInit._delayedStartup, 'gBrowserInit._delayedStartup', function(aName, aSource) {
if (aSource.indexOf('!MultipleTabService.tearOffSelectedTabsFromRemote()') > -1) { // Replacing of gBrowserInit._delayedStartup() with eval()
return eval(aName+' = '+aSource.replace( // breaks the variable scope of the function and break its
'!MultipleTabService.tearOffSelectedTabsFromRemote()', // functionality completely.
'!TreeStyleTabService.tearOffSubtreeFromRemote() && $&' // Instead, I use a flag to detect a method is called at the
)); // startup process or not.
} gBrowserInit.__treestyletab___delayedStartup = gBrowserInit._delayedStartup;
else if (aSource.indexOf('gBrowser.swapBrowsersAndCloseOther') > -1) { gBrowserInit._delayedStartup = function(...args) {
return eval(aName+' = '+aSource.replace( TreeStyleTabWindowHelper.runningDelayedStartup = true;
/gBrowser\.swapBrowsersAndCloseOther\([^)]+\);/g, var retVal = this.__treestyletab___delayedStartup.apply(this, args);
'if (!TreeStyleTabService.tearOffSubtreeFromRemote()) { $& }' TreeStyleTabWindowHelper.runningDelayedStartup = false;
).replace( return retVal;
// Workaround for https://github.com/piroor/treestyletab/issues/741 };
// After the function is updated by TST, reassignment of a global variable raises an error like:
// > System JS : ERROR chrome://treestyletab/content/windowHelper.js line 30 > eval:130 - TypeError: can't redefine non-configurable property 'gBidiUI'
// If I access it as a property of the global object, the error doesn't appear.
/([^\.])\bgBidiUI =/,
'$1window.gBidiUI ='
));
}
}, 'TreeStyleTab'); }, 'TreeStyleTab');
TreeStyleTabUtils.doPatching(nsBrowserAccess.prototype.openURI, 'nsBrowserAccess.prototype.openURI', function(aName, aSource) { TreeStyleTabUtils.doPatching(nsBrowserAccess.prototype.openURI, 'nsBrowserAccess.prototype.openURI', function(aName, aSource) {
@ -109,6 +103,19 @@ var TreeStyleTabWindowHelper = {
{ {
this.overrideExtensionsBeforeBrowserInit(); // windowHelperHacks.js this.overrideExtensionsBeforeBrowserInit(); // windowHelperHacks.js
this.overrideGlobalFunctions(); this.overrideGlobalFunctions();
// Replacing of gBrowserInit._delayedStartup() with eval()
// breaks the variable scope of the function and break its
// functionality completely.
// Instead, I change the behavior of the method only at the
// startup process.
gBrowser.__treestyletab__swapBrowsersAndCloseOther = gBrowser.swapBrowsersAndCloseOther;
gBrowser.swapBrowsersAndCloseOther = function(...args) {
if (TreeStyleTabWindowHelper.runningDelayedStartup &&
TreeStyleTabService.tearOffSubtreeFromRemote())
return;
return this.__treestyletab__swapBrowsersAndCloseOther.apply(this, args);
};
}, },
onAfterBrowserInit : function TSTWH_onAfterBrowserInit() onAfterBrowserInit : function TSTWH_onAfterBrowserInit()
@ -382,7 +389,7 @@ var TreeStyleTabWindowHelper = {
tabbar.addEventListener('click', this.service, true); tabbar.addEventListener('click', this.service, true);
var newTabButton = document.getElementById('new-tab-button'); var newTabButton = document.getElementById('new-tab-button');
const nsIDOMNode = Ci.nsIDOMNode; var nsIDOMNode = Ci.nsIDOMNode;
if (newTabButton && if (newTabButton &&
!(tabbar.compareDocumentPosition(newTabButton) & nsIDOMNode.DOCUMENT_POSITION_CONTAINED_BY)) !(tabbar.compareDocumentPosition(newTabButton) & nsIDOMNode.DOCUMENT_POSITION_CONTAINED_BY))
newTabButton.parentNode.addEventListener('click', this.service, true); newTabButton.parentNode.addEventListener('click', this.service, true);
@ -400,7 +407,7 @@ var TreeStyleTabWindowHelper = {
tabbar.removeEventListener('click', this.service, true); tabbar.removeEventListener('click', this.service, true);
var newTabButton = document.getElementById('new-tab-button'); var newTabButton = document.getElementById('new-tab-button');
const nsIDOMNode = Ci.nsIDOMNode; var nsIDOMNode = Ci.nsIDOMNode;
if (newTabButton && if (newTabButton &&
!(tabbar.compareDocumentPosition(newTabButton) & Ci.nsIDOMNode.DOCUMENT_POSITION_CONTAINED_BY)) !(tabbar.compareDocumentPosition(newTabButton) & Ci.nsIDOMNode.DOCUMENT_POSITION_CONTAINED_BY))
newTabButton.parentNode.removeEventListener('click', this.service, true); newTabButton.parentNode.removeEventListener('click', this.service, true);