From 48164ee603bc4ec17f2fb72571c531ebdc7213ae Mon Sep 17 00:00:00 2001 From: Ariel Flesler Date: Mon, 23 Feb 2009 13:27:48 +0000 Subject: [PATCH] jquery event: Fixing event.currentTarget for live(). --- src/event.js | 1 + test/unit/event.js | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/event.js b/src/event.js index a50fe89..230af19 100644 --- a/src/event.js +++ b/src/event.js @@ -577,6 +577,7 @@ function liveHandler( event ){ }); jQuery.each(elems, function(){ + event.currentTarget = this.elem; if ( this.fn.call(this.elem, event, this.fn.data) === false ) return (stop = false); }); diff --git a/test/unit/event.js b/test/unit/event.js index 2ba2561..9a7c703 100644 --- a/test/unit/event.js +++ b/test/unit/event.js @@ -489,7 +489,7 @@ test("toggle(Function, Function, ...)", function() { }); test(".live()/.die()", function() { - expect(46); + expect(49); var submit = 0, div = 0, livea = 0, liveb = 0; @@ -649,6 +649,17 @@ test(".live()/.die()", function() { // Cleanup jQuery("span#liveSpan1 a, span#liveSpan1, span#liveSpan2 a, span#liveSpan2").die("click"); + + // Test this, target and currentTarget are correct + jQuery('span#liveSpan1').live('click', function(e){ + equals( this.id, 'liveSpan1', 'Check the this within a live handler' ); + equals( e.currentTarget.id, 'liveSpan1', 'Check the event.currentTarget within a live handler' ); + equals( e.target.nodeName.toUpperCase(), 'A', 'Check the event.target within a live handler' ); + }); + + jQuery('span#liveSpan1 a').click(); + + jQuery('span#liveSpan1').die('click'); }); /* -- 1.7.10.4