Skip to content

Commit

Permalink
Cosmetic and style cleanups.
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmethvin @timmywil
dmethvin authored and timmywil committed Sep 19, 2011
1 parent 0ec71ac commit 2886249
Showing 1 changed file with 32 additions and 33 deletions.
65 changes: 32 additions & 33 deletions src/event.js
View file
Expand Up @@ -42,9 +42,8 @@ var rnamespaces = /\.(.*)$/,
}; };


/* /*
* A number of helper functions used for managing events. * Helper functions for managing events -- not part of the public interface.
* Many of the ideas behind this code originated from * Props to Dean Edwards' addEvent library for many of the ideas.
* Dean Edwards' addEvent library.
*/ */
jQuery.event = { jQuery.event = {


Expand Down Expand Up @@ -275,7 +274,7 @@ jQuery.event = {
namespaces = [], namespaces = [],
exclusive, i, cur, old, ontype, special, doc, eventPath, bubbleType, exclusive, i, cur, old, ontype, special, doc, eventPath, bubbleType,
addHandlers = function( elem, type ) { addHandlers = function( elem, type ) {
// Defer getting handler in case propagation is stopped // Defer getting handler so we don't waste time in case propagation is stopped
if ( (jQuery._data( elem, "events" ) || {})[ type ] ) { if ( (jQuery._data( elem, "events" ) || {})[ type ] ) {
eventPath.push({ elem: elem, type: type /*, handler: jQuery._data( elem, "handle" ) */ }); eventPath.push({ elem: elem, type: type /*, handler: jQuery._data( elem, "handle" ) */ });
} }
Expand All @@ -285,13 +284,13 @@ jQuery.event = {
} }
}; };


if ( type.indexOf("!") >= 0 ) { if ( type.indexOf( "!" ) >= 0 ) {
// Exclusive events trigger only for the exact event (no namespaces) // Exclusive events trigger only for the exact event (no namespaces)
type = type.slice(0, -1); type = type.slice(0, -1);
exclusive = true; exclusive = true;
} }


if ( type.indexOf(".") >= 0 ) { if ( type.indexOf( "." ) >= 0 ) {
// Namespaced trigger; create a regexp to match event type in handle() // Namespaced trigger; create a regexp to match event type in handle()
namespaces = type.split("."); namespaces = type.split(".");
type = namespaces.shift(); type = namespaces.shift();
Expand All @@ -314,7 +313,7 @@ jQuery.event = {


event.type = type; event.type = type;
event.exclusive = exclusive; event.exclusive = exclusive;
event.namespace = namespaces.join("."); event.namespace = namespaces.join( "." );
event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)") : null; event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)") : null;
ontype = type.indexOf( ":" ) < 0 ? "on" + type : ""; ontype = type.indexOf( ":" ) < 0 ? "on" + type : "";


Expand Down Expand Up @@ -458,8 +457,8 @@ jQuery.event = {


// Run delegates first; they may want to stop propagation beneath us // Run delegates first; they may want to stop propagation beneath us
event.delegateTarget = this; event.delegateTarget = this;
for ( i=0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) { for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) {
matched = handlerQueue[i]; matched = handlerQueue[ i ];
dispatch( matched.elem, event, matched.matches, args ); dispatch( matched.elem, event, matched.matches, args );
} }
delete event.delegateTarget; delete event.delegateTarget;
Expand Down Expand Up @@ -744,7 +743,7 @@ if ( !jQuery.support.submitBubbles ) {
return false; return false;
} }


jQuery.event.add(this, "click._submit keypress._submit", function( e ) { jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
var elem = e.target, var elem = e.target,
type = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.type : ""; type = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.type : "";


Expand Down Expand Up @@ -780,7 +779,7 @@ if ( !jQuery.support.changeBubbles ) {
val = elem.selectedIndex > -1 ? val = elem.selectedIndex > -1 ?
jQuery.map( elem.options, function( elem ) { jQuery.map( elem.options, function( elem ) {
return elem.selected; return elem.selected;
}).join("-") : }).join( "-" ) :
""; "";
} }


Expand All @@ -796,7 +795,7 @@ if ( !jQuery.support.changeBubbles ) {
} }


old = jQuery._data( elem, "_change_data" ); old = jQuery._data( elem, "_change_data" );
val = getVal(elem); val = getVal( elem );


// the current data will be also retrieved by beforeactivate // the current data will be also retrieved by beforeactivate
if ( e.type !== "focusout" || elem.type !== "radio" ) { if ( e.type !== "focusout" || elem.type !== "radio" ) {
Expand All @@ -814,41 +813,41 @@ if ( !jQuery.support.changeBubbles ) {
beforedeactivate: testChange, beforedeactivate: testChange,


click: function( e ) { click: function( e ) {
var elem = e.target, var elem = e.target,
name = elem.nodeName.toLowerCase(), name = elem.nodeName.toLowerCase(),
type = name === "input"? elem.type : ""; type = name === "input"? elem.type : "";


if ( type === "radio" || type === "checkbox" || name === "select" ) { if ( type === "radio" || type === "checkbox" || name === "select" ) {
testChange.call( this, e ); testChange.call( this, e );
} }
}, },


// Change has to be called before submit // Change has to be called before submit
// Keydown will be called before keypress, which is used in submit-event delegation // Keydown will be called before keypress, which is used in submit-event delegation
keydown: function( e ) { keydown: function( e ) {
var elem = e.target, var elem = e.target,
name = elem.nodeName.toLowerCase(), name = elem.nodeName.toLowerCase(),
type = name === "input"? elem.type : ""; type = name === "input"? elem.type : "";


if ( (e.keyCode === 13 && name !== "textarea") || if ( (e.keyCode === 13 && name !== "textarea") ||
(e.keyCode === 32 && (type === "checkbox" || type === "radio")) || (e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
type === "select-multiple" ) { type === "select-multiple" ) {
testChange.call( this, e ); testChange.call( this, e );
} }
}, },


// Beforeactivate happens also before the previous element is blurred // Beforeactivate happens also before the previous element is blurred
// here, you can't trigger a change event, but you can store data // here, you can't trigger a change event, but you can store data
beforeactivate: function( e ) { beforeactivate: function( e ) {
var elem = e.target; var elem = e.target;
jQuery._data( elem, "_change_data", getVal(elem) ); jQuery._data( elem, "_change_data", getVal( elem ) );
}, },


// Update the current value if we're not re-focusing (#8157) // Update the current value if we're not re-focusing (#8157)
focus: function( e ) { focus: function( e ) {
var elem = e.target; var elem = e.target;
if ( elem != document.activeElement ) { if ( elem != document.activeElement ) {
jQuery._data( elem, "_change_data", getVal(elem) ); jQuery._data( elem, "_change_data", getVal( elem ) );
} }
} }
}; };
Expand All @@ -861,7 +860,7 @@ if ( !jQuery.support.changeBubbles ) {
} }


for ( var type in changeFilters ) { for ( var type in changeFilters ) {
jQuery.event.add( this, type + "._change", changeFilters[type] ); jQuery.event.add( this, type + "._change", changeFilters[ type ] );
} }


return rformElems.test( this.nodeName ); return rformElems.test( this.nodeName );
Expand Down Expand Up @@ -929,7 +928,7 @@ jQuery.fn.extend({
selector = undefined; selector = undefined;
} }
for ( type in types ) { for ( type in types ) {
this.on( type, selector, data, types[type], one ); this.on( type, selector, data, types[ type ], one );
} }
return this; return this;
} }
Expand Down Expand Up @@ -963,7 +962,7 @@ jQuery.fn.extend({
return origFn.apply( this, arguments ); return origFn.apply( this, arguments );
}; };
// Use same guid so caller can remove using origFn // Use same guid so caller can remove using origFn
fn.guid = origFn.guid || (origFn.guid = jQuery.guid++); fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
} }
return this.each( function() { return this.each( function() {
jQuery.event.add( this, types, fn, data, selector ); jQuery.event.add( this, types, fn, data, selector );
Expand All @@ -980,7 +979,7 @@ jQuery.fn.extend({
if ( typeof types === "object" ) { if ( typeof types === "object" ) {
// ( types-object [, selector] ) // ( types-object [, selector] )
for ( var type in types ) { for ( var type in types ) {
this.off( type, selector, types[type] ); this.off( type, selector, types[ type ] );
} }
return this; return this;
} }
Expand Down

0 comments on commit 2886249

Please sign in to comment.