From c176147ad4a52d0f9a0d63213c0280d1344fca00 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Wed, 3 Jun 2015 00:18:14 +0100
Subject: Move code from enterFindMode into the FindMode constructor

---
 content_scripts/vimium_frontend.coffee | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'content_scripts')

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index a6387da1..55082553 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -690,6 +690,9 @@ window.handleEnterForFindMode = ->
 
 class FindMode extends Mode
   constructor: (@options = {}) ->
+    # Save the selection, so performFindInPlace can restore it.
+    findModeSaveSelection()
+    window.findModeQuery = rawQuery: ""
     if @options.returnToViewport
       @scrollX = window.scrollX
       @scrollY = window.scrollY
@@ -698,6 +701,8 @@ class FindMode extends Mode
       indicator: false
       exitOnClick: true
 
+    HUD.showFindMode()
+
   exit: (event) ->
     super()
     handleEscapeForFindMode() if event
@@ -919,12 +924,7 @@ findModeRestoreSelection = (range = findModeInitialRange) ->
 # Enters find mode.  Returns the new find-mode instance.
 window.enterFindMode = (options = {}) ->
   Marks.setPreviousPosition()
-  # Save the selection, so performFindInPlace can restore it.
-  findModeSaveSelection()
-  window.findModeQuery = rawQuery: ""
   window.findMode = new FindMode options
-  HUD.showFindMode()
-  findMode
 
 window.showHelpDialog = (html, fid) ->
   return if (isShowingHelpDialog || !document.body || fid != frameId)
-- 
cgit v1.2.3