From d330ebd648914802453fa1e818ef9dc52de739c8 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Tue, 24 Oct 2017 19:25:53 +0100
Subject: Move findAndFocus into FindMode, rename to findNext

---
 content_scripts/mode_find.coffee       | 10 ++++++++++
 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
-- 
cgit v1.2.3