From aa6e0d563d088179cfbd87d753c7c71d45951262 Mon Sep 17 00:00:00 2001 From: gorhill Date: Mon, 23 Feb 2015 23:25:14 -0500 Subject: [PATCH] code review --- src/js/cosmetic-filtering.js | 37 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src/js/cosmetic-filtering.js b/src/js/cosmetic-filtering.js index c97de733a..1f54e0b79 100644 --- a/src/js/cosmetic-filtering.js +++ b/src/js/cosmetic-filtering.js @@ -571,27 +571,28 @@ FilterContainer.prototype.compile = function(s, out) { var i = hostnames.length; if ( i === 0 ) { this.compileGenericSelector(parsed, out); - } else { - // https://github.com/gorhill/uBlock/issues/151 - // Negated hostname means the filter applies to all non-negated hostnames - // of same filter OR globally if there is no non-negated hostnames. - var applyGlobally = true; - var hostname; - while ( i-- ) { - hostname = hostnames[i]; - if ( hostname.charAt(0) !== '~' ) { - applyGlobally = false; - } - if ( hostname.slice(-2) === '.*' ) { - this.compileEntitySelector(hostname, parsed, out); - } else { - this.compileHostnameSelector(hostname, parsed, out); - } + return true; + } + + // https://github.com/gorhill/uBlock/issues/151 + // Negated hostname means the filter applies to all non-negated hostnames + // of same filter OR globally if there is no non-negated hostnames. + var applyGlobally = true; + var hostname; + while ( i-- ) { + hostname = hostnames[i]; + if ( hostname.charAt(0) !== '~' ) { + applyGlobally = false; } - if ( applyGlobally ) { - this.compileGenericSelector(parsed, out); + if ( hostname.slice(-2) === '.*' ) { + this.compileEntitySelector(hostname, parsed, out); + } else { + this.compileHostnameSelector(hostname, parsed, out); } } + if ( applyGlobally ) { + this.compileGenericSelector(parsed, out); + } return true; };