Remove global findMode and pass new FindMode instances direct to the HUD

3 files changed, 10 insertions, 10 deletions

diff --git a/content_scripts/hud.coffee b/content_scripts/hud.coffee
index 3637eede..5e1b955a 100644
--- a/content_scripts/hud.coffee
+++ b/content_scripts/hud.coffee
@@ -6,6 +6,7 @@ HUD =
   tween: null
   hudUI: null
   _displayElement: null
+  findMode: null
 
   # This HUD is styled to precisely mimick the chrome HUD on Mac. Use the "has_popup_and_link_hud.html"
   # test harness to tweak these styles to match Chrome's. One limitation of our HUD display is that
@@ -26,16 +27,16 @@ HUD =
     @hudUI.show {name: "show", text}
     @tween.fade 1.0, 150
 
-  showFindMode: ->
+  showFindMode: (@findMode = null) ->
     return unless @enabled()
     @hudUI.show {name: "showFindMode", text: ""}
     @tween.fade 1.0, 150
 
   search: (data) ->
-    window.scrollTo findMode.scrollX, findMode.scrollY if findMode.options.returnToViewport
+    window.scrollTo @findMode.scrollX, @findMode.scrollY if @findMode.options.returnToViewport
     findModeQuery.rawQuery = data.query
     updateFindModeQuery()
-    findMode.findInPlace()
+    @findMode.findInPlace()
 
     # Show the number of matches in the HUD UI.
     matchCount = if findModeQuery.parsedQuery.length > 0 then findModeQuery.matchCount else 0
@@ -72,16 +73,16 @@ HUD =
     @findModeKeydown data.event
 
   findModeKeydown: (event) ->
-    window.scrollTo findMode.scrollX, findMode.scrollY if findMode.options.returnToViewport
+    window.scrollTo @findMode.scrollX, @findMode.scrollY if @findMode.options.returnToViewport
     if event.keyCode == keyCodes.backspace || event.keyCode == keyCodes.deleteKey
-      findMode.exit()
+      @findMode.exit()
       new PostFindMode if findModeQueryHasResults
     else if event.keyCode == keyCodes.enter
       handleEnterForFindMode()
-      findMode.exit()
+      @findMode.exit()
       new PostFindMode if findModeQueryHasResults
     else if KeyboardUtils.isEscape event
-      findMode.exit()
+      @findMode.exit()
       handleEscapeForFindMode()
       new PostFindMode if findModeQueryHasResults
 
diff --git a/content_scripts/mode_find.coffee b/content_scripts/mode_find.coffee
index 2c4fea2a..67ec8dd9 100644
--- a/content_scripts/mode_find.coffee
+++ b/content_scripts/mode_find.coffee
@@ -67,7 +67,7 @@ class FindMode extends Mode
       indicator: false
       exitOnClick: true
 
-    HUD.showFindMode()
+    HUD.showFindMode this
 
   exit: (event) ->
     super()
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index b6ca06a2..c1c8288c 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -6,7 +6,6 @@
 #
 
 window.findModeQuery = { rawQuery: "", matchCount: 0 }
-window.findMode = null
 window.findModeQueryHasResults = false
 isShowingHelpDialog = false
 keyPort = null
@@ -868,7 +867,7 @@ window.goNext = ->
 # Enters find mode.  Returns the new find-mode instance.
 window.enterFindMode = ->
   Marks.setPreviousPosition()
-  window.findMode = new FindMode()
+  new FindMode()
 
 window.showHelpDialog = (html, fid) ->
   return if (isShowingHelpDialog || !document.body || fid != frameId)