aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Blott2015-01-10 12:17:22 +0000
committerStephen Blott2015-01-10 12:17:22 +0000
commit35cb54fec7242fac5c68503a32ef9dd4fea5d9b6 (patch)
tree9978a557e12199786998aab5c931fac7466c1f37
parent2199ad1bf9a7b063cc68a8e75f7a4a76ba125588 (diff)
downloadvimium-35cb54fec7242fac5c68503a32ef9dd4fea5d9b6.tar.bz2
Modes; minor changes.
-rw-r--r--content_scripts/mode_insert.coffee4
-rw-r--r--content_scripts/scroller.coffee2
2 files changed, 4 insertions, 2 deletions
diff --git a/content_scripts/mode_insert.coffee b/content_scripts/mode_insert.coffee
index 1887adbc..5720c901 100644
--- a/content_scripts/mode_insert.coffee
+++ b/content_scripts/mode_insert.coffee
@@ -1,5 +1,6 @@
-# This mode is installed only when insert mode is active.
+# This mode is installed only when insert mode is active. It is a singleton, so a newly-activated instance
+# displaces any active instance.
class InsertMode extends Mode
constructor: (options = {}) ->
defaults =
@@ -13,6 +14,7 @@ class InsertMode extends Mode
blurOnExit: true
targetElement: null
+ # If options.targetElement blurs, we exit.
options.exitOnBlur ||= options.targetElement
super extend defaults, options
triggerSuppressor.suppress()
diff --git a/content_scripts/scroller.coffee b/content_scripts/scroller.coffee
index f70d3aed..6e2e1ffc 100644
--- a/content_scripts/scroller.coffee
+++ b/content_scripts/scroller.coffee
@@ -124,7 +124,7 @@ CoreScroller =
@keyIsDown = false
handlerStack.push
- _name: 'scroller/track-key-down/up'
+ _name: 'scroller/track-key-status'
keydown: (event) =>
handlerStack.alwaysContinueBubbling =>
@keyIsDown = true