From 465c4b65232a2d8e548e14ef3c77b138f937c3b2 Mon Sep 17 00:00:00 2001 From: gorhill Date: Wed, 1 Apr 2015 22:13:13 -0400 Subject: [PATCH] code review --- src/js/dynamic-net-filtering.js | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/js/dynamic-net-filtering.js b/src/js/dynamic-net-filtering.js index dc8a1888f..e1a6572f9 100644 --- a/src/js/dynamic-net-filtering.js +++ b/src/js/dynamic-net-filtering.js @@ -316,23 +316,17 @@ Matrix.prototype.clearRegisters = function() { /******************************************************************************/ var is3rdParty = function(srcHostname, desHostname) { - if ( desHostname === '*' ) { + // If at least one is party-less, the relation can't be labelled + // "3rd-party" + if ( desHostname === '*' || srcHostname === '*' || srcHostname === '' ) { return false; } - // This case occurs for matrix rendering - if ( srcHostname === '*' ) { - return false; - } - var srcDomain = domainFromHostname(srcHostname); - - // This can very well occurs, for examples: + // No domain can very well occurs, for examples: // - localhost // - file-scheme // etc. - if ( srcDomain === '' ) { - srcDomain = srcHostname !== '' ? srcHostname : desHostname; - } + var srcDomain = domainFromHostname(srcHostname) || srcHostname; if ( desHostname.slice(0 - srcDomain.length) !== srcDomain ) { return true;