diff options
| author | mrmr1993 | 2015-06-02 15:57:40 +0100 |
|---|---|---|
| committer | mrmr1993 | 2015-06-10 17:21:23 +0100 |
| commit | 7fc0492aa1f459588d6bd4e2397c4858fcdd6c4b (patch) | |
| tree | 2c91e9ecfdbff4df3f2fc89ef6f03ad94d73b66f /content_scripts | |
| parent | 51c427a30b568b9116baeaf5bafd64acc7a6409c (diff) | |
| download | vimium-7fc0492aa1f459588d6bd4e2397c4858fcdd6c4b.tar.bz2 | |
Remove redundant code from FindMode keydown handler, inline delete code
Diffstat (limited to 'content_scripts')
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index 01e3399a..413c06d0 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -722,8 +722,6 @@ handleEscapeForFindMode = -> window.getSelection().addRange(range) focusFoundLink() || selectFoundInputElement() -handleDeleteForFindMode = -> HUD.hide(); false - # <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 # this query and do more searches with it' @@ -748,26 +746,20 @@ class FindMode extends Mode keydown: (event) => window.scrollTo @scrollX, @scrollY if options.returnToViewport if event.keyCode == keyCodes.backspace || event.keyCode == keyCodes.deleteKey - @exit() unless handleDeleteForFindMode() - @suppressEvent + HUD.hide() + @exit() else if event.keyCode == keyCodes.enter handleEnterForFindMode() @exit() - @suppressEvent else if event.keyCode == keyCodes.upArrow if rawQuery = FindModeHistory.getQuery @historyIndex + 1 @historyIndex += 1 @partialQuery = findModeQuery.rawQuery if @historyIndex == 0 HUD.showFindMode rawQuery - @suppressEvent else if event.keyCode == keyCodes.downArrow @historyIndex = Math.max -1, @historyIndex - 1 rawQuery = if 0 <= @historyIndex then FindModeHistory.getQuery @historyIndex else @partialQuery HUD.showFindMode rawQuery - @suppressEvent - else - DomUtils.suppressPropagation event if HandlerStack::isChromeEvent event - handlerStack.stopBubblingAndFalse exit: (event) -> super() |
