mirror of
https://github.com/gorhill/uBlock.git
synced 2024-10-04 16:47:15 +02:00
#10: manually imported fixes from e762a29d30
This commit is contained in:
parent
3eef0df98a
commit
63d9143d6b
13
platform/firefox/bootstrap.js
vendored
13
platform/firefox/bootstrap.js
vendored
@ -60,6 +60,19 @@ function startup(data, reason) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let hiddenDoc = appShell.hiddenDOMWindow.document;
|
let hiddenDoc = appShell.hiddenDOMWindow.document;
|
||||||
|
|
||||||
|
// https://github.com/gorhill/uBlock/issues/10
|
||||||
|
// Fixed by github.com/AlexVallat:
|
||||||
|
// https://github.com/chrisaljoudi/uBlock/issues/1149
|
||||||
|
// https://github.com/AlexVallat/uBlock/commit/e762a29d308caa46578cdc34a9be92c4ad5ecdd0
|
||||||
|
if ( hiddenDoc.readyState === 'loading' ) {
|
||||||
|
hiddenDoc.addEventListener('DOMContentLoaded', onReady);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// I believe this needs to be called in case it was added above.
|
||||||
|
hiddenDoc.removeEventListener('DOMContentLoaded', onReady);
|
||||||
|
|
||||||
bgProcess = hiddenDoc.documentElement.appendChild(
|
bgProcess = hiddenDoc.documentElement.appendChild(
|
||||||
hiddenDoc.createElementNS('http://www.w3.org/1999/xhtml', 'iframe')
|
hiddenDoc.createElementNS('http://www.w3.org/1999/xhtml', 'iframe')
|
||||||
);
|
);
|
||||||
|
@ -65,7 +65,11 @@ vAPI.app.restart = function() {
|
|||||||
var cleanupTasks = [];
|
var cleanupTasks = [];
|
||||||
|
|
||||||
// This must be updated manually, every time a new task is added/removed
|
// This must be updated manually, every time a new task is added/removed
|
||||||
var expectedNumberOfCleanups = 7;
|
|
||||||
|
// Fixed by github.com/AlexVallat:
|
||||||
|
// https://github.com/AlexVallat/uBlock/commit/7b781248f00cbe3d61b1cc367c440db80fa06049
|
||||||
|
// 7 instances of cleanupTasks.push, but one is unique to fennec, and one to desktop.
|
||||||
|
var expectedNumberOfCleanups = 6;
|
||||||
|
|
||||||
window.addEventListener('unload', function() {
|
window.addEventListener('unload', function() {
|
||||||
for ( var cleanup of cleanupTasks ) {
|
for ( var cleanup of cleanupTasks ) {
|
||||||
|
Loading…
Reference in New Issue
Block a user