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

code review re. 60f60c2c97

This commit is contained in:
gorhill 2016-08-30 22:45:24 -04:00
parent 83e66b36f1
commit 35b46cab4c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,7 @@ var ThirdParty = 2 << 2;
var AnyType = 0 << 4;
var typeNameToTypeValue = {
'notype': 0 << 4,
'stylesheet': 1 << 4,
'image': 2 << 4,
'object': 3 << 4,
@ -2432,8 +2433,10 @@ FilterContainer.prototype.matchString = function(context) {
// https://github.com/chrisaljoudi/uBlock/issues/519
// Use exact type match for anything beyond `other`
// Also, be prepared to support unknown types
var type = typeNameToTypeValue[context.requestType] || typeOtherValue;
if ( type > typeOtherValue ) {
var type = typeNameToTypeValue[context.requestType];
if ( type === undefined ) {
type = typeOtherValue;
} else if ( type > typeOtherValue ) {
return this.matchStringExactType(context, context.requestURL, context.requestType);
}

2
src/js/traffic.js
View File

@ -169,7 +169,7 @@ var onBeforeRootFrameRequest = function(details) {
pageDomain: requestDomain,
requestURL: requestURL,
requestHostname: requestHostname,
requestType: 'main_frame'
requestType: 'notype'
};
var result = '';