From fdcdd0113049042c94b2b56a6b716e2da58b860e Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 10 Jan 2015 08:25:02 +0000
Subject: Modes; instrument for debugging...

- Set Mode.debug to true to see mode activation/deactivation on the
  console.
- Use Mode.log() to see a list of currently-active modes.
- Use handlerStack.debugOn() to enable debugging of the handler stack.
---
 content_scripts/scroller.coffee | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'content_scripts/scroller.coffee')

diff --git a/content_scripts/scroller.coffee b/content_scripts/scroller.coffee
index 889dc042..f70d3aed 100644
--- a/content_scripts/scroller.coffee
+++ b/content_scripts/scroller.coffee
@@ -124,12 +124,15 @@ CoreScroller =
     @keyIsDown = false
 
     handlerStack.push
+      _name: 'scroller/track-key-down/up'
       keydown: (event) =>
-        @keyIsDown = true
-        @lastEvent = event
+        handlerStack.alwaysContinueBubbling =>
+          @keyIsDown = true
+          @lastEvent = event
       keyup: =>
-        @keyIsDown = false
-        @time += 1
+        handlerStack.alwaysContinueBubbling =>
+          @keyIsDown = false
+          @time += 1
 
   # Return true if CoreScroller would not initiate a new scroll right now.
   wouldNotInitiateScroll: -> @lastEvent?.repeat and @settings.get "smoothScroll"
@@ -205,7 +208,9 @@ CoreScroller =
 # Scroller contains the two main scroll functions (scrollBy and scrollTo) which are exported to clients.
 Scroller =
   init: (frontendSettings) ->
-    handlerStack.push DOMActivate: -> activatedElement = event.target
+    handlerStack.push
+      _name: 'scroller/active-element'
+      DOMActivate: (event) -> handlerStack.alwaysContinueBubbling -> activatedElement = event.target
     CoreScroller.init frontendSettings
 
   # scroll the active element in :direction by :amount * :factor.
-- 
cgit v1.2.3


From 35cb54fec7242fac5c68503a32ef9dd4fea5d9b6 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 10 Jan 2015 12:17:22 +0000
Subject: Modes; minor changes.

---
 content_scripts/scroller.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'content_scripts/scroller.coffee')

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
-- 
cgit v1.2.3