Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge changes from master

This commit is contained in:
Raymond Hill 2018-12-31 12:11:28 -05:00
parent 08261e3c15 dcf6046f8c
commit d8674d8abe
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/firefox/updates.json vendored
View File

@ -3,10 +3,10 @@
"uBlock0@raymondhill.net": {
"updates": [
{
"version": "1.17.5.103",
"version": "1.17.5.104",
"applications": { "gecko": { "strict_min_version": "52" } },
"update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.17.5rc3",
"update_link": "https://github.com/gorhill/uBlock/releases/download/1.17.5rc3/uBlock0_1.17.5rc3.firefox.signed.xpi"
"update_info_url": "https://github.com/gorhill/uBlock/releases/tag/1.17.5rc4",
"update_link": "https://github.com/gorhill/uBlock/releases/download/1.17.5rc4/uBlock0_1.17.5rc4.firefox.signed.xpi"
}
]
}

2
dist/version vendored
View File

@ -1 +1 @@
1.17.5.103
1.17.5.104

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

@ -1054,14 +1054,8 @@ FilterContainer.prototype.retrieveGenericSelectors = function(request) {
for ( let type in this.lowlyGeneric ) {
let entry = this.lowlyGeneric[type];
let selectors = request[entry.canonical];
if ( typeof selectors !== 'string' ) { continue; }
let strEnd = selectors.length;
let sliceBeg = 0;
do {
let sliceEnd = selectors.indexOf('\n', sliceBeg);
if ( sliceEnd === -1 ) { sliceEnd = strEnd; }
let selector = selectors.slice(sliceBeg, sliceEnd);
sliceBeg = sliceEnd + 1;
if ( Array.isArray(selectors) === false ) { continue; }
for ( let selector of selectors ) {
if ( entry.simple.has(selector) === false ) { continue; }
let bucket = entry.complex.get(selector);
if ( bucket !== undefined ) {
@ -1080,7 +1074,7 @@ FilterContainer.prototype.retrieveGenericSelectors = function(request) {
simpleSelectors.add(selector);
}
}
} while ( sliceBeg < strEnd );
}
}
// Apply exceptions: it is the responsibility of the caller to provide