diff options
| author | Stephen Blott | 2015-02-01 16:25:50 +0000 |
|---|---|---|
| committer | Stephen Blott | 2015-02-01 16:25:50 +0000 |
| commit | 4e3633c0384e3f37041be14ad3a784c8d27a484b (patch) | |
| tree | 64e791cddfa29e0f162bc7dadb26a0b8d17bae61 /content_scripts/vimium_frontend.coffee | |
| parent | a9b8c4cdc176889c8ef442711109a9b5f4334c16 (diff) | |
| download | vimium-4e3633c0384e3f37041be14ad3a784c8d27a484b.tar.bz2 | |
Exit FindMode on delete from empty query.
This was an oversight from #1413 (that find mode exits in this
circumstance).
Diffstat (limited to 'content_scripts/vimium_frontend.coffee')
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index 5d56ad5b..095bdb74 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -733,15 +733,18 @@ handleEscapeForFindMode = -> window.getSelection().addRange(range) focusFoundLink() || selectFoundInputElement() +# Return if character deleted, false otherwise. handleDeleteForFindMode = -> if (findModeQuery.rawQuery.length == 0) exitFindMode() performFindInPlace() + false else findModeQuery.rawQuery = findModeQuery.rawQuery.substring(0, findModeQuery.rawQuery.length - 1) updateFindModeQuery() performFindInPlace() showFindModeHUDForQuery() + true # <esc> sends us into insert mode if possible, but <cr> does not. # <esc> corresponds approximately to 'nevermind, I have found it already' while <cr> means 'I want to save @@ -762,7 +765,7 @@ class FindMode extends Mode keydown: (event) => if event.keyCode == keyCodes.backspace || event.keyCode == keyCodes.deleteKey - handleDeleteForFindMode() + @exit() unless handleDeleteForFindMode() @suppressEvent else if event.keyCode == keyCodes.enter handleEnterForFindMode() |
