Skip to content
Permalink
Browse files

Switch from recursion to iteration for event triggering. Move event-n…

…ame namespace processing out of event handler, since it has to always go through trigger.
  • Loading branch information...
dmethvin committed Feb 11, 2011
1 parent e085673 commit bfa32317d2a56145a2d1151c60ce2d71d1328dd9
Showing with 52 additions and 70 deletions.
  1. +52 −70 src/event.js
@@ -277,13 +277,12 @@ jQuery.event = {
}
},

// bubbling is internal
trigger: function( event, data, elem /*, bubbling */ ) {
trigger: function( event, data, elem ) {
// Event object or event type
var type = event.type || event,
bubbling = arguments[3];
bubbling = arguments[3],
namespaces = [];

if ( !bubbling ) {
event = typeof event === "object" ?
// jQuery.Event object
event[ jQuery.expando ] ? event :
@@ -293,10 +292,19 @@ jQuery.event = {
jQuery.Event(type);

if ( type.indexOf("!") >= 0 ) {
// Exclusive events trigger only for the bare event type (no namespaces)

This comment has been minimized.

Copy link
@timmywil

timmywil Apr 8, 2011

Member

I think the tabs on github are just confused by this comment being one tab left.

event.type = type = type.slice(0, -1);
event.exclusive = true;
}

if ( type.indexOf(".") >= 0 ) {
// Namespaced trigger; create a regexp to match event type in handle()
namespaces = type.split(".");
event.type = type = namespaces.shift();
namespaces.sort();
}
event.namespace = namespaces.join(".");
event.namespace_re = new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)");

This comment has been minimized.

Copy link
@rwaldron

rwaldron Apr 6, 2011

Member

This block, from line 299 to here, seems to be one tab short? But when I pulled from upstream master, it looks fine in the source... Can anyone else confirm?

This comment has been minimized.

Copy link
@dmethvin

dmethvin Apr 8, 2011

Author Member

Yeah it sure looks wrong here, but when I view tabs in the file on master it's okay.

// Handle a global trigger
if ( !elem ) {
// Don't bubble custom events when global (to avoid too much overhead)
@@ -317,13 +325,12 @@ jQuery.event = {
}
});
}
return;
}

// Handle triggering a single element

// don't do events on text and comment nodes
if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
return undefined;
if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
return;
}

// Clean up in case it is reused
@@ -333,62 +340,53 @@ jQuery.event = {
// Clone the incoming data, if any
data = jQuery.makeArray( data );
data.unshift( event );
}

event.currentTarget = elem;

// Trigger the event, it is assumed that "handle" is a function
var handle = jQuery._data( elem, "handle" );
// Always fire on the current element, e.g. triggerHandler or global trigger
var cur = elem;
do {
var handle = jQuery._data( cur, "handle" );

event.currentTarget = cur;
if ( handle ) {

This comment has been minimized.

Copy link
@rwaldron

rwaldron Apr 6, 2011

Member

One more tab inward

handle.apply( elem, data );
handle.apply( cur, data );

This comment has been minimized.

Copy link
@rwaldron

rwaldron Apr 6, 2011

Member

I think an extra tab made it in here

}

var parent = elem.parentNode || elem.ownerDocument;

// Trigger an inline bound script
try {
if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) {
// Trigger an inline bound script; IE dies on special-char event names
try {
if ( jQuery.acceptData( cur ) && cur[ "on" + type ] && cur[ "on" + type ].apply( cur, data ) === false ) {
event.result = false;
event.preventDefault();
}
}
} catch ( ieError ) {}

// prevent IE from throwing an error for some elements with some event types, see #3533
} catch (inlineError) {}
cur = cur.parentNode || cur.ownerDocument;
} while ( cur && !event.isPropagationStopped() );

if ( !event.isPropagationStopped() && parent ) {
jQuery.event.trigger( event, data, parent, true );

} else if ( !event.isDefaultPrevented() ) {
// If nobody prevented the default action, do it now
if ( !event.isDefaultPrevented() ) {
var old,
target = event.target,
targetType = type.replace( rnamespaces, "" ),
isClick = jQuery.nodeName( target, "a" ) && targetType === "click",
special = jQuery.event.special[ targetType ] || {};
special = jQuery.event.special[ type ] || {};

if ( (!special._default || special._default.call( elem, event ) === false) &&
!isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
if ( (!special._default || special._default.call( elem.ownerDocument, event ) === false) &&
!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {

// IE may die here on non-alpha event names or hidden elements (#3533)
try {
if ( target[ targetType ] ) {
// Make sure that we don't accidentally re-trigger the onFOO events
old = target[ "on" + targetType ];
if ( elem[ type ] ) {
// Don't accidentally re-trigger the onFOO events
old = elem[ "on" + type ];

if ( old ) {
target[ "on" + targetType ] = null;
elem[ "on" + type ] = null;
}

jQuery.event.triggered = event.type;
target[ targetType ]();
elem[ type ]();
}

// prevent IE from throwing an error for some elements with some event types, see #3533
} catch (triggerError) {}
} catch ( ieError ) {}

if ( old ) {
target[ "on" + targetType ] = old;
elem[ "on" + type ] = old;
}

jQuery.event.triggered = undefined;
@@ -397,38 +395,24 @@ jQuery.event = {
},

handle: function( event ) {
var all, handlers, namespaces, namespace_re, events,
namespace_sort = [],
// It's rare to arrive without handlers to call, so do all setup here.
// Copy the handler list since a called handler may add/remove events.
event = jQuery.event.fix( event || window.event );
var events = jQuery._data( this, "events" ),
handlers = ((events || {})[ event.type ] || []).slice(0),
all_handlers = !event.exclusive && !event.namespace,
args = jQuery.makeArray( arguments );

event = args[0] = jQuery.event.fix( event || window.event );
// Use the fix-ed Event rather than the (read-only) native event
args[0] = event;
event.currentTarget = this;

// Namespaced event handlers
all = event.type.indexOf(".") < 0 && !event.exclusive;

if ( !all ) {
namespaces = event.type.split(".");
event.type = namespaces.shift();
namespace_sort = namespaces.slice(0).sort();
namespace_re = new RegExp("(^|\\.)" + namespace_sort.join("\\.(?:.*\\.)?") + "(\\.|$)");
}

event.namespace = event.namespace || namespace_sort.join(".");

events = jQuery._data(this, "events");

handlers = (events || {})[ event.type ];

if ( events && handlers ) {
// Clone the handlers to prevent manipulation
handlers = handlers.slice(0);

for ( var j = 0, l = handlers.length; j < l; j++ ) {
var handleObj = handlers[ j ];

// Filter the functions by class
if ( all || namespace_re.test( handleObj.namespace ) ) {
// Triggered event must 1) be non-exclusive and have no namespace, or
// 2) have namespace(s) a subset or equal to those in the bound event.
if ( all_handlers || event.namespace_re.test( handleObj.namespace ) ) {
// Pass in a reference to the handler function itself
// So that we can later remove it
event.handler = handleObj.handler;
@@ -450,8 +434,6 @@ jQuery.event = {
}
}
}
}

return event.result;
},

0 comments on commit bfa3231

Please sign in to comment.
You can’t perform that action at this time.