aboutsummaryrefslogtreecommitdiffstats
path: root/src/js/static-net-filtering.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/js/static-net-filtering.js')
-rw-r--r--src/js/static-net-filtering.js11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
index 1e81d4a..3e106a9 100644
--- a/src/js/static-net-filtering.js
+++ b/src/js/static-net-filtering.js
@@ -68,7 +68,7 @@ var typeNameToTypeValue = {
'inline-script': 14 << 4,
'popup': 15 << 4
};
-var typeOtherToTypeValue = typeNameToTypeValue['other'];
+var typeOtherToTypeValue = typeNameToTypeValue.other;
const BlockAnyTypeAnyParty = BlockAction | AnyType | AnyParty;
const BlockAnyType = BlockAction | AnyType;
@@ -1756,9 +1756,10 @@ FilterContainer.prototype.matchStringExactType = function(context, requestURL, r
pageHostname = context.pageHostname || '';
// Be prepared to support unknown types
- var type = typeNameToTypeValue[requestType] || typeOtherToTypeValue;
- var categories = this.categories;
+ var bf = false;
var bucket;
+ var categories = this.categories;
+ var type = typeNameToTypeValue[requestType] || typeOtherToTypeValue;
// Tokenize only once
this.tokenize(url);
@@ -1779,7 +1780,6 @@ FilterContainer.prototype.matchStringExactType = function(context, requestURL, r
}
// Test against block filters
- bf = false;
if ( bucket = categories[this.makeCategoryKey(BlockAnyParty | type)] ) {
bf = this.matchTokens(bucket, url);
}
@@ -1855,12 +1855,13 @@ FilterContainer.prototype.matchString = function(context) {
// This will be used by hostname-based filters
pageHostname = context.pageHostname || '';
+ var bf, bucket;
var categories = this.categories;
- var bucket;
// Tokenize only once
this.tokenize(url);
+
// https://github.com/gorhill/uBlock/issues/139
// Test against important block filters.
// The purpose of the `important` option is to reverse the order of