Pass the correct event.currentTarget on delegation

Removes data.el from the event data payload Fixes #290
flightjs · Jan 14, 2015 · bbbefc7 · bbbefc7
1 parent 414411b
commit bbbefc7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/lib/utils.js b/lib/utils.js
@@ -239,7 +239,7 @@ define(
           Object.keys(rules).forEach(function(selector) {
             if (!e.isPropagationStopped() && (parent = target.closest(selector)).length) {
               data = data || {};
-              data.el = parent[0];
+              e.currentTarget = parent[0];
               return rules[selector].apply(this, [e, data]);
             }
           }, this);

diff --git a/test/spec/utils_spec.js b/test/spec/utils_spec.js
@@ -245,7 +245,7 @@ define(['lib/component', 'lib/utils', 'lib/debug'], function (defineComponent, u
       });
     })();
 
-    it('should pass event, and data (inc. el property) to its callbacks', function () {
+    it('should pass event, and data to its callbacks', function () {
       var instance = (new Component).initialize(document, {'bodySelector': 'body'});
       var myData = {blah: 'blah'};
 
@@ -255,12 +255,19 @@ define(['lib/component', 'lib/utils', 'lib/debug'], function (defineComponent, u
 
       $(document.body).trigger('click', myData);
 
-      myData.el = document.body;
+      expect(spy).toHaveBeenCalledWith(jasmine.any($.Event), myData);
+    });
 
-      var callbackArgs = spy.mostRecentCall.args;
+    it('should pass the correct currentTarget', function () {
+      var instance = (new Component).initialize(document, {'bodySelector': 'body'});
 
-      expect(spy).toHaveBeenCalledWith(jasmine.any($.Event), myData);
+      instance.on('click', {
+        bodySelector: function (event) {
+          expect(event.currentTarget).toBe(document.body);
+        }
+      });
 
+      $(window.div).trigger('click');
     });
 
     it('makes "this" in delegated function references be the component instance', function () {