diff options
| author | mrmr1993 | 2015-06-03 03:34:34 +0100 |
|---|---|---|
| committer | mrmr1993 | 2015-06-10 17:26:53 +0100 |
| commit | 24c53c33ea8b4b603db91bc68fd3b7e50d7b5615 (patch) | |
| tree | 5eb10e835ac21022e6de9366bb86f973c759fb20 | |
| parent | 850533b89c71a0320b610ad2d26161067a5ace3b (diff) | |
| download | vimium-24c53c33ea8b4b603db91bc68fd3b7e50d7b5615.tar.bz2 | |
Integrate performFindInPlace into FindMode as findInPlace
| -rw-r--r-- | content_scripts/hud.coffee | 2 | ||||
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/content_scripts/hud.coffee b/content_scripts/hud.coffee index ca2eb7f2..4535ba69 100644 --- a/content_scripts/hud.coffee +++ b/content_scripts/hud.coffee @@ -38,7 +38,7 @@ HUD = window.scrollTo findMode.scrollX, findMode.scrollY if findMode.options.returnToViewport findModeQuery.rawQuery = data.query updateFindModeQuery() - performFindInPlace() + findMode.findInPlace() showFindModeHUDForQuery() # Hide the HUD. diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index 633e4122..9e4d2ab3 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -688,7 +688,7 @@ window.handleEnterForFindMode = -> class FindMode extends Mode constructor: (@options = {}) -> - # Save the selection, so performFindInPlace can restore it. + # Save the selection, so findInPlace can restore it. @initialRange = getCurrentRange() window.findModeQuery = rawQuery: "" if @options.returnToViewport @@ -711,12 +711,12 @@ class FindMode extends Mode 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. - findMode.restoreSelection() - query = if findModeQuery.isRegex then getNextQueryFromRegexMatches(0) else findModeQuery.parsedQuery - window.findModeQueryHasResults = executeFind(query, { caseSensitive: !findModeQuery.ignoreCase }) + findInPlace: -> + # 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() + query = if findModeQuery.isRegex then getNextQueryFromRegexMatches(0) else findModeQuery.parsedQuery + window.findModeQueryHasResults = executeFind(query, { caseSensitive: !findModeQuery.ignoreCase }) # :options is an optional dict. valid parameters are 'caseSensitive' and 'backwards'. executeFind = (query, options) -> |