From 3aeb8517d0dd5f9a530e99db662a4945132cf436 Mon Sep 17 00:00:00 2001 From: Stephen Blott Date: Sun, 21 Dec 2014 15:40:10 +0000 Subject: Exclusion; minor updates after review. --- background_scripts/exclusions.coffee | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'background_scripts') diff --git a/background_scripts/exclusions.coffee b/background_scripts/exclusions.coffee index 467e5e70..62647bd8 100644 --- a/background_scripts/exclusions.coffee +++ b/background_scripts/exclusions.coffee @@ -25,13 +25,13 @@ root.Exclusions = Exclusions = # Merge the matching rules for URL, or null. If rules are provided, match against those. getRule: (url, rules=@rules) -> - matching = (rule for rule in rules when rule.pattern and url.match(RegexpCache.get(rule.pattern))) + matches = (rule for rule in rules when rule.pattern and 0 <= url.search(RegexpCache.get(rule.pattern))) # An absolute exclusion rule (with no passKeys) takes priority. - for rule in matching + for rule in matches return rule unless rule.passKeys - if matching.length - pattern: (rule.pattern for rule in matching).join " | " # Not used; for debugging only. - passKeys: Utils.uniqueCharacters (rule.passKeys for rule in matching).join "" + if matches.length + pattern: (rule.pattern for rule in matches).join " | " # Not used; for debugging only. + passKeys: Utils.uniqueCharacters (rule.passKeys for rule in matches).join "" else null -- cgit v1.2.3