Remove advanced setting ignoreScriptInjectFilters

This advanced setting is not really needed, as the same can be accomplished with a broad exception filter such as `#@#+js()`. Related feedback: - f5b453f#commitcomment-49499082
gorhill · Apr 14, 2021 · bc8c1d0 · bc8c1d0
1 parent 83c4dc3
commit bc8c1d0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/js/background.js b/src/js/background.js
@@ -63,7 +63,6 @@ const µBlock = (( ) => { // jshint ignore:line
         extensionUpdateForceReload: false,
         filterAuthorMode: false,
         filterOnHeaders: false,
-        ignoreScriptInjectFilters: false,
         loggerPopupType: 'popup',
         manualUpdateAssetFetchPeriod: 500,
         popupFontSize: 'unset',

diff --git a/src/js/scriptlet-filtering.js b/src/js/scriptlet-filtering.js
@@ -302,7 +302,6 @@
 
     api.retrieve = function(request) {
         if ( scriptletDB.size === 0 ) { return; }
-        if ( µb.hiddenSettings.ignoreScriptInjectFilters ) { return; }
 
         const reng = µb.redirectEngine;
         if ( !reng ) { return; }

diff --git a/src/js/static-ext-filtering.js b/src/js/static-ext-filtering.js
@@ -180,12 +180,11 @@
                 if ( iHn !== undefined ) {
                     do {
                         const strId = this.hostnameSlots[iHn+0];
-                        if ( this.strSlots[strId >>> this.nBits] === value ) {
-                            if ( (strId & exceptionBit) !== 0 ) {
-                                return false;
-                            }
-                            found = true;
+                        const str = this.strSlots[strId >>> this.nBits];
+                        if ( (strId & exceptionBit) !== 0 ) {
+                            if ( str === value || str === '' ) { return false; }
                         }
+                        if ( str === value ) { found = true; }
                         iHn = this.hostnameSlots[iHn+1];
                     } while ( iHn !== 0 );
                 }