Modes; fix move of find to its own file.

2 files changed, 10 insertions, 15 deletions

diff --git a/content_scripts/mode_find.coffee b/content_scripts/mode_find.coffee
index d6380682..d6d1ff33 100644
--- a/content_scripts/mode_find.coffee
+++ b/content_scripts/mode_find.coffee
@@ -19,18 +19,13 @@ class PostFindMode extends SingletonMode
       name: "post-find"
 
     # If the very next key is Esc, then drop straight into insert mode.
-    do =>
-      self = @
-      @push
-        keydown: (event) ->
-          @remove()
-          if element == document.activeElement and KeyboardUtils.isEscape event
-            self.exit()
-            # NOTE(smblott).  The legacy code (2015/1/4) uses DomUtils.simulateSelect() here.  But this moves
-            # the selection.  It's better to leave the selection where it is.
-            insertMode.activate element
-            return false
-          true
+    @push
+      keydown: (event) ->
+        @remove()
+        if element == document.activeElement and KeyboardUtils.isEscape event
+          PostFindMode.exitModeAndEnterInsert insertMode, element
+          return false
+        true
 
     if element.isContentEditable
       # Prevent InsertMode from activating on keydown.
@@ -51,9 +46,9 @@ class PostFindMode extends SingletonMode
   # element is then (again) focused by focusInput, no new focus event is generated, so we don't drop into
   # InsertMode as expected.
   # This hack fixes this.
-  @exitModeAndEnterInsert: (element) ->
+  @exitModeAndEnterInsert: (insertMode, element) ->
     SingletonMode.kill PostFindMode
-    insertMode.activate element
+    insertMode.activate insertMode, element
 
 root = exports ? window
 root.PostFindMode = PostFindMode
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 9d539956..75b4172f 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -361,7 +361,7 @@ extend window,
     selectedInputIndex = Math.min(count - 1, visibleInputs.length - 1)
 
     # See the definition of PostFindMode.exitModeAndEnterInsert for an explanation of why this is needed.
-    PostFindMode.exitModeAndEnterInsert visibleInputs[selectedInputIndex].element
+    PostFindMode.exitModeAndEnterInsert insertMode, visibleInputs[selectedInputIndex].element
 
     visibleInputs[selectedInputIndex].element.focus()