Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-15 07:22:28 +02:00
Code Issues Releases Wiki Activity

Take into account simple selectors present in array of selectors

Browse Source 
Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/1692
This commit is contained in:
Raymond Hill 2021-08-24 12:29:48 -04:00
parent 811a9be45f
commit 6dcd5df991
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -842,25 +842,26 @@ FilterContainer.prototype.retrieveGenericSelectors = function(request) {
const entry = this.lowlyGeneric[type]; const entry = this.lowlyGeneric[type];
const selectors = request[entry.canonical]; const selectors = request[entry.canonical];
if ( Array.isArray(selectors) === false ) { continue; } if ( Array.isArray(selectors) === false ) { continue; }
for ( const selector of selectors ) { for ( const identifier of selectors ) {
if ( entry.simple.has(selector) === false ) { continue; } if ( entry.simple.has(identifier) === false ) { continue; }
const bucket = entry.complex.get(selector); const bucket = entry.complex.get(identifier);
if ( bucket === undefined ) { if ( typeof bucket === 'string' ) {
if ( safeOnly ) { continue; }
const simpleSelector = entry.prefix + selector;
if ( previousHits.has(simpleSelector) ) { continue; }
simpleSelectors.add(simpleSelector);
continue;
}
if ( Array.isArray(bucket) === false ) {
if ( previousHits.has(bucket) ) { continue; } if ( previousHits.has(bucket) ) { continue; }
complexSelectors.add(bucket); complexSelectors.add(bucket);
continue; continue;
} }
for ( const selector of bucket ) { const simpleSelector = entry.prefix + identifier;
if ( previousHits.has(selector) ) { continue; } if ( Array.isArray(bucket) ) {
complexSelectors.add(selector); for ( const complexSelector of bucket ) {
if ( previousHits.has(complexSelector) ) { continue; }
if ( safeOnly && complexSelector === simpleSelector ) { continue; }
complexSelectors.add(complexSelector);
}
continue;
} }
if ( previousHits.has(simpleSelector) ) { continue; }
if ( safeOnly ) { continue; }
simpleSelectors.add(simpleSelector);
} }
} }