Delegated event callbacks do not have this set correctly #1930

src/collection/events.js

@@ -24,7 +24,7 @@ let emitterOptions = {
     };
   },
   callbackContext: function( ele, listener, eventObj ){
-    return listener.selector != null ? eventObj.target : ele;
+    return listener.qualifier != null ? eventObj.target : ele;
   },
   beforeEmit: function( context, listener/*, eventObj*/ ){
     if( listener.conf && listener.conf.once ){

src/core/events.js

@@ -24,7 +24,7 @@ let emitterOptions = {
     };
   },
   callbackContext: function( cy, listener, eventObj ){
-    return listener.selector != null ? eventObj.target : cy;
+    return listener.qualifier != null ? eventObj.target : cy;
   }
 };
 

test/events.js

@@ -320,6 +320,31 @@ describe('Events', function(){
       cy.$('#n5').trigger('foo', ['bar', 'baz']);
     });
 
+    it('should get the element context when bubbled with a delegate selector on the core', function( done ){
+      let n4 = cy.$('#n4');
+
+      cy.on('foo', 'node', function(){
+        expect( this[0] === n4[0] ).to.be.true;
+
+        done();
+      });
+
+      n4.emit('foo');
+    });
+
+    it('should get the element context when bubbled with a delegate selector on a collection', function( done ){
+      let n4 = cy.$('#n4');
+      let n5 = cy.$('#n5');
+
+      n4.on('foo', 'node', function(){
+        expect( this[0] === n5[0] ).to.be.true;
+
+        done();
+      });
+
+      n5.emit('foo');
+    });
+
   });