From 41a2c5a3f77a15b2ad5f386f1a2a194df49d107d Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Fri, 16 Jan 2015 16:01:03 +0000
Subject: Use selection.collapseToStart() for performFindInPlace().

---
 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 a3ab051b..ddedb1ef 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -702,18 +702,10 @@ handleEnterForFindMode = ->
   settings.set("findModeRawQuery", findModeQuery.rawQuery)
 
 performFindInPlace = ->
-  cachedScrollX = window.scrollX
-  cachedScrollY = window.scrollY
-
   query = if findModeQuery.isRegex then getNextQueryFromRegexMatches(0) else findModeQuery.parsedQuery
 
-  # Search backwards first to "free up" the current word as eligible for the real forward search. This allows
-  # us to search in place without jumping around between matches as the query grows.
-  executeFind(query, { backwards: true, caseSensitive: !findModeQuery.ignoreCase })
-
-  # We need to restore the scroll position because we might've lost the right position by searching
-  # backwards.
-  window.scrollTo(cachedScrollX, cachedScrollY)
+  selection = window.getSelection()
+  selection.collapseToStart() if selection.type == "Range"
 
   findModeQueryHasResults = executeFind(query, { caseSensitive: !findModeQuery.ignoreCase })
 
-- 
cgit v1.2.3