From 5b84f5cf94d32b6e8be75448f9c06aa7f2068582 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sun, 15 Mar 2015 15:38:36 +0000
Subject: Tidy up exclusion rules/propagation.

---
 content_scripts/vimium_frontend.coffee | 6 +++---
 pages/options.coffee                   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index b96157c1..d0fc158c 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -150,7 +150,7 @@ initializePreDomReady = ->
   settings.load()
 
   initializeModes()
-  checkIfEnabledForUrl true # true means checkIfEnabledForUrl is being called on start up.
+  checkIfEnabledForUrl()
   refreshCompletionKeys()
 
   # Send the key to the key handler in the background page.
@@ -547,7 +547,7 @@ onKeyup = (event) ->
   DomUtils.suppressPropagation(event)
   @stopBubblingAndTrue
 
-checkIfEnabledForUrl = (onStartUp = false) ->
+checkIfEnabledForUrl = ->
   url = window.location.toString()
 
   chrome.runtime.sendMessage { handler: "isEnabledForUrl", url: url }, (response) ->
@@ -556,7 +556,7 @@ checkIfEnabledForUrl = (onStartUp = false) ->
     isIncognitoMode = response.incognito
     if isEnabledForUrl
       initializeWhenEnabled()
-    else if onStartUp and HUD.isReady()
+    else if HUD.isReady()
       # Quickly hide any HUD we might already be showing, e.g. if we entered insert mode on page load.
       HUD.hide()
     handlerStack.bubbleEvent "registerStateChange",
diff --git a/pages/options.coffee b/pages/options.coffee
index f60f3bb4..6545189b 100644
--- a/pages/options.coffee
+++ b/pages/options.coffee
@@ -304,7 +304,7 @@ initPopupPage = ->
         window.close()
 
     # Populate options. Just one, here.
-    exclusions = new ExclusionRulesOnPopupOption(url, "exclusionRules", onUpdated)
+    exclusions = new ExclusionRulesOnPopupOption url, "exclusionRules", onUpdated
 
     updateState()
     document.addEventListener "keyup", updateState
-- 
cgit v1.2.3