aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormrmr19932015-05-31 18:01:42 +0100
committermrmr19932015-05-31 18:01:42 +0100
commit7e67c3d36b47641b21ec24be5d8f7af11ad08756 (patch)
tree1ab19054c86d98f6403ef2e28453e578742fc508
parentc17914f59a27779d102a80ccee27f08298b7c015 (diff)
downloadvimium-7e67c3d36b47641b21ec24be5d8f7af11ad08756.tar.bz2
Init Settings directly instead of via settings.load, and only do it once
-rw-r--r--content_scripts/vimium_frontend.coffee5
1 files changed, 1 insertions, 4 deletions
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