Event delegation: ensuring event.currentTarget points to the right …

…element
fabiospampinato · Nov 20, 2018 · 7d0884f · 7d0884f
1 parent 1e1c02a
commit 7d0884f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/events/on.ts b/src/events/on.ts
@@ -66,10 +66,9 @@ function on ( this: Cash, eventFullName: string | plainObject, selector?: string
 
           thisArg = target;
 
-        }
+          event = Object.create ( event, { currentTarget: { value: thisArg } } );
 
-        event.namespace = ( event.namespace || '' );
-        // event.currentTarget = thisArg; //FIXME: We can't overwrite `event.currentTarget`
+        }
 
         const returnValue = ( callback as Function ).call ( thisArg, event, event.data ); //TSC
 

diff --git a/test/modules/events.js b/test/modules/events.js
@@ -137,7 +137,7 @@ describe ( 'Events', { beforeEach: getFixtureInit ( fixture ) }, function () {
 
     });
 
-    it.skip ( 'overwrites event.currentTarget when using event delegation', function ( t ) { //URL: https://github.com/kenwheeler/cash/issues/235
+    it ( 'overwrites event.currentTarget when using event delegation', function ( t ) {
 
       var ele = $('.event');
       var parent = $('.parent');
@@ -154,7 +154,7 @@ describe ( 'Events', { beforeEach: getFixtureInit ( fixture ) }, function () {
       ele.trigger ( 'click' );
 
       t.is ( count, 2 );
-      // t.deepEqual ( currentTargets, [ele[0], ele[0]] ); //FIXME: We can't overwrite `event.currentTarget`
+      t.deepEqual ( currentTargets, [ele[0], ele[0]] );
 
     });
 
@@ -182,17 +182,17 @@ describe ( 'Events', { beforeEach: getFixtureInit ( fixture ) }, function () {
       parent.trigger ( 'foo' );
 
       t.is ( count, 2 );
-      // t.deepEqual ( currentTargets.slice ( 0 ), [parent[0], parent[0]] ); //FIXME: We can't overwrite `event.currentTarget`
+      t.deepEqual ( currentTargets.slice ( 0 ), [parent[0], parent[0]] );
 
       ele.trigger ( 'foo' );
 
       t.is ( count, 4 );
-      // t.deepEqual ( currentTargets.slice ( 2 ), [ele[0], ele[0]] ); //FIXME: We can't overwrite `event.currentTarget`
+      t.deepEqual ( currentTargets.slice ( 2 ), [ele[0], ele[0]] );
 
       child.trigger ( 'foo' );
 
       t.is ( count, 6 );
-      // t.deepEqual ( currentTargets.slice ( 4 ), [child[0], child[0]] ); //FIXME: We can't overwrite `event.currentTarget`
+      t.deepEqual ( currentTargets.slice ( 4 ), [child[0], child[0]] );
 
     });