From c21aa9ab03d5537d575d3c46d3affce7f3ece5e5 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 13 Jun 2015 12:55:01 +0100
Subject: Refactor findInPlace.

This code belongs together, so we put it together.
---
 content_scripts/mode_find.coffee | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'content_scripts/mode_find.coffee')

diff --git a/content_scripts/mode_find.coffee b/content_scripts/mode_find.coffee
index ff9506e7..21918be2 100644
--- a/content_scripts/mode_find.coffee
+++ b/content_scripts/mode_find.coffee
@@ -84,7 +84,10 @@ class FindMode extends Mode
     selection.removeAllRanges()
     selection.addRange range
 
-  findInPlace: ->
+  findInPlace: (query) ->
+    # If requested, restore the scroll position (so that failed searches leave the scroll position unchanged).
+    window.scrollTo @scrollX, @scrollY if @options.returnToViewport
+    FindMode.updateQuery query
     # Restore the selection.  That way, we're always searching forward from the same place, so we find the right
     # match as the user adds matching characters, or removes previously-matched characters. See #1434.
     @restoreSelection()
-- 
cgit v1.2.3


From f34f842417bdac363fac5a3e47366b3ee94c2454 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 13 Jun 2015 12:59:17 +0100
Subject: Fix returnToViewport.

The super-class's constructor sets @options, so we can't set it here;
instead, we pass the options along.
---
 content_scripts/mode_find.coffee | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'content_scripts/mode_find.coffee')

diff --git a/content_scripts/mode_find.coffee b/content_scripts/mode_find.coffee
index 21918be2..297c4158 100644
--- a/content_scripts/mode_find.coffee
+++ b/content_scripts/mode_find.coffee
@@ -60,14 +60,15 @@ class FindMode extends Mode
     matchCount: 0
     hasResults: false
 
-  constructor: (@options = {}) ->
+  constructor: (options = {}) ->
+    console.log "constructor", @options
     # Save the selection, so findInPlace can restore it.
     @initialRange = getCurrentRange()
     FindMode.query = rawQuery: ""
-    if @options.returnToViewport
+    if options.returnToViewport
       @scrollX = window.scrollX
       @scrollY = window.scrollY
-    super
+    super extend options,
       name: "find"
       indicator: false
       exitOnClick: true
-- 
cgit v1.2.3


From 4f426affde34c895cf342dac256895ffe98ee4f3 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 13 Jun 2015 13:03:10 +0100
Subject: Refactor duplicate code.

---
 content_scripts/mode_find.coffee | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'content_scripts/mode_find.coffee')

diff --git a/content_scripts/mode_find.coffee b/content_scripts/mode_find.coffee
index 297c4158..bba457b6 100644
--- a/content_scripts/mode_find.coffee
+++ b/content_scripts/mode_find.coffee
@@ -87,7 +87,7 @@ class FindMode extends Mode
 
   findInPlace: (query) ->
     # If requested, restore the scroll position (so that failed searches leave the scroll position unchanged).
-    window.scrollTo @scrollX, @scrollY if @options.returnToViewport
+    @checkReturnToViewPort()
     FindMode.updateQuery query
     # Restore the selection.  That way, we're always searching forward from the same place, so we find the right
     # match as the user adds matching characters, or removes previously-matched characters. See #1434.
@@ -196,6 +196,9 @@ class FindMode extends Mode
 
   @restoreDefaultSelectionHighlight: -> document.body.classList.remove("vimiumFindMode")
 
+  checkReturnToViewPort: ->
+    window.scrollTo @scrollX, @scrollY if @options.returnToViewport
+
 getCurrentRange = ->
   selection = getSelection()
   if selection.type == "None"
-- 
cgit v1.2.3