diff options
| author | Stephen Blott | 2014-12-22 16:51:46 +0000 |
|---|---|---|
| committer | Stephen Blott | 2014-12-22 16:51:46 +0000 |
| commit | b422c6f905b6d768b2bc1eef0870388b7be1b34c (patch) | |
| tree | aa08757923dd3e546eb814856c61778f4f8f5982 | |
| parent | 0b103631a22b3d6b7c94484133549887f9afd4cf (diff) | |
| parent | d7597f407ea7932b1f985160c3f688801d035fcc (diff) | |
| download | vimium-b422c6f905b6d768b2bc1eef0870388b7be1b34c.tar.bz2 | |
Merge branch 'blur-on-escape2' of https://github.com/mrmr1993/vimium into mrmr1993-blur-on-escape2
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index 6ad50da6..eacba682 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -455,15 +455,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)) |