From 2f27d4590ba30f5a443aedff12d9611a83a4f771 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Tue, 2 Sep 2014 16:46:17 +0100
Subject: Structured exclusion rules: Simplify isEnabledForUrl.

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

(limited to 'background_scripts')

diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index 47b215e5..4e6f406e 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -74,9 +74,11 @@ getCurrentTabUrl = (request, sender) -> sender.tab.url
 #
 root.isEnabledForUrl = isEnabledForUrl = (request) ->
   rule = Exclusions.getRule(request.url)
-  newIsEnabled = !rule or rule.passKeys
-  newPassKeys = if newIsEnabled and rule then rule.passKeys else ""
-  { rule: rule, isEnabledForUrl: newIsEnabled, passKeys: newPassKeys }
+  {
+    rule: rule
+    isEnabledForUrl: not rule or rule.passKeys
+    passKeys: rule?.passKeys or ""
+  }
 
 # 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