aboutsummaryrefslogtreecommitdiffstats
path: root/content_scripts/vimium_frontend.coffee
diff options
context:
space:
mode:
Diffstat (limited to 'content_scripts/vimium_frontend.coffee')
-rw-r--r--content_scripts/vimium_frontend.coffee15
1 files changed, 4 insertions, 11 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index a9b318c6..a252c878 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -114,7 +114,7 @@ class NormalMode extends Mode
keyup: onKeyup
updateBadgeForMode: (badge) ->
- handlerStack.alwaysPropagate =>
+ handlerStack.alwaysContinueBubbling =>
# Idea... Instead of an icon, we could show the keyQueue here (if it's non-empty).
super badge
badge.badge = "" unless isEnabledForUrl
@@ -750,22 +750,15 @@ class FindMode extends Mode
handlerStack.stopBubblingAndFalse
keypress: (event) ->
- handlerStack.neverPropagate ->
+ handlerStack.neverContinueBubbling ->
if event.keyCode > 31
keyChar = String.fromCharCode event.charCode
handleKeyCharForFindMode keyChar if keyChar
- keyup: (event) -> handlerStack.neverPropagate -> false
-
- # Prevent insert mode from detecting a focused editable element.
- @handlers.push handlerStack.push
- focus: (event) -> handlerStack.neverPropagate (event) ->
+ keyup: (event) => @suppressEvent
Mode.updateBadge()
-class FindModeWithoutBadge extends FindMode
- constructor: -> super ""
-
performFindInPlace = ->
cachedScrollX = window.scrollX
cachedScrollY = window.scrollY
@@ -793,7 +786,7 @@ executeFind = (query, options) ->
HUD.hide(true)
# ignore the selectionchange event generated by find()
document.removeEventListener("selectionchange",restoreDefaultSelectionHighlight, true)
- Mode.runIn FindModeWithoutBadge, ->
+ Mode.runIn FocusMustNotTriggerInsertMode, ->
result = window.find(query, options.caseSensitive, options.backwards, true, false, true, false)
setTimeout(
-> document.addEventListener("selectionchange", restoreDefaultSelectionHighlight, true)