Update rawQuery directly from FindMode.updateQuery

2 files changed, 4 insertions, 7 deletions

diff --git a/content_scripts/hud.coffee b/content_scripts/hud.coffee
index 03edb52e..fcd465c8 100644
--- a/content_scripts/hud.coffee
+++ b/content_scripts/hud.coffee
@@ -34,8 +34,7 @@ HUD =
 
   search: (data) ->
     window.scrollTo @findMode.scrollX, @findMode.scrollY if @findMode.options.returnToViewport
-    FindMode.query.rawQuery = data.query
-    FindMode.updateQuery()
+    FindMode.updateQuery data.query
     @findMode.findInPlace()
 
     # Show the number of matches in the HUD UI.
@@ -71,7 +70,6 @@ HUD =
     document.activeElement?.blur()
     focusNode?.focus()
 
-    FindMode.query.rawQuery = data.query
     {event} = data
 
     if event.keyCode == keyCodes.enter
diff --git a/content_scripts/mode_find.coffee b/content_scripts/mode_find.coffee
index 79d2be7e..ff9506e7 100644
--- a/content_scripts/mode_find.coffee
+++ b/content_scripts/mode_find.coffee
@@ -91,8 +91,8 @@ class FindMode extends Mode
     query = if FindMode.query.isRegex then FindMode.getNextQueryFromRegexMatches(0) else FindMode.query.parsedQuery
     FindMode.query.hasResults = FindMode.execute query
 
-  # should be called whenever rawQuery is modified.
-  @updateQuery: ->
+  @updateQuery: (query) ->
+    @query.rawQuery = query
     # the query can be treated differently (e.g. as a plain string versus regex depending on the presence of
     # escape sequences. '\' is the escape character and needs to be escaped itself to be used as a normal
     # character. here we grep for the relevant escape sequences.
@@ -151,8 +151,7 @@ class FindMode extends Mode
     # check if the query has been changed by a script in another frame
     mostRecentQuery = FindModeHistory.getQuery()
     if (mostRecentQuery != @query.rawQuery)
-      @query.rawQuery = mostRecentQuery
-      @updateQuery()
+      @updateQuery mostRecentQuery
 
     if @query.isRegex
       @getNextQueryFromRegexMatches(if backwards then -1 else 1)