From 7e67c3d36b47641b21ec24be5d8f7af11ad08756 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Sun, 31 May 2015 18:01:42 +0100
Subject: Init Settings directly instead of via settings.load, and only do it
 once

---
 content_scripts/vimium_frontend.coffee | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'content_scripts')

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 17922659..5655ef61 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -68,8 +68,6 @@ settings =
     @port = true
     Settings.init()
 
-  load: -> @init() unless @port
-
 #
 # Give this frame a unique (non-zero) id.
 #
@@ -156,7 +154,7 @@ window.initializeModes = ->
 #
 initializePreDomReady = ->
   Settings.addEventListener "load", LinkHints.init.bind LinkHints
-  settings.load()
+  Settings.init()
 
   initializeModes()
   checkIfEnabledForUrl()
@@ -240,7 +238,6 @@ window.installListeners = ->
 #
 onFocus = (event) ->
   if event.target == window
-    settings.load()
     chrome.runtime.sendMessage handler: "frameFocused", frameId: frameId
     checkIfEnabledForUrl true
 
-- 
cgit v1.2.3