From 6993359b4636ed53e558218beecc8ec9deb4ed70 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Wed, 10 Jun 2015 17:12:09 +0100
Subject: Integrate executeFind into FindMode as FindMode.execute

---
 content_scripts/vimium_frontend.coffee | 34 +---------------------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

(limited to 'content_scripts/vimium_frontend.coffee')

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 65527880..6f50fb9d 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -637,38 +637,6 @@ window.handleEnterForFindMode = ->
   document.body.classList.add("vimiumFindMode")
   FindMode.saveQuery()
 
-# :options is an optional dict. valid parameters are 'caseSensitive' and 'backwards'.
-window.executeFind = (query, options) ->
-  result = null
-  options = extend {
-    backwards: false
-    caseSensitive: !FindMode.query.ignoreCase
-    colorSelection: true
-  }, options
-  query ?= FindMode.getQuery options.backwards
-
-  if options.colorSelection
-    document.body.classList.add("vimiumFindMode")
-    # ignore the selectionchange event generated by find()
-    document.removeEventListener("selectionchange",restoreDefaultSelectionHighlight, true)
-
-  result = window.find(query, options.caseSensitive, options.backwards, true, false, true, false)
-
-  if options.colorSelection
-    setTimeout(
-      -> document.addEventListener("selectionchange", restoreDefaultSelectionHighlight, true)
-    , 0)
-
-  # We are either in normal mode ("n"), or find mode ("/").  We are not in insert mode.  Nevertheless, if a
-  # previous find landed in an editable element, then that element may still be activated.  In this case, we
-  # don't want to leave it behind (see #1412).
-  if document.activeElement and DomUtils.isEditable document.activeElement
-    document.activeElement.blur() unless DomUtils.isSelected document.activeElement
-
-  result
-
-restoreDefaultSelectionHighlight = -> document.body.classList.remove("vimiumFindMode")
-
 focusFoundLink = ->
   if (FindMode.query.hasResults)
     link = getLinkFromSelection()
@@ -686,7 +654,7 @@ selectFoundInputElement = ->
 
 findAndFocus = (backwards) ->
   Marks.setPreviousPosition()
-  FindMode.query.hasResults = executeFind null, {backwards}
+  FindMode.query.hasResults = FindMode.execute null, {backwards}
 
   if FindMode.query.hasResults
     focusFoundLink()
-- 
cgit v1.2.3