mirror of
https://github.com/gorhill/uBlock.git
synced 2024-10-02 23:57:10 +02:00
Convert remaining vAPI.setTimeout to vAPI.defer
Related commit:
- 91f9795023
This commit is contained in:
parent
19db4e57f2
commit
e15951dce5
@ -50,14 +50,15 @@
|
|||||||
<script src="lib/diff/swatinem_diff.js"></script>
|
<script src="lib/diff/swatinem_diff.js"></script>
|
||||||
<script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
|
<script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
|
||||||
|
|
||||||
<script src="js/codemirror/search.js" type="module"></script>
|
|
||||||
<script src="js/codemirror/search-thread.js"></script>
|
|
||||||
|
|
||||||
<script src="js/fa-icons.js" type="module"></script>
|
|
||||||
<script src="js/vapi.js"></script>
|
<script src="js/vapi.js"></script>
|
||||||
<script src="js/vapi-common.js"></script>
|
<script src="js/vapi-common.js"></script>
|
||||||
<script src="js/vapi-client.js"></script>
|
<script src="js/vapi-client.js"></script>
|
||||||
<script src="js/vapi-client-extra.js"></script>
|
<script src="js/vapi-client-extra.js"></script>
|
||||||
|
|
||||||
|
<script src="js/codemirror/search.js" type="module"></script>
|
||||||
|
<script src="js/codemirror/search-thread.js"></script>
|
||||||
|
|
||||||
|
<script src="js/fa-icons.js" type="module"></script>
|
||||||
<script src="js/theme.js" type="module"></script>
|
<script src="js/theme.js" type="module"></script>
|
||||||
<script src="js/i18n.js" type="module"></script>
|
<script src="js/i18n.js" type="module"></script>
|
||||||
<script src="js/dashboard-common.js" type="module"></script>
|
<script src="js/dashboard-common.js" type="module"></script>
|
||||||
|
@ -33,13 +33,14 @@
|
|||||||
<script src="lib/codemirror/addon/selection/active-line.js"></script>
|
<script src="lib/codemirror/addon/selection/active-line.js"></script>
|
||||||
<script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
|
<script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
|
||||||
|
|
||||||
|
<script src="js/vapi.js"></script>
|
||||||
|
<script src="js/vapi-common.js"></script>
|
||||||
|
<script src="js/vapi-client.js"></script>
|
||||||
|
|
||||||
<script src="js/codemirror/search.js" type="module"></script>
|
<script src="js/codemirror/search.js" type="module"></script>
|
||||||
<script src="js/codemirror/search-thread.js"></script>
|
<script src="js/codemirror/search-thread.js"></script>
|
||||||
|
|
||||||
<script src="js/fa-icons.js" type="module"></script>
|
<script src="js/fa-icons.js" type="module"></script>
|
||||||
<script src="js/vapi.js"></script>
|
|
||||||
<script src="js/vapi-common.js"></script>
|
|
||||||
<script src="js/vapi-client.js"></script>
|
|
||||||
<script src="js/theme.js" type="module"></script>
|
<script src="js/theme.js" type="module"></script>
|
||||||
<script src="js/i18n.js" type="module"></script>
|
<script src="js/i18n.js" type="module"></script>
|
||||||
<script src="js/dashboard-common.js" type="module"></script>
|
<script src="js/dashboard-common.js" type="module"></script>
|
||||||
|
@ -36,13 +36,15 @@
|
|||||||
<script src="lib/codemirror/mode/xml/xml.js"></script>
|
<script src="lib/codemirror/mode/xml/xml.js"></script>
|
||||||
<script src="lib/codemirror/mode/htmlmixed/htmlmixed.js"></script>
|
<script src="lib/codemirror/mode/htmlmixed/htmlmixed.js"></script>
|
||||||
|
|
||||||
<script src="js/codemirror/search.js" type="module"></script>
|
|
||||||
<script src="js/codemirror/search-thread.js"></script>
|
|
||||||
<script src="lib/js-beautify/beautifier.min.js"></script>
|
|
||||||
<script src="js/fa-icons.js" type="module"></script>
|
|
||||||
<script src="js/vapi.js"></script>
|
<script src="js/vapi.js"></script>
|
||||||
<script src="js/vapi-common.js"></script>
|
<script src="js/vapi-common.js"></script>
|
||||||
<script src="js/vapi-client.js"></script>
|
<script src="js/vapi-client.js"></script>
|
||||||
|
|
||||||
|
<script src="js/codemirror/search.js" type="module"></script>
|
||||||
|
<script src="js/codemirror/search-thread.js"></script>
|
||||||
|
|
||||||
|
<script src="lib/js-beautify/beautifier.min.js"></script>
|
||||||
|
<script src="js/fa-icons.js" type="module"></script>
|
||||||
<script src="js/theme.js" type="module"></script>
|
<script src="js/theme.js" type="module"></script>
|
||||||
<script src="js/i18n.js" type="module"></script>
|
<script src="js/i18n.js" type="module"></script>
|
||||||
<script src="js/dashboard-common.js" type="module"></script>
|
<script src="js/dashboard-common.js" type="module"></script>
|
||||||
|
@ -41,13 +41,14 @@
|
|||||||
<script src="lib/codemirror/addon/selection/active-line.js"></script>
|
<script src="lib/codemirror/addon/selection/active-line.js"></script>
|
||||||
<script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
|
<script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
|
||||||
|
|
||||||
|
<script src="js/vapi.js"></script>
|
||||||
|
<script src="js/vapi-common.js"></script>
|
||||||
|
<script src="js/vapi-client.js"></script>
|
||||||
|
|
||||||
<script src="js/codemirror/search.js" type="module"></script>
|
<script src="js/codemirror/search.js" type="module"></script>
|
||||||
<script src="js/codemirror/search-thread.js"></script>
|
<script src="js/codemirror/search-thread.js"></script>
|
||||||
|
|
||||||
<script src="js/fa-icons.js" type="module"></script>
|
<script src="js/fa-icons.js" type="module"></script>
|
||||||
<script src="js/vapi.js"></script>
|
|
||||||
<script src="js/vapi-common.js"></script>
|
|
||||||
<script src="js/vapi-client.js"></script>
|
|
||||||
<script src="js/theme.js" type="module"></script>
|
<script src="js/theme.js" type="module"></script>
|
||||||
<script src="js/i18n.js" type="module"></script>
|
<script src="js/i18n.js" type="module"></script>
|
||||||
<script src="js/dashboard-common.js" type="module"></script>
|
<script src="js/dashboard-common.js" type="module"></script>
|
||||||
|
@ -103,11 +103,13 @@ if (
|
|||||||
// Main context
|
// Main context
|
||||||
|
|
||||||
{
|
{
|
||||||
const workerTTL = 5 * 60 * 1000;
|
const workerTTL = { min: 5 };
|
||||||
const pendingResponses = new Map();
|
const pendingResponses = new Map();
|
||||||
|
const workerTTLTimer = vAPI.defer.create(( ) => {
|
||||||
|
shutdown();
|
||||||
|
});
|
||||||
|
|
||||||
let worker;
|
let worker;
|
||||||
let workerTTLTimer;
|
|
||||||
let messageId = 1;
|
let messageId = 1;
|
||||||
|
|
||||||
const onWorkerMessage = function(e) {
|
const onWorkerMessage = function(e) {
|
||||||
@ -131,11 +133,8 @@ if (
|
|||||||
};
|
};
|
||||||
|
|
||||||
const shutdown = function() {
|
const shutdown = function() {
|
||||||
if ( workerTTLTimer !== undefined ) {
|
|
||||||
clearTimeout(workerTTLTimer);
|
|
||||||
workerTTLTimer = undefined;
|
|
||||||
}
|
|
||||||
if ( worker === undefined ) { return; }
|
if ( worker === undefined ) { return; }
|
||||||
|
workerTTLTimer.off();
|
||||||
worker.terminate();
|
worker.terminate();
|
||||||
worker.onmessage = undefined;
|
worker.onmessage = undefined;
|
||||||
worker = undefined;
|
worker = undefined;
|
||||||
@ -148,10 +147,7 @@ if (
|
|||||||
worker = new Worker('js/codemirror/search-thread.js');
|
worker = new Worker('js/codemirror/search-thread.js');
|
||||||
worker.onmessage = onWorkerMessage;
|
worker.onmessage = onWorkerMessage;
|
||||||
}
|
}
|
||||||
if ( workerTTLTimer !== undefined ) {
|
workerTTLTimer.offon(workerTTL);
|
||||||
clearTimeout(workerTTLTimer);
|
|
||||||
}
|
|
||||||
workerTTLTimer = vAPI.setTimeout(shutdown, workerTTL);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const needHaystack = function() {
|
const needHaystack = function() {
|
||||||
|
@ -45,13 +45,14 @@
|
|||||||
<script src="lib/codemirror/addon/selection/active-line.js"></script>
|
<script src="lib/codemirror/addon/selection/active-line.js"></script>
|
||||||
<script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
|
<script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
|
||||||
|
|
||||||
|
<script src="js/vapi.js"></script>
|
||||||
|
<script src="js/vapi-common.js"></script>
|
||||||
|
<script src="js/vapi-client.js"></script>
|
||||||
|
|
||||||
<script src="js/codemirror/search.js" type="module"></script>
|
<script src="js/codemirror/search.js" type="module"></script>
|
||||||
<script src="js/codemirror/search-thread.js"></script>
|
<script src="js/codemirror/search-thread.js"></script>
|
||||||
|
|
||||||
<script src="js/fa-icons.js" type="module"></script>
|
<script src="js/fa-icons.js" type="module"></script>
|
||||||
<script src="js/vapi.js"></script>
|
|
||||||
<script src="js/vapi-common.js"></script>
|
|
||||||
<script src="js/vapi-client.js"></script>
|
|
||||||
<script src="js/theme.js" type="module"></script>
|
<script src="js/theme.js" type="module"></script>
|
||||||
<script src="js/i18n.js" type="module"></script>
|
<script src="js/i18n.js" type="module"></script>
|
||||||
<script src="js/dashboard-common.js" type="module"></script>
|
<script src="js/dashboard-common.js" type="module"></script>
|
||||||
|
Loading…
Reference in New Issue
Block a user