From bdf770a1bb17b98a0cf5a84e7954bcb1656c6204 Mon Sep 17 00:00:00 2001 From: gorhill Date: Wed, 7 Jan 2015 20:42:19 -0500 Subject: [PATCH] need to maybe skip type after transposition --- src/js/dynamic-net-filtering.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/js/dynamic-net-filtering.js b/src/js/dynamic-net-filtering.js index aeb488b36..53d9885b6 100644 --- a/src/js/dynamic-net-filtering.js +++ b/src/js/dynamic-net-filtering.js @@ -38,13 +38,11 @@ var Matrix = function() { /******************************************************************************/ -var supportedTypes = { +var supportedDynamicTypes = { '*': true, 'inline-script': true, - 'script': true, '1p-script': true, '3p-script': true, - 'sub_frame': true, '3p-frame': true, 'image': true }; @@ -261,11 +259,6 @@ Matrix.prototype.evaluateCellZY = function(srcHostname, desHostname, type) { } // Any destination + specific-type - if ( supportedTypes.hasOwnProperty(type) === false ) { - this.type = ''; - return this; - } - this.y = '*'; if ( type === 'script' ) { @@ -274,6 +267,12 @@ Matrix.prototype.evaluateCellZY = function(srcHostname, desHostname, type) { 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.r = this.evaluateCellZ(srcHostname, '*', type);