From 76150e7b982b5cc6b68ad0dcf36c70382fdea30d Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Tue, 2 Sep 2014 13:47:14 +0100
Subject: Structured exclusion rules: Fix typos and minor issues.

---
 background_scripts/main.coffee | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'background_scripts/main.coffee')

diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index 4111ac06..47b215e5 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -74,9 +74,9 @@ getCurrentTabUrl = (request, sender) -> sender.tab.url
 #
 root.isEnabledForUrl = isEnabledForUrl = (request) ->
   rule = Exclusions.getRule(request.url)
-  return { rule: rule, isEnabledForUrl: true,  passKeys: rule.passKeys } if rule and rule.passKeys
-  return { rule: rule, isEnabledForUrl: false, passKeys: "" } if rule
-  return { rule: rule, isEnabledForUrl: true,  passKeys: "" }
+  newIsEnabled = !rule or rule.passKeys
+  newPassKeys = if newIsEnabled and rule then rule.passKeys else ""
+  { rule: rule, isEnabledForUrl: newIsEnabled, passKeys: newPassKeys }
 
 # Called by the popup UI.  If an existing exclusion rule has been changed, then the existing rule is updated.
 # Otherwise, the new rule is added.
-- 
cgit v1.2.3