// Use the fix-ed jQuery.Event rather than the (read-only) native event
args[0] = event;
+ event.currentTarget = this;
// Determine handlers that should run if there are delegated events
// Avoid disabled elements in IE (#6911) and non-left-click bubbling in Firefox (#3861)
}
}
- // Copy the remaining (bound) handlers in case they're changed
- handlers = handlers.slice( delegateCount );
+ // Add the remaining (directly- bound) handlers
+ if ( handlers.length ) {
+ handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) });
+ }
- // Run delegates first; they may want to stop propagation beneath us
- event.delegateTarget = this;
for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) {
matched = handlerQueue[ i ];
dispatch( matched.elem, event, matched.matches, args );
}
- delete event.delegateTarget;
-
- // Run non-delegated handlers for this level
- if ( handlers.length && !event.isPropagationStopped() ) {
- dispatch( this, event, handlers, args );
- }
return event.result;
},
specialHandle = ( jQuery.event.special[ event.type ] || {} ).handle,
j, handleObj, ret;
- event.currentTarget = target;
for ( j = 0; j < handlers.length && !event.isImmediatePropagationStopped(); j++ ) {
handleObj = handlers[ j ];
if ( one === 1 ) {
origFn = fn;
fn = function( event ) {
- jQuery.event.remove( event.delegateTarget || this, event );
+ jQuery.event.remove( event.currentTarget || this, event );
return origFn.apply( this, arguments );
};
// Use same guid so caller can remove using origFn
// 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.currentTarget, document, "Check the event.currentTarget within a live handler" );
equals( e.target.nodeName.toUpperCase(), "A", "Check the event.target within a live handler" );
});
// Test this, target and currentTarget are correct
jQuery("#body").delegate("span#liveSpan1", "click", function(e){
equals( this.id, "liveSpan1", "Check the this within a delegate handler" );
- equals( e.currentTarget.id, "liveSpan1", "Check the event.currentTarget within a delegate handler" );
+ equals( e.currentTarget, document.body, "Check the event.currentTarget within a delegate handler" );
equals( e.target.nodeName.toUpperCase(), "A", "Check the event.target within a delegate handler" );
});