Skip to content
Permalink
Browse files

Fix some spacing and comment issues that crept in with the rebase.

  • Loading branch information...
dmethvin committed Apr 6, 2011
1 parent 29386db commit 879be3d8121179da4e7cafe1d36f7f1b1a97263b
Showing with 60 additions and 61 deletions.
  1. +60 −61 src/event.js
@@ -284,19 +284,19 @@ jQuery.event = {
namespaces = [],
cur = elem;

event = typeof event === "object" ?
// jQuery.Event object
event[ jQuery.expando ] ? event :
// Object literal
jQuery.extend( jQuery.Event(type), event ) :
// Just the event type (string)
jQuery.Event(type);

if ( type.indexOf("!") >= 0 ) {
// Exclusive events trigger only for the bare event type (no namespaces)
event.type = type = type.slice(0, -1);
event.exclusive = true;
}
event = typeof event === "object" ?
// jQuery.Event object
event[ jQuery.expando ] ? event :
// Object literal
jQuery.extend( jQuery.Event(type), event ) :
// Just the event type (string)
jQuery.Event(type);

if ( type.indexOf("!") >= 0 ) {
// Exclusive events trigger only for the bare event type (no namespaces)
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(".");
@@ -306,50 +306,50 @@ jQuery.event = {
event.namespace = namespaces.join(".");
event.namespace_re = new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)");

// Handle a global trigger
if ( !elem ) {
// Don't bubble custom events when global (to avoid too much overhead)
event.stopPropagation();
// Handle a global trigger
if ( !elem ) {
// Don't bubble custom events when global (to avoid too much overhead)
event.stopPropagation();

// Save some time, only trigger if we've ever bound an event for this type
if ( jQuery.event.global[ type ] ) {
// XXX This code smells terrible. event.js should not be directly
// inspecting the data cache
jQuery.each( jQuery.cache, function() {
// internalKey variable is just used to make it easier to find
// and potentially change this stuff later; currently it just
// points to jQuery.expando
var internalKey = jQuery.expando,
internalCache = this[ internalKey ];
if ( internalCache && internalCache.events && internalCache.events[ type ] ) {
jQuery.event.trigger( event, data, internalCache.handle.elem );
}
});
}
return;
// XXX This code smells terrible. event.js should not be directly
// inspecting the data cache
jQuery.each( jQuery.cache, function() {
// internalKey variable is just used to make it easier to find
// and potentially change this stuff later; currently it just
// points to jQuery.expando
var internalKey = jQuery.expando,
internalCache = this[ internalKey ];
if ( internalCache && internalCache.events && internalCache.events[ type ] ) {
jQuery.event.trigger( event, data, internalCache.handle.elem );
}
});
}
return;
}

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

// Clean up the event in case it is being reused
event.result = undefined;
event.target = elem;
event.result = undefined;
event.target = elem;

// Clone any incoming data and prepend the event, creating the handler arg list
data = jQuery.makeArray( data );
data.unshift( event );
data = jQuery.makeArray( data );
data.unshift( event );

// Fire event on the current element, then bubble up the DOM tree
do {
var handle = jQuery._data( cur, "handle" );

event.currentTarget = cur;
if ( handle ) {
if ( handle ) {
handle.apply( cur, data );
}
}

// Trigger an inline bound script; IE<9 dies on special-char event name
try {
@@ -397,44 +397,43 @@ jQuery.event = {
},

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

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

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

// 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;
event.data = handleObj.data;
event.handleObj = handleObj;

var ret = handleObj.handler.apply( this, args );

if ( ret !== undefined ) {
event.result = ret;
if ( ret === false ) {
event.preventDefault();
event.stopPropagation();
}
if ( run_all || 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;
event.data = handleObj.data;
event.handleObj = handleObj;

var ret = handleObj.handler.apply( this, args );

if ( ret !== undefined ) {
event.result = ret;
if ( ret === false ) {
event.preventDefault();
event.stopPropagation();
}
}

if ( event.isImmediatePropagationStopped() ) {
break;
}
if ( event.isImmediatePropagationStopped() ) {
break;
}
}
}
return event.result;
},

0 comments on commit 879be3d

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