From 73748ef768f8691c0f22a9d7a846370de4ec4dfb Mon Sep 17 00:00:00 2001
From: Willem Van Lint <willem@vanlint.info>
Date: Sun, 17 Apr 2016 17:06:22 -0700
Subject: [PATCH] Order listeners by reverse registration order

---
 spec/command-registry-spec.coffee |  7 +++++++
 src/command-registry.coffee       | 11 +++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/spec/command-registry-spec.coffee b/spec/command-registry-spec.coffee
index ecdd42fd6..aaf044b1d 100644
--- a/spec/command-registry-spec.coffee
+++ b/spec/command-registry-spec.coffee
@@ -74,6 +74,13 @@ describe "CommandRegistry", ->
       grandchild.dispatchEvent(new CustomEvent('command', bubbles: true))
       expect(calls).toEqual ['.foo.bar', '.bar', '.foo']
 
+    it "orders inline listeners by reverse registration order", ->
+      calls = []
+      registry.add child, 'command', -> calls.push('child1')
+      registry.add child, 'command', -> calls.push('child2')
+      child.dispatchEvent(new CustomEvent('command', bubbles: true))
+      expect(calls).toEqual ['child2', 'child1']
+
     it "stops bubbling through ancestors when .stopPropagation() is called on the event", ->
       calls = []
 
diff --git a/src/command-registry.coffee b/src/command-registry.coffee
index db2cf498d..955a1b540 100644
--- a/src/command-registry.coffee
+++ b/src/command-registry.coffee
@@ -244,11 +244,14 @@ class CommandRegistry
           (@selectorBasedListenersByCommandName[event.type] ? [])
             .filter (listener) -> currentTarget.webkitMatchesSelector(listener.selector)
             .sort (a, b) -> a.compare(b)
-        listeners = listeners.concat(selectorBasedListeners)
+        listeners = selectorBasedListeners.concat(listeners)
 
       matched = true if listeners.length > 0
 
-      for listener in listeners
+      # Call inline listeners first in reverse registration order,
+      # and selector-based listeners by specificity and reverse
+      # registration order.
+      for listener in listeners by -1
         break if immediatePropagationStopped
         listener.callback.call(currentTarget, dispatchedEvent)
 
@@ -271,8 +274,8 @@ class SelectorBasedListener
     @sequenceNumber = SequenceCount++
 
   compare: (other) ->
-    other.specificity - @specificity  or
-      other.sequenceNumber - @sequenceNumber
+    @specificity - other.specificity or
+      @sequenceNumber - other.sequenceNumber
 
 class InlineListener
   constructor: (@callback) ->