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

removed stray git-conflict line

This commit is contained in:
gorhill 2015-01-24 08:21:14 -05:00
parent 8088fa08ff
commit d5fdd84da4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ var typeNameToTypeValue = {
'inline-script': 14 << 4, 'inline-script': 14 << 4,
'popup': 15 << 4 'popup': 15 << 4
}; };
var typeOtherToTypeValue = typeNameToTypeValue.other; var typeOtherValue = typeNameToTypeValue.other;
const BlockAnyTypeAnyParty = BlockAction | AnyType | AnyParty; const BlockAnyTypeAnyParty = BlockAction | AnyType | AnyParty;
const BlockAnyType = BlockAction | AnyType; const BlockAnyType = BlockAction | AnyType;
@ -1867,10 +1867,9 @@ FilterContainer.prototype.matchStringExactType = function(context, requestURL, r
pageHostname = context.pageHostname || ''; pageHostname = context.pageHostname || '';
// Be prepared to support unknown types // Be prepared to support unknown types
var type = typeNameToTypeValue[requestType] || typeOtherToTypeValue; var type = typeNameToTypeValue[requestType] || typeOtherValue;
var categories = this.categories; var categories = this.categories;
var bf = false, bucket; var bf = false, bucket;
>>>>>>> f718e8e1f239690eae7ff964e1e2c3535c781043
// Tokenize only once // Tokenize only once
this.tokenize(url); this.tokenize(url);
@ -1928,7 +1927,7 @@ FilterContainer.prototype.matchString = function(context) {
// https://github.com/gorhill/uBlock/issues/519 // https://github.com/gorhill/uBlock/issues/519
// Use exact type match for anything beyond `other` // Use exact type match for anything beyond `other`
// Also, be prepared to support unknown types // Also, be prepared to support unknown types
var type = typeNameToTypeValue[context.requestType] || typeOtherToTypeValue; var type = typeNameToTypeValue[context.requestType] || typeOtherValue;
if ( type > 8 << 4 ) { if ( type > 8 << 4 ) {
return this.matchStringExactType(context, context.requestURL, context.requestType); return this.matchStringExactType(context, context.requestURL, context.requestType);
} }