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

elemhide is (and has always been) really generichide

Browse Source
This commit is contained in:
gorhill 2016-10-27 08:33:19 -04:00
parent 6062ec9b23
commit de587335bd
3 changed files with 27 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/logger-ui.js
View File

@ -176,7 +176,7 @@ var filterDecompiler = (function() {
10: 'other',
11: 'popunder',
12: 'document',
13: 'elemhide',
13: 'generichide',
14: 'inline-script',
15: 'popup'
};

6
src/js/pagestore.js
View File

@ -334,16 +334,14 @@ PageStore.prototype.init = function(tabId) {
this.noGenericCosmeticFiltering = µb.staticNetFilteringEngine.matchStringExactType(
this.createContextFromPage(),
tabContext.normalURL,
'elemhide'
'generichide'
) === false;
if ( µb.logger.isEnabled() && this.noGenericCosmeticFiltering ) {
// https://github.com/gorhill/uBlock/issues/370
// Log using `cosmetic-filtering`, not `elemhide`.
µb.logger.writeOne(
tabId,
'net',
µb.staticNetFilteringEngine.toResultString(true),
'elemhide',
'generichide',
tabContext.rawURL,
this.tabHostname,
this.tabHostname

62
src/js/static-net-filtering.js
View File

@ -68,7 +68,7 @@ var typeNameToTypeValue = {
'other': 10 << 4,
'popunder': 11 << 4,
'main_frame': 12 << 4,
'elemhide': 13 << 4,
'generichide': 13 << 4,
'inline-script': 14 << 4,
'popup': 15 << 4
};
@ -87,7 +87,7 @@ var typeValueToTypeName = {
10: 'other',
11: 'popunder',
12: 'document',
13: 'elemhide',
13: 'generichide',
14: 'inline-script',
15: 'popup'
};
@ -337,57 +337,42 @@ var hostnameMissTest = function(owner) {
};
var hostnameHitSetTest = function(owner) {
var dict = owner._hostnameDict;
var needle = pageHostnameRegister;
var pos;
var dict = owner._hostnameDict,
needle = pageHostnameRegister,
pos;
for (;;) {
if ( dict.has(needle) ) {
return true;
}
if ( dict.has(needle) ) { return true; }
pos = needle.indexOf('.');
if ( pos === -1 ) {
break;
}
if ( pos === -1 ) { break; }
needle = needle.slice(pos + 1);
}
return false;
};
var hostnameMissSetTest = function(owner) {
var dict = owner._hostnameDict;
var needle = pageHostnameRegister;
var pos;
var dict = owner._hostnameDict,
needle = pageHostnameRegister,
pos;
for (;;) {
if ( dict.has(needle) ) {
return false;
}
if ( dict.has(needle) ) { return false; }
pos = needle.indexOf('.');
if ( pos === -1 ) {
break;
}
if ( pos === -1 ) { break; }
needle = needle.slice(pos + 1);
}
return true;
};
var hostnameMixedSetTest = function(owner) {
var dict = owner._hostnameDict;
var needle = pageHostnameRegister;
var hit = false;
var v, pos;
var dict = owner._hostnameDict,
needle = pageHostnameRegister,
hit = false,
v, pos;
for (;;) {
v = dict.get(needle);
if ( v === false ) {
return false;
}
if ( v === true ) {
hit = true;
}
if ( v === false ) { return false; }
if ( v === true ) { hit = true; }
pos = needle.indexOf('.');
if ( pos === -1 ) {
break;
}
if ( pos === -1 ) { break; }
needle = needle.slice(pos + 1);
}
return hit;
@ -1180,7 +1165,8 @@ FilterParser.prototype.toNormalizedType = {
'other': 'other',
'popunder': 'popunder',
'document': 'main_frame',
'elemhide': 'elemhide',
'generichide': 'generichide',
'elemhide': 'generichide',
'inline-script': 'inline-script',
'popup': 'popup'
};
@ -1272,7 +1258,7 @@ FilterParser.prototype.parseOptions = function(s) {
// adding support for the new keyword.
if ( opt === 'elemhide' || opt === 'generichide' ) {
if ( this.action === AllowAction ) {
this.parseOptType('elemhide', false);
this.parseOptType('generichide', false);
continue;
}
this.unsupported = true;
@ -2223,9 +2209,9 @@ FilterContainer.prototype.matchStringExactType = function(context, requestURL, r
var key, bucket;
// https://github.com/gorhill/uBlock/issues/1477
// Special case: blocking elemhide filter ALWAYS exists, it is implicit --
// Special case: blocking generichide filter ALWAYS exists, it is implicit --
// thus we always and only check for exception filters.
if ( requestType === 'elemhide' ) {
if ( requestType === 'generichide' ) {
key = AllowAnyParty | type;
if (
(bucket = categories.get(toHex(key))) &&