aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Blott2015-03-17 15:08:21 +0000
committerStephen Blott2015-03-17 15:08:21 +0000
commit8d09dc19c3e1afb629becef02d7d6cc58d13eaad (patch)
tree3e939b86a9dd0ad81673a337f25e6bac300f3c7d
parentb65f285aa65b2cfbdaefb4d7c445dbd5e684fbbf (diff)
downloadvimium-8d09dc19c3e1afb629becef02d7d6cc58d13eaad.tar.bz2
Activate vomnibar in window.top; yet more clean up.
-rw-r--r--content_scripts/vimium_frontend.coffee5
1 files changed, 4 insertions, 1 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 11ef30cc..a057d654 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -192,6 +192,9 @@ initializePreDomReady = ->
return unless isEnabledForUrl or request.name == 'getActiveState' or request.name == 'setState'
# These requests are delivered to the options page, but there are no handlers there.
return if request.handler in [ "registerFrame", "frameFocused", "unregisterFrame" ]
+ # We don't handle these here. They're handled elsewhere (e.g. in the vomnibar/UI component).
+ return if request.name in [ "frameFocused" ]
+ # Handle the request.
sendResponse requestHandlers[request.name](request, sender)
# Ensure the sendResponse callback is freed.
false
@@ -271,7 +274,7 @@ executePageCommand = (request) ->
if request.command.split(".")[0] == "Vomnibar"
if DomUtils.isTopFrame()
# We pass the frameId from request. That's the frame which originated the request, so that's the frame
- # which whould receive the focus when the vomnibar closes.
+ # which should receive the focus when the vomnibar closes.
Utils.invokeCommandString request.command, [ request.frameId ]
refreshCompletionKeys request
return