diff options
| author | Stephen Blott | 2015-01-05 13:26:04 +0000 |
|---|---|---|
| committer | Stephen Blott | 2015-01-05 13:26:04 +0000 |
| commit | edd52393cc9897a74d2ea94001cafe55dec09433 (patch) | |
| tree | de51ae4feec3ef18064436e7e2c1fb1349b443c0 | |
| parent | 308e4007814443955fa77a793da3cd2ec274686c (diff) | |
| download | vimium-edd52393cc9897a74d2ea94001cafe55dec09433.tar.bz2 | |
Modes; simplify badge logic.
| -rw-r--r-- | content_scripts/mode.coffee | 2 | ||||
| -rw-r--r-- | content_scripts/mode_insert.coffee | 2 | ||||
| -rw-r--r-- | content_scripts/mode_visual.coffee | 4 | ||||
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/content_scripts/mode.coffee b/content_scripts/mode.coffee index 96fc9b0c..30136315 100644 --- a/content_scripts/mode.coffee +++ b/content_scripts/mode.coffee @@ -72,6 +72,8 @@ class Mode keyup: @keyup updateBadge: (badge) => handlerStack.alwaysContinueBubbling => @chooseBadge badge + Mode.updateBadge() if @badge + push: (handlers) -> @handlers.push handlerStack.push handlers diff --git a/content_scripts/mode_insert.coffee b/content_scripts/mode_insert.coffee index bead43f8..d289ed86 100644 --- a/content_scripts/mode_insert.coffee +++ b/content_scripts/mode_insert.coffee @@ -27,8 +27,6 @@ class InsertMode extends ConstrainedMode keypress: (event) => @stopBubblingAndTrue keyup: (event) => @stopBubblingAndTrue - Mode.updateBadge() - exit: (event=null) -> if event?.source == ExitOnEscapeMode and event?.event?.srcElement? element = event.event.srcElement diff --git a/content_scripts/mode_visual.coffee b/content_scripts/mode_visual.coffee index b07d784e..6ef8ed4e 100644 --- a/content_scripts/mode_visual.coffee +++ b/content_scripts/mode_visual.coffee @@ -3,7 +3,7 @@ class VisualMode extends ConstrainedMode constructor: (element=document.body) -> - super element, + super element, VisualMode, name: "visual" badge: "V" @@ -16,7 +16,5 @@ class VisualMode extends ConstrainedMode keyup: (event) => return Mode.suppressEvent - Mode.updateBadge() - root = exports ? window root.VisualMode = VisualMode diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index cd717d5e..99463fbc 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -787,8 +787,6 @@ class FindMode extends ExitOnEscapeMode keyup: (event) => @suppressEvent - Mode.updateBadge() - exit: (extra) -> handleEscapeForFindMode() if extra?.source == ExitOnEscapeMode super() |