diff options
| author | Stephen Blott | 2015-03-08 10:47:02 +0000 |
|---|---|---|
| committer | Stephen Blott | 2015-03-08 10:47:02 +0000 |
| commit | fabe391e80e9f90b656786fb58795b9769457253 (patch) | |
| tree | 1ece3bdff028fc839c5bf6da388e41939fd91274 /content_scripts | |
| parent | e49b701fb813e147a187058fe7eda4bfa2d40bec (diff) | |
| parent | b15d5231e1660aff220885a3feab62eaa5b9861d (diff) | |
| download | vimium-fabe391e80e9f90b656786fb58795b9769457253.tar.bz2 | |
Merge branch 'mrmr1993-loadScriptsOnUpdate'
Diffstat (limited to 'content_scripts')
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index b2d9f735..66922084 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -210,6 +210,7 @@ window.initializeWhenEnabled = -> for type in [ "keydown", "keypress", "keyup", "click", "focus", "blur", "mousedown" ] do (type) -> installListener window, type, (event) -> handlerStack.bubbleEvent type, event installListener document, "DOMActivate", (event) -> handlerStack.bubbleEvent 'DOMActivate', event + installListener document, "focus", detectFocus installedListeners = true FindModeHistory.init() @@ -229,7 +230,7 @@ getActiveState = -> # # The backend needs to know which frame has focus. # -window.addEventListener "focus", -> +detectFocus = -> # settings may have changed since the frame last had focus settings.load() chrome.runtime.sendMessage({ handler: "frameFocused", frameId: frameId }) |