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

need to maybe skip type after transposition

This commit is contained in:
gorhill 2015-01-07 20:42:19 -05:00
parent ae2eb25e25
commit bdf770a1bb
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/js/dynamic-net-filtering.js
View File

@ -38,13 +38,11 @@ var Matrix = function() {
/******************************************************************************/ /******************************************************************************/
var supportedTypes = { var supportedDynamicTypes = {
'*': true, '*': true,
'inline-script': true, 'inline-script': true,
'script': true,
'1p-script': true, '1p-script': true,
'3p-script': true, '3p-script': true,
'sub_frame': true,
'3p-frame': true, '3p-frame': true,
'image': true 'image': true
}; };
@ -261,11 +259,6 @@ Matrix.prototype.evaluateCellZY = function(srcHostname, desHostname, type) {
} }
// Any destination + specific-type // Any destination + specific-type
if ( supportedTypes.hasOwnProperty(type) === false ) {
this.type = '';
return this;
}
this.y = '*'; this.y = '*';
if ( type === 'script' ) { if ( type === 'script' ) {
@ -274,6 +267,12 @@ Matrix.prototype.evaluateCellZY = function(srcHostname, desHostname, type) {
type = '3p-frame'; type = '3p-frame';
} }
// Is this a type suitable for dynamic filtering purpose?
if ( supportedDynamicTypes.hasOwnProperty(type) === false ) {
this.type = '';
return this;
}
this.type = type; this.type = type;
this.r = this.evaluateCellZ(srcHostname, '*', type); this.r = this.evaluateCellZ(srcHostname, '*', type);