diff --git a/src/js/contentscript.js b/src/js/contentscript.js index 3efd77f75..ed6af7c72 100644 --- a/src/js/contentscript.js +++ b/src/js/contentscript.js @@ -777,11 +777,6 @@ vAPI.injectScriptlet = function(doc, text) { for ( const raw of selectors ) { if ( this.selectors.has(raw) ) { continue; } const o = JSON.parse(raw); - if ( o.pseudo !== undefined ) { - this.domFilterer.addCSSRule(o.selector, vAPI.hideStyle); - mustCommit = true; - continue; - } // CSS selector-based styles. if ( o.action !== undefined && @@ -792,6 +787,11 @@ vAPI.injectScriptlet = function(doc, text) { mustCommit = true; continue; } + if ( o.pseudo !== undefined ) { + this.domFilterer.addCSSRule(o.selector, vAPI.hideStyle); + mustCommit = true; + continue; + } let style, styleToken; if ( o.action === undefined ) { style = vAPI.hideStyle; diff --git a/src/js/static-filtering-parser.js b/src/js/static-filtering-parser.js index 143c06aa1..2a4f823ce 100644 --- a/src/js/static-filtering-parser.js +++ b/src/js/static-filtering-parser.js @@ -1215,6 +1215,7 @@ Parser.prototype.SelectorCompiler = class { if ( hasBits(this.parser.flavorBits, BITFlavorExtStyle) ) { raw = this.translateAdguardCSSInjectionFilter(raw); if ( raw === '' ) { return false; } + this.parser.flavorBits &= ~BITFlavorExtStyle; out.raw = raw; } @@ -1264,7 +1265,7 @@ Parser.prototype.SelectorCompiler = class { } translateAdguardCSSInjectionFilter(suffix) { - const matches = /^([^{]+)\{([^}]+)\}\s*$/.exec(suffix); + const matches = /^(.*)\s*\{([^}]+)\}\s*$/.exec(suffix); if ( matches === null ) { return ''; } const selector = matches[1].trim(); const style = matches[2].trim();