mirror of
https://github.com/gorhill/uBlock.git
synced 2024-09-01 16:49:39 +02:00
this fixes #906
This commit is contained in:
parent
35474f0146
commit
1c6d969ccb
3
platform/firefox/bootstrap.js
vendored
3
platform/firefox/bootstrap.js
vendored
@ -72,8 +72,7 @@ function startup(data/*, reason*/) {
|
|||||||
|
|
||||||
// Do not test against `loading`: it does appear `readyState` could be
|
// Do not test against `loading`: it does appear `readyState` could be
|
||||||
// undefined if looked up too early.
|
// undefined if looked up too early.
|
||||||
if ( !hiddenDoc ||
|
if ( !hiddenDoc || hiddenDoc.readyState !== 'complete' ) {
|
||||||
hiddenDoc.readyState !== 'interactive' && hiddenDoc.readyState !== 'complete' ) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1233,10 +1233,7 @@ var tabWatcher = (function() {
|
|||||||
|
|
||||||
// https://github.com/gorhill/uBlock/issues/906
|
// https://github.com/gorhill/uBlock/issues/906
|
||||||
// This might have been the cause. Will see.
|
// This might have been the cause. Will see.
|
||||||
if (
|
if ( document.readyState !== 'complete' ) {
|
||||||
document.readyState !== 'interactive' &&
|
|
||||||
document.readyState !== 'complete'
|
|
||||||
) {
|
|
||||||
attachToTabBrowserLater({ window: window, tryCount: tryCount });
|
attachToTabBrowserLater({ window: window, tryCount: tryCount });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -3111,7 +3108,8 @@ vAPI.contextMenu.displayMenuItem = function({target}) {
|
|||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
vAPI.contextMenu.register = function(doc) {
|
vAPI.contextMenu.register = (function() {
|
||||||
|
var register = function(doc) {
|
||||||
if ( !this.menuItemId ) {
|
if ( !this.menuItemId ) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -3149,6 +3147,17 @@ vAPI.contextMenu.register = function(doc) {
|
|||||||
contextMenu.insertBefore(menuitem, doc.getElementById('inspect-separator'));
|
contextMenu.insertBefore(menuitem, doc.getElementById('inspect-separator'));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
var registerSafely = function(doc) {
|
||||||
|
if ( doc.readyState !== 'complete' ) {
|
||||||
|
vAPI.setTimeout(registerSafely.bind(this, doc), 200);
|
||||||
|
} else {
|
||||||
|
register.call(this, doc);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return registerSafely;
|
||||||
|
})();
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
vAPI.contextMenu.unregister = function(doc) {
|
vAPI.contextMenu.unregister = function(doc) {
|
||||||
|
Loading…
Reference in New Issue
Block a user