From d6450ed2122c3bf539c9ea837d4423a69f043a68 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Wed, 28 Jan 2015 14:00:38 +0000
Subject: Visual/edit modes: fix some movements...

Also, change how vim's "w" is implemented.
Also some code-review/cleanup.
Better dd and yy for gmail.
---
 content_scripts/vimium_frontend.coffee | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'content_scripts/vimium_frontend.coffee')

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index b8e4149b..b71d1b18 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -868,18 +868,18 @@ getNextQueryFromRegexMatches = (stepSize) ->
   findModeQuery.regexMatches[findModeQuery.activeRegexIndex]
 
 window.getFindModeQuery  = ->
-  if findModeQuery.isRegex
-    getNextQueryFromRegexMatches(if backwards then -1 else 1)
-  else
-    findModeQuery.parsedQuery
-
-findAndFocus = (backwards) ->
   # check if the query has been changed by a script in another frame
   mostRecentQuery = settings.get("findModeRawQuery") || ""
   if (mostRecentQuery != findModeQuery.rawQuery)
     findModeQuery.rawQuery = mostRecentQuery
     updateFindModeQuery()
 
+  if findModeQuery.isRegex
+    getNextQueryFromRegexMatches(if backwards then -1 else 1)
+  else
+    findModeQuery.parsedQuery
+
+findAndFocus = (backwards) ->
   query = getFindModeQuery()
 
   findModeQueryHasResults =
-- 
cgit v1.2.3