aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Blott2014-10-26 12:58:33 +0000
committerStephen Blott2014-10-26 12:58:33 +0000
commit2c7bebb5f2c873850c2b2d82013cab4eb3d4913c (patch)
tree9a4c55670e0c9f0ff30ed8f1096978f749851a27
parentd2224397a2d6bb9fd897da338e59343853eef62b (diff)
parent8022ad18a6afacf182b3da70d07b685613a36a83 (diff)
downloadvimium-2c7bebb5f2c873850c2b2d82013cab4eb3d4913c.tar.bz2
Merge branch 'smblott-github-flash-blur'
-rw-r--r--content_scripts/vimium_frontend.coffee6
1 files changed, 2 insertions, 4 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 4f7becba..d4347f26 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -398,12 +398,10 @@ onKeydown = (event) ->
keyChar = "<" + keyChar + ">"
if (isInsertMode() && KeyboardUtils.isEscape(event))
- # Note that we can't programmatically blur out of Flash embeds from Javascript.
- if (!isEmbed(event.srcElement))
+ if isEditable(event.srcElement) or isEmbed(event.srcElement)
# Remove focus so the user can't just get himself back into insert mode by typing in the same input
# box.
- if (isEditable(event.srcElement))
- event.srcElement.blur()
+ event.srcElement.blur()
exitInsertMode()
DomUtils.suppressEvent event
handledKeydownEvents.push event