diff options
| author | mrmr1993 | 2015-05-28 22:12:08 +0100 |
|---|---|---|
| committer | mrmr1993 | 2015-06-10 17:21:22 +0100 |
| commit | 85aa76ec68167ea0ac08cc627b3f12e1077b1b1f (patch) | |
| tree | ef3af1d54974f902be287d882bbbb1165082d196 /content_scripts/vimium_frontend.coffee | |
| parent | f3e62301cf51fbeea77fb49eb90f1b7b9138d118 (diff) | |
| download | vimium-85aa76ec68167ea0ac08cc627b3f12e1077b1b1f.tar.bz2 | |
Decide find mode text in the HUD iframe, not in frontend
Diffstat (limited to 'content_scripts/vimium_frontend.coffee')
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index 8c28b4e6..46af3847 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -686,9 +686,6 @@ updateFindModeQuery = -> # default to 'smartcase' mode, unless noIgnoreCase is explicitly specified findModeQuery.ignoreCase = !hasNoIgnoreCaseFlag && !Utils.hasUpperCase(findModeQuery.parsedQuery) - # Don't count matches in the HUD. - HUD.hide(true) - # if we are dealing with a regex, grep for all matches in the text, and then call window.find() on them # sequentially so the browser handles the scrolling / text selection. if findModeQuery.isRegex @@ -993,13 +990,11 @@ window.goNext = -> findAndFollowRel("next") || findAndFollowLink(nextStrings) showFindModeHUDForQuery = -> - if findModeQuery.rawQuery and (findModeQueryHasResults || findModeQuery.parsedQuery.length == 0) - plural = if findModeQuery.matchCount == 1 then "" else "es" - HUD.show("/" + findModeQuery.rawQuery + " (" + findModeQuery.matchCount + " Match#{plural})") - else if findModeQuery.rawQuery - HUD.show("/" + findModeQuery.rawQuery + " (No Matches)") - else - HUD.show("/") + matchCount = if findModeQuery.parsedQuery.length > 0 then findModeQuery.matchCount else 0 + showCount = findModeQuery.rawQuery.length > 0 + + HUD.showFindMode findModeQuery.rawQuery + HUD.updateMatchesCount matchCount, showCount getCurrentRange = -> selection = getSelection() @@ -1027,7 +1022,7 @@ window.enterFindMode = (options = {}) -> findModeSaveSelection() findModeQuery = rawQuery: "" findMode = new FindMode options - HUD.show "/" + HUD.showFindMode() findMode window.showHelpDialog = (html, fid) -> |