Make find from visual mode behave the same as a normal find

1 files changed, 14 insertions, 7 deletions

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 29267c68..6ea5080d 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -641,17 +641,24 @@ window.handleEnterForFindMode = ->
 # :options is an optional dict. valid parameters are 'caseSensitive' and 'backwards'.
 window.executeFind = (query, options) ->
   result = null
-  options = extend {backwards: false, caseSensitive: !findModeQuery.ignoreCase}, options
+  options = extend {
+    backwards: false
+    caseSensitive: !findModeQuery.ignoreCase
+    colorSelection: true
+  }, options
   query ?= FindMode.getQuery options.backwards
 
-  document.body.classList.add("vimiumFindMode")
+  if options.colorSelection
+    document.body.classList.add("vimiumFindMode")
+    # ignore the selectionchange event generated by find()
+    document.removeEventListener("selectionchange",restoreDefaultSelectionHighlight, true)
 
-  # ignore the selectionchange event generated by find()
-  document.removeEventListener("selectionchange",restoreDefaultSelectionHighlight, true)
   result = window.find(query, options.caseSensitive, options.backwards, true, false, true, false)
-  setTimeout(
-    -> document.addEventListener("selectionchange", restoreDefaultSelectionHighlight, true)
-    0)
+
+  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