Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-07 03:12:33 +01:00
Code Issues Releases Wiki Activity

fix #2448

Browse Source
This commit is contained in:
gorhill 2017-03-13 13:03:51 -04:00
parent fba8ea2e75
commit cf123b9264
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
3 changed files with 57 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/js/contentscript.js
View File

@ -233,9 +233,9 @@ var platformHideNode = vAPI.hideNode,
observer, observer,
changedNodes = [], changedNodes = [],
observerOptions = { observerOptions = {
attributes: true, attributes: true,
attributeFilter: [ 'style' ] attributeFilter: [ 'style' ]
}; };
// https://jsperf.com/clientheight-and-clientwidth-vs-getcomputedstyle // https://jsperf.com/clientheight-and-clientwidth-vs-getcomputedstyle
// Avoid getComputedStyle(), detecting whether a node is visible can be // Avoid getComputedStyle(), detecting whether a node is visible can be
@ -489,9 +489,9 @@ var domFilterer = {
hiddenNodeEnforcer: false, hiddenNodeEnforcer: false,
loggerEnabled: undefined, loggerEnabled: undefined,
newHideSelectorBuffer: [], // Hide style filter buffer newHideSelectorBuffer: [], // Hide style filter buffer
newStyleRuleBuffer: [], // Non-hide style filter buffer newStyleRuleBuffer: [], // Non-hide style filter buffer
simpleHideSelectors: { // Hiding filters: simple selectors simpleHideSelectors: { // Hiding filters: simple selectors
entries: [], entries: [],
matchesProp: vAPI.matchesProp, matchesProp: vAPI.matchesProp,
selector: undefined, selector: undefined,
@ -513,7 +513,7 @@ var domFilterer = {
} }
} }
}, },
complexHideSelectors: { // Hiding filters: complex selectors complexHideSelectors: { // Hiding filters: complex selectors
entries: [], entries: [],
selector: undefined, selector: undefined,
add: function(selector) { add: function(selector) {
@ -531,13 +531,8 @@ var domFilterer = {
} }
} }
}, },
styleSelectors: { // Style filters nqsSelectors: [], // Non-querySelector-able filters
entries: [], proceduralSelectors: { // Hiding filters: procedural
add: function(o) {
this.entries.push(o);
}
},
proceduralSelectors: { // Hiding filters: procedural
entries: [], entries: [],
add: function(o) { add: function(o) {
this.entries.push(new PSelector(o)); this.entries.push(new PSelector(o));
@ -578,7 +573,12 @@ var domFilterer = {
var o = JSON.parse(selector); var o = JSON.parse(selector);
if ( o.style ) { if ( o.style ) {
this.newStyleRuleBuffer.push(o.style.join(' ')); this.newStyleRuleBuffer.push(o.style.join(' '));
this.styleSelectors.add(o); this.nqsSelectors.push(o.raw);
return;
}
if ( o.pseudoclass ) {
this.newHideSelectorBuffer.push(o.raw);
this.nqsSelectors.push(o.raw);
return; return;
} }
if ( o.tasks ) { if ( o.tasks ) {

45
src/js/cosmetic-filtering.js
View File

@ -1,7 +1,7 @@
/******************************************************************************* /*******************************************************************************
uBlock Origin - a browser extension to block requests. uBlock Origin - a browser extension to block requests.
Copyright (C) 2014-2016 Raymond Hill Copyright (C) 2014-2017 Raymond Hill
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -732,7 +732,8 @@ FilterContainer.prototype.freeze = function() {
// https://github.com/gorhill/uBlock/issues/1752 // https://github.com/gorhill/uBlock/issues/1752
FilterContainer.prototype.compileSelector = (function() { FilterContainer.prototype.compileSelector = (function() {
var reStyleSelector = /^(.+?):style\((.+?)\)$/, var reAfterBeforeSelector = /^(.+?)(::?after|::?before)$/,
reStyleSelector = /^(.+?):style\((.+?)\)$/,
reStyleBad = /url\([^)]+\)/, reStyleBad = /url\([^)]+\)/,
reScriptSelector = /^script:(contains|inject)\((.+)\)$/, reScriptSelector = /^script:(contains|inject)\((.+)\)$/,
div = document.createElement('div'); div = document.createElement('div');
@ -751,17 +752,43 @@ FilterContainer.prototype.compileSelector = (function() {
} }
// We rarely reach this point. // We rarely reach this point.
var matches; var matches,
selector = raw,
pseudoclass,
style;
// `:style` selector? // `:style` selector?
if ( if ( (matches = reStyleSelector.exec(selector)) !== null ) {
(matches = reStyleSelector.exec(raw)) !== null && selector = matches[1];
isValidCSSSelector(matches[1]) && style = matches[2];
isValidStyleProperty(matches[2]) }
) {
// https://github.com/gorhill/uBlock/issues/2448
// :after- or :before-based selector?
if ( (matches = reAfterBeforeSelector.exec(selector)) ) {
selector = matches[1];
pseudoclass = matches[2];
}
if ( style !== undefined || pseudoclass !== undefined ) {
if ( isValidCSSSelector(selector) === false ) {
return;
}
if ( pseudoclass !== undefined ) {
selector += pseudoclass;
}
if ( style !== undefined ) {
if ( isValidStyleProperty(style) === false ) {
return;
}
return JSON.stringify({
raw: raw,
style: [ selector, '{' + style + '}' ]
});
}
return JSON.stringify({ return JSON.stringify({
raw: raw, raw: raw,
style: [ matches[1], '{' + matches[2] + '}' ] pseudoclass: true
}); });
} }

15
src/js/scriptlets/cosmetic-logger.js
View File

@ -1,7 +1,7 @@
/******************************************************************************* /*******************************************************************************
uBlock Origin - a browser extension to block requests. uBlock Origin - a browser extension to block requests.
Copyright (C) 2015-2016 Raymond Hill Copyright (C) 2015-2017 Raymond Hill
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -51,14 +51,11 @@ vAPI.domFilterer.simpleHideSelectors.entries.forEach(evaluateSelector);
// Complex CSS selector-based cosmetic filters. // Complex CSS selector-based cosmetic filters.
vAPI.domFilterer.complexHideSelectors.entries.forEach(evaluateSelector); vAPI.domFilterer.complexHideSelectors.entries.forEach(evaluateSelector);
// Style cosmetic filters. // Non-querySelector-able filters.
vAPI.domFilterer.styleSelectors.entries.forEach(function(filter) { vAPI.domFilterer.nqsSelectors.forEach(function(filter) {
if ( if ( loggedSelectors.hasOwnProperty(filter) === false ) {
loggedSelectors.hasOwnProperty(filter.raw) === false && loggedSelectors[filter] = true;
document.querySelector(filter.style[0]) !== null matchedSelectors.push(filter);
) {
loggedSelectors[filter.raw] = true;
matchedSelectors.push(filter.raw);
} }
}); });