diff options
| author | mrmr1993 | 2015-06-03 00:26:19 +0100 |
|---|---|---|
| committer | mrmr1993 | 2015-06-10 17:26:52 +0100 |
| commit | 915700fdf846fb1e5cc1ce71e51600257051e1a3 (patch) | |
| tree | fa85361054096ffc678de1385c6615ce4de3ed97 | |
| parent | 337644921567e415b933874d84ec8b5e9415cb0d (diff) | |
| download | vimium-915700fdf846fb1e5cc1ce71e51600257051e1a3.tar.bz2 | |
Move findModeRestoreSelection to FindMode::restoreSelection
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index b8bf9ef3..26eace9c 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -706,10 +706,16 @@ class FindMode extends Mode super() handleEscapeForFindMode() if event + restoreSelection: -> + range = @initialRange + selection = getSelection() + selection.removeAllRanges() + selection.addRange range + window.performFindInPlace = -> # 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. - findModeRestoreSelection() + findMode.restoreSelection() query = if findModeQuery.isRegex then getNextQueryFromRegexMatches(0) else findModeQuery.parsedQuery window.findModeQueryHasResults = executeFind(query, { caseSensitive: !findModeQuery.ignoreCase }) @@ -912,12 +918,6 @@ getCurrentRange = -> selection.collapseToStart() if selection.type == "Range" selection.getRangeAt 0 -findModeRestoreSelection = -> - range = findMode.initialRange - selection = getSelection() - selection.removeAllRanges() - selection.addRange range - # Enters find mode. Returns the new find-mode instance. window.enterFindMode = -> Marks.setPreviousPosition() |
