From c237fd47d47f93bc2b23bd7e68df44bd5d9fecb5 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Mon, 27 Apr 2015 15:53:59 +0100
Subject: Do not remove inner whitespace from passkeys.

Fixes #1585.
---
 background_scripts/exclusions.coffee | 4 +++-
 pages/options.coffee                 | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/background_scripts/exclusions.coffee b/background_scripts/exclusions.coffee
index 55ced3ef..b3a3960d 100644
--- a/background_scripts/exclusions.coffee
+++ b/background_scripts/exclusions.coffee
@@ -31,9 +31,11 @@ root.Exclusions = Exclusions =
     # An absolute exclusion rule (with no passKeys) takes priority.
     for rule in matches
       return rule unless rule.passKeys
+    # Strip whitespace from all matching passKeys strings, and join them together.
+    passKeys = (rule.passKeys.split(/\s+/).join "" for rule in matches).join ""
     if 0 < matches.length
       pattern: (rule.pattern for rule in matches).join " | " # Not used; for debugging only.
-      passKeys: Utils.distinctCharacters (rule.passKeys for rule in matches).join ""
+      passKeys: Utils.distinctCharacters passKeys
     else
       null
 
diff --git a/pages/options.coffee b/pages/options.coffee
index 6545189b..b3ecf69a 100644
--- a/pages/options.coffee
+++ b/pages/options.coffee
@@ -118,8 +118,8 @@ class ExclusionRulesOption extends Option
   readValueFromElement: ->
     rules =
       for element in @element.getElementsByClassName "exclusionRuleTemplateInstance"
-        pattern: @getPattern(element).value.split(/\s+/).join ""
-        passKeys: @getPassKeys(element).value.split(/\s+/).join ""
+        pattern: @getPattern(element).value.trim()
+        passKeys: @getPassKeys(element).value.trim()
     rules.filter (rule) -> rule.pattern
 
   areEqual: (a,b) ->
-- 
cgit v1.2.3