From 0ee6e3044d2745c7cdb7d8eef5d09ed9e9c6e75b Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Wed, 7 May 2025 07:47:28 -0400 Subject: [PATCH] [mv3] No need to retry sending messages with top-level listener --- .../extension/js/scripting/css-declarative.js | 14 +++++--------- .../mv3/extension/js/scripting/css-generic.js | 10 +++++----- .../mv3/extension/js/scripting/css-procedural.js | 10 +++++----- .../mv3/extension/js/scripting/css-specific.js | 16 +++++----------- 4 files changed, 20 insertions(+), 30 deletions(-) diff --git a/platform/mv3/extension/js/scripting/css-declarative.js b/platform/mv3/extension/js/scripting/css-declarative.js index 9f63fe558..a0364ce20 100644 --- a/platform/mv3/extension/js/scripting/css-declarative.js +++ b/platform/mv3/extension/js/scripting/css-declarative.js @@ -103,18 +103,14 @@ for ( const selector of exceptedSelectors ) { if ( sheetText.length === 0 ) { return; } -(function uBOL_injectCSS(css, count = 10) { - chrome.runtime.sendMessage({ what: 'insertCSS', css }).catch(( ) => { - count -= 1; - if ( count === 0 ) { return; } - uBOL_injectCSS(css, count); - }); -})(sheetText.join('\n')); +chrome.runtime.sendMessage({ + what: 'insertCSS', + css: sheetText.join('\n'), +}).catch(( ) => { +}); /******************************************************************************/ })(); -/******************************************************************************/ - void 0; diff --git a/platform/mv3/extension/js/scripting/css-generic.js b/platform/mv3/extension/js/scripting/css-generic.js index f242b417b..f9979a9fb 100644 --- a/platform/mv3/extension/js/scripting/css-generic.js +++ b/platform/mv3/extension/js/scripting/css-generic.js @@ -214,11 +214,11 @@ const uBOL_processChanges = mutations => { /******************************************************************************/ -const uBOL_injectCSS = (css, count = 10) => { - chrome.runtime.sendMessage({ what: 'insertCSS', css }).catch(( ) => { - count -= 1; - if ( count === 0 ) { return; } - uBOL_injectCSS(css, count); +const uBOL_injectCSS = css => { + chrome.runtime.sendMessage({ + what: 'insertCSS', + css, + }).catch(( ) => { }); }; diff --git a/platform/mv3/extension/js/scripting/css-procedural.js b/platform/mv3/extension/js/scripting/css-procedural.js index 101aa7ee7..8080e6956 100644 --- a/platform/mv3/extension/js/scripting/css-procedural.js +++ b/platform/mv3/extension/js/scripting/css-procedural.js @@ -65,11 +65,11 @@ if ( exceptedSelectors.length === 0 ) { return; } /******************************************************************************/ -const uBOL_injectCSS = (css, count = 10) => { - chrome.runtime.sendMessage({ what: 'insertCSS', css }).catch(( ) => { - count -= 1; - if ( count === 0 ) { return; } - uBOL_injectCSS(css, count); +const uBOL_injectCSS = css => { + chrome.runtime.sendMessage({ + what: 'insertCSS', + css, + }).catch(( ) => { }); }; diff --git a/platform/mv3/extension/js/scripting/css-specific.js b/platform/mv3/extension/js/scripting/css-specific.js index 661cca616..2d2c0db37 100644 --- a/platform/mv3/extension/js/scripting/css-specific.js +++ b/platform/mv3/extension/js/scripting/css-specific.js @@ -63,20 +63,14 @@ const exceptedSelectors = exceptions.length !== 0 : selectors; if ( exceptedSelectors.length === 0 ) { return; } -/******************************************************************************/ - -(function uBOL_injectCSS(css, count = 10) { - chrome.runtime.sendMessage({ what: 'insertCSS', css }).catch(( ) => { - count -= 1; - if ( count === 0 ) { return; } - uBOL_injectCSS(css, count); - }); -})(`${exceptedSelectors.join(',')}{display:none!important;}`); +chrome.runtime.sendMessage({ + what: 'insertCSS', + css: `${exceptedSelectors.join(',')}{display:none!important;}`, +}).catch(( ) => { +}); /******************************************************************************/ })(); -/******************************************************************************/ - void 0;