diff options
| author | mrmr1993 | 2017-10-24 19:25:53 +0100 |
|---|---|---|
| committer | mrmr1993 | 2017-10-27 20:34:28 +0100 |
| commit | d330ebd648914802453fa1e818ef9dc52de739c8 (patch) | |
| tree | 1c6cee2037a4464204f897c6f72e42dfe829d719 | |
| parent | ca9aa228f1999540063063e6cb86a7baeba9da93 (diff) | |
| download | vimium-d330ebd648914802453fa1e818ef9dc52de739c8.tar.bz2 | |
Move findAndFocus into FindMode, rename to findNext
| -rw-r--r-- | content_scripts/mode_find.coffee | 10 | ||||
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/content_scripts/mode_find.coffee b/content_scripts/mode_find.coffee index 8dc3bdcc..d361d4be 100644 --- a/content_scripts/mode_find.coffee +++ b/content_scripts/mode_find.coffee @@ -219,6 +219,16 @@ class FindMode extends Mode document.body.classList.add("vimiumFindMode") FindMode.saveQuery() + @findNext: (backwards) -> + Marks.setPreviousPosition() + FindMode.query.hasResults = FindMode.execute null, {backwards} + + if FindMode.query.hasResults + focusFoundLink() + new PostFindMode() + else + HUD.showForDuration("No matches for '#{FindMode.query.rawQuery}'", 1000) + checkReturnToViewPort: -> window.scrollTo @scrollX, @scrollY if @options.returnToViewport diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index a01551a8..11c952ca 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -438,18 +438,8 @@ selectFoundInputElement = -> DomUtils.isDOMDescendant(findModeAnchorNode, document.activeElement)) DomUtils.simulateSelect(document.activeElement) -findAndFocus = (backwards) -> - Marks.setPreviousPosition() - FindMode.query.hasResults = FindMode.execute null, {backwards} - - if FindMode.query.hasResults - focusFoundLink() - new PostFindMode() - else - HUD.showForDuration("No matches for '#{FindMode.query.rawQuery}'", 1000) - -performFind = (count) -> findAndFocus false for [0...count] by 1 -performBackwardsFind = (count) -> findAndFocus true for [0...count] by 1 +performFind = (count) -> FindMode.findNext false for [0...count] by 1 +performBackwardsFind = (count) -> FindMode.findNext true for [0...count] by 1 getLinkFromSelection = -> node = window.getSelection().anchorNode |