Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more safeguard code to maximize success at attaching to a window

This commit is contained in:
gorhill 2015-10-17 18:08:46 -04:00
parent 308dd4bb30
commit a19f5701ef
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
platform/firefox/vapi-background.js
View File

@ -1086,7 +1086,7 @@ var tabWatcher = (function() {
var attachToTabBrowserLater = function(details) { var attachToTabBrowserLater = function(details) {
details.tryCount = details.tryCount ? details.tryCount + 1 : 1; details.tryCount = details.tryCount ? details.tryCount + 1 : 1;
if ( details.tryCount > 5 ) { if ( details.tryCount > 8 ) {
return false; return false;
} }
vAPI.setTimeout(function(details) { vAPI.setTimeout(function(details) {
@ -1099,6 +1099,17 @@ var tabWatcher = (function() {
}; };
var attachToTabBrowser = function(window, tryCount) { var attachToTabBrowser = function(window, tryCount) {
// Let's just be extra-paranoiac regarding whether all is right before
// trying to attach outself to the browser window.
var document = window && window.document;
var docElement = document && document.documentElement;
var wintype = docElement && docElement.getAttribute('windowtype');
if ( wintype !== 'navigator:browser' ) {
attachToTabBrowserLater({ window: window, tryCount: tryCount });
return;
}
// On some platforms, the tab browser isn't immediately available, // On some platforms, the tab browser isn't immediately available,
// try waiting a bit if this happens. // try waiting a bit if this happens.
var tabBrowser = getTabBrowser(window); var tabBrowser = getTabBrowser(window);
@ -1116,7 +1127,7 @@ var tabWatcher = (function() {
tabContainer = tabBrowser.deck; tabContainer = tabBrowser.deck;
} else if ( tabBrowser.tabContainer ) { // Firefox } else if ( tabBrowser.tabContainer ) { // Firefox
tabContainer = tabBrowser.tabContainer; tabContainer = tabBrowser.tabContainer;
vAPI.contextMenu.register(window.document); vAPI.contextMenu.register(document);
} }
// https://github.com/gorhill/uBlock/issues/697 // https://github.com/gorhill/uBlock/issues/697
@ -1132,22 +1143,12 @@ var tabWatcher = (function() {
} }
}; };
var onWindowLoad = function(ev) { var onWindowLoad = function() {
if ( ev ) {
this.removeEventListener(ev.type, onWindowLoad);
}
var wintype = this.document.documentElement.getAttribute('windowtype');
if ( wintype !== 'navigator:browser' ) {
return;
}
attachToTabBrowser(this); attachToTabBrowser(this);
}; };
var onWindowUnload = function() { var onWindowUnload = function() {
vAPI.contextMenu.unregister(this.document); vAPI.contextMenu.unregister(this.document);
this.removeEventListener('DOMContentLoaded', onWindowLoad);
var tabBrowser = getTabBrowser(this); var tabBrowser = getTabBrowser(this);
if ( !tabBrowser ) { if ( !tabBrowser ) {
@ -1207,7 +1208,7 @@ var tabWatcher = (function() {
var windowWatcher = { var windowWatcher = {
observe: function(win, topic) { observe: function(win, topic) {
if ( topic === 'domwindowopened' ) { if ( topic === 'domwindowopened' ) {
win.addEventListener('DOMContentLoaded', onWindowLoad); onWindowLoad.call(win);
return; return;
} }
if ( topic === 'domwindowclosed' ) { if ( topic === 'domwindowclosed' ) {
@ -2363,7 +2364,7 @@ vAPI.toolbarButton = {
var addLegacyToolbarButtonLater = function(details) { var addLegacyToolbarButtonLater = function(details) {
details.tryCount = details.tryCount ? details.tryCount + 1 : 1; details.tryCount = details.tryCount ? details.tryCount + 1 : 1;
if ( details.tryCount > 5 ) { if ( details.tryCount > 8 ) {
return false; return false;
} }
vAPI.setTimeout(function(details) { vAPI.setTimeout(function(details) {