diff options
Diffstat (limited to 'js/net-filtering.js')
| -rw-r--r-- | js/net-filtering.js | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/js/net-filtering.js b/js/net-filtering.js index 6a18cfa..68680ee 100644 --- a/js/net-filtering.js +++ b/js/net-filtering.js @@ -1951,16 +1951,16 @@ FilterContainer.prototype.matchStringExactType = function(pageDetails, requestUR FirstParty : ThirdParty; - // This will be used by hostname-based filters - pageHostname = pageDetails.pageHostname || ''; - // Evaluate dynamic filters first. "Block" dynamic filters are always // "important", they override everything else. - var bf = this.matchDynamicFilters(pageHostname, requestType, party === FirstParty); + var bf = this.matchDynamicFilters(pageDetails.rootHostname, requestType, party === FirstParty); if ( bf !== '' && bf.slice(0, 2) !== '@@' ) { return bf; } + // This will be used by hostname-based filters + pageHostname = pageDetails.pageHostname || ''; + var type = typeNameToTypeValue[requestType]; var categories = this.categories; var buckets = this.buckets; @@ -2043,16 +2043,16 @@ FilterContainer.prototype.matchString = function(pageDetails, requestURL, reques } } - // This will be used by hostname-based filters - pageHostname = pageDetails.pageHostname || ''; - // Evaluate dynamic filters first. "Block" dynamic filters are always // "important", they override everything else. - var bf = this.matchDynamicFilters(pageHostname, requestType, party === FirstParty); + var bf = this.matchDynamicFilters(pageDetails.rootHostname, requestType, party === FirstParty); if ( bf !== '' && bf.slice(0, 2) !== '@@' ) { return bf; } + // This will be used by hostname-based filters + pageHostname = pageDetails.pageHostname || ''; + var type = typeNameToTypeValue[requestType]; var categories = this.categories; var buckets = this.buckets; |