Stop FindMode's keydown handler from using FindMode's scope and this

1 files changed, 13 insertions, 13 deletions

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 86af6350..03659bf0 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -6,6 +6,7 @@
 #
 
 window.findModeQuery = { rawQuery: "", matchCount: 0 }
+window.findMode = null
 findModeQueryHasResults = false
 findModeAnchorNode = null
 findModeInitialRange = null
@@ -731,10 +732,10 @@ handleEnterForFindMode = ->
   FindModeHistory.saveQuery findModeQuery.rawQuery
 
 class FindMode extends Mode
-  constructor: (options = {}) ->
+  constructor: (@options = {}) ->
     @historyIndex = -1
     @partialQuery = ""
-    if options.returnToViewport
+    if @options.returnToViewport
       @scrollX = window.scrollX
       @scrollY = window.scrollY
     super
@@ -743,26 +744,25 @@ class FindMode extends Mode
       exitOnClick: true
 
       keydown: (event) =>
-        window.scrollTo @scrollX, @scrollY if options.returnToViewport
+        window.scrollTo findMode.scrollX, findMode.scrollY if findMode.options.returnToViewport
         if event.keyCode == keyCodes.backspace || event.keyCode == keyCodes.deleteKey
-          HUD.hide()
-          @exit()
+          findMode.exit()
           new PostFindMode if findModeQueryHasResults
         else if event.keyCode == keyCodes.enter
           handleEnterForFindMode()
-          @exit()
+          findMode.exit()
           new PostFindMode if findModeQueryHasResults
         else if event.keyCode == keyCodes.upArrow
-          if rawQuery = FindModeHistory.getQuery @historyIndex + 1
-            @historyIndex += 1
-            @partialQuery = findModeQuery.rawQuery if @historyIndex == 0
+          if rawQuery = FindModeHistory.getQuery findMode.historyIndex + 1
+            findMode.historyIndex += 1
+            findMode.partialQuery = findModeQuery.rawQuery if findMode.historyIndex == 0
             HUD.showFindMode rawQuery
         else if event.keyCode == keyCodes.downArrow
-          @historyIndex = Math.max -1, @historyIndex - 1
-          rawQuery = if 0 <= @historyIndex then FindModeHistory.getQuery @historyIndex else @partialQuery
+          findMode.historyIndex = Math.max -1, findMode.historyIndex - 1
+          rawQuery = if 0 <= findMode.historyIndex then FindModeHistory.getQuery findMode.historyIndex else findMode.partialQuery
           HUD.showFindMode rawQuery
         else if KeyboardUtils.isEscape event
-          @exit()
+          findMode.exit()
           handleEscapeForFindMode()
           new PostFindMode if findModeQueryHasResults
 
@@ -990,7 +990,7 @@ window.enterFindMode = (options = {}) ->
   # Save the selection, so performFindInPlace can restore it.
   findModeSaveSelection()
   window.findModeQuery = rawQuery: ""
-  findMode = new FindMode options
+  window.findMode = new FindMode options
   HUD.showFindMode()
   findMode