From 7fc0492aa1f459588d6bd4e2397c4858fcdd6c4b Mon Sep 17 00:00:00 2001 From: mrmr1993 Date: Tue, 2 Jun 2015 15:57:40 +0100 Subject: Remove redundant code from FindMode keydown handler, inline delete code --- content_scripts/vimium_frontend.coffee | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'content_scripts') 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 - # sends us into insert mode if possible, but does not. # corresponds approximately to 'nevermind, I have found it already' while 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() -- cgit v1.2.3