diff options
| author | Stephen Blott | 2014-12-21 15:40:10 +0000 |
|---|---|---|
| committer | Stephen Blott | 2014-12-21 15:47:23 +0000 |
| commit | 3aeb8517d0dd5f9a530e99db662a4945132cf436 (patch) | |
| tree | aacdc57135847df70a12b640c425dbf12790ca6b /background_scripts | |
| parent | 53be2881db3a7d77ef9dbf92f87fba3b99873530 (diff) | |
| download | vimium-3aeb8517d0dd5f9a530e99db662a4945132cf436.tar.bz2 | |
Exclusion; minor updates after review.
Diffstat (limited to 'background_scripts')
| -rw-r--r-- | background_scripts/exclusions.coffee | 10 |
1 files changed, 5 insertions, 5 deletions
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 |