From 19160f90181453d38dc97f8600ae0da4770b006f Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Thu, 19 Aug 2021 07:31:27 -0400 Subject: [PATCH] Drop `requestIdleCallback` from globals Related discussion: - https://github.com/gorhill/uBlock/pull/3839 `requestIdleCallback` can be assumed always present on browser-related platforms. --- src/js/dyna-rules.js | 8 ++++---- src/js/globals.js | 15 --------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/js/dyna-rules.js b/src/js/dyna-rules.js index 1abd8e841..c6ace15cc 100644 --- a/src/js/dyna-rules.js +++ b/src/js/dyna-rules.js @@ -382,8 +382,8 @@ const onFilterChanged = (( ) => { }; return function() { - if ( timer !== undefined ) { globals.cancelIdleCallback(timer); } - timer = globals.requestIdleCallback(process, { timeout: 773 }); + if ( timer !== undefined ) { self.cancelIdleCallback(timer); } + timer = self.requestIdleCallback(process, { timeout: 773 }); }; })(); @@ -555,8 +555,8 @@ const onTextChanged = (( ) => { }; return function(now) { - if ( timer !== undefined ) { globals.cancelIdleCallback(timer); } - timer = now ? process() : globals.requestIdleCallback(process, { timeout: 57 }); + if ( timer !== undefined ) { self.cancelIdleCallback(timer); } + timer = now ? process() : self.requestIdleCallback(process, { timeout: 57 }); }; })(); diff --git a/src/js/globals.js b/src/js/globals.js index 6c334d255..de6d4675f 100644 --- a/src/js/globals.js +++ b/src/js/globals.js @@ -35,21 +35,6 @@ const globals = (( ) => { // jshint ignore:end })(); -// https://en.wikipedia.org/wiki/.invalid -if ( globals.location === undefined ) { - globals.location = new URL('https://ublock0.invalid/'); -} - -// https://developer.mozilla.org/en-US/docs/Web/API/Window/requestIdleCallback -if ( globals.requestIdleCallback === undefined ) { - globals.requestIdleCallback = function(callback) { - return globals.setTimeout(callback, 1); - }; - globals.cancelIdleCallback = function(handle) { - return globals.clearTimeout(handle); - }; -} - /******************************************************************************/ export default globals;