From d7597f407ea7932b1f985160c3f688801d035fcc Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Wed, 29 Oct 2014 21:34:32 +0000
Subject: Reintroduce 2c7bebb5f2c873850c2b2d82013cab4eb3d4913c

---
 content_scripts/vimium_frontend.coffee | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'content_scripts')

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 2de612d4..90ac227a 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -436,15 +436,13 @@ 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()
-      exitInsertMode()
-      DomUtils.suppressEvent event
-      KeydownEvents.push event
+      event.srcElement.blur()
+    exitInsertMode()
+    DomUtils.suppressEvent event
+    handledKeydownEvents.push event
 
   else if (findMode)
     if (KeyboardUtils.isEscape(event))
-- 
cgit v1.2.3