Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-07-08 12:57:57 +02:00
Code Issues Releases Wiki Activity

attach to window even if a tab browser is not present

Browse Source
This commit is contained in:
gorhill 2015-10-18 17:18:04 -04:00
parent e152db7004
commit 7e89b7a161
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1112,9 +1112,14 @@ var tabWatcher = (function() {
// On some platforms, the tab browser isn't immediately available,
// try waiting a bit if this happens.
// https://github.com/gorhill/uBlock/issues/763
// Not getting a tab browser should not prevent from attaching ourself
// to the window.
var tabBrowser = getTabBrowser(window);
if ( tabBrowser === null ) {
attachToTabBrowserLater({ window: window, tryCount: tryCount });
if (
tabBrowser === null &&
attachToTabBrowserLater({ window: window, tryCount: tryCount })
) {
return;
}
@ -1122,6 +1127,10 @@ var tabWatcher = (function() {
vAPI.toolbarButton.attachToNewWindow(window);
}
if ( tabBrowser === null ) {
return;
}
var tabContainer;
if ( tabBrowser.deck ) { // Fennec
tabContainer = tabBrowser.deck;
@ -1206,7 +1215,15 @@ var tabWatcher = (function() {
// https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Reference/Interface/nsIWindowWatcher
var windowWatcher = {
observe: function(win, topic) {
observe: function(subject, topic) {
var win;
try {
win = subject.QueryInterface(Ci.nsIDOMWindow);
} catch (ex) {
}
if ( !win ) {
return;
}
if ( topic === 'domwindowopened' ) {
onWindowLoad.call(win);
return;