git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More changes to get jQuery in line with JSLint.
[jquery.git]
/
src
/
event.js
diff --git
a/src/event.js
b/src/event.js
index
abfdc4f
..
cec2845
100644
(file)
--- a/
src/event.js
+++ b/
src/event.js
@@
-146,7
+146,7
@@
jQuery.event = {
handler = returnFalse;
}
handler = returnFalse;
}
- var ret, type, fn, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
+ var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
elemData = jQuery.data( elem ),
events = elemData && elemData.events;
elemData = jQuery.data( elem ),
events = elemData && elemData.events;
@@
-197,7
+197,7
@@
jQuery.event = {
}
if ( !handler ) {
}
if ( !handler ) {
- for ( var j = 0; j < eventType.length; j++ ) {
+ for ( j = 0; j < eventType.length; j++ ) {
handleObj = eventType[ j ];
if ( all || namespace.test( handleObj.namespace ) ) {
handleObj = eventType[ j ];
if ( all || namespace.test( handleObj.namespace ) ) {
@@
-211,7
+211,7
@@
jQuery.event = {
special = jQuery.event.special[ type ] || {};
special = jQuery.event.special[ type ] || {};
- for ( var j = pos || 0; j < eventType.length; j++ ) {
+ for ( j = pos || 0; j < eventType.length; j++ ) {
handleObj = eventType[ j ];
if ( handler.guid === handleObj.guid ) {
handleObj = eventType[ j ];
if ( handler.guid === handleObj.guid ) {
@@
-329,7
+329,7
@@
jQuery.event = {
}
// prevent IE from throwing an error for some elements with some event types, see #3533
}
// prevent IE from throwing an error for some elements with some event types, see #3533
- } catch (e) {}
+ } catch (inlineError) {}
if ( !event.isPropagationStopped() && parent ) {
jQuery.event.trigger( event, data, parent, true );
if ( !event.isPropagationStopped() && parent ) {
jQuery.event.trigger( event, data, parent, true );
@@
-356,7
+356,7
@@
jQuery.event = {
}
// prevent IE from throwing an error for some elements with some event types, see #3533
}
// prevent IE from throwing an error for some elements with some event types, see #3533
- } catch (e) {}
+ } catch (triggerError) {}
if ( old ) {
target[ "on" + type ] = old;
if ( old ) {
target[ "on" + type ] = old;
@@
-368,9
+368,9
@@
jQuery.event = {
},
handle: function( event ) {
},
handle: function( event ) {
- var all, handlers, namespaces, namespace, events;
+ var all, handlers, namespaces, namespace, events, args = jQuery.makeArray( arguments );
- event = arguments[0] = jQuery.event.fix( event || window.event );
+ event = args[0] = jQuery.event.fix( event || window.event );
event.currentTarget = this;
// Namespaced event handlers
event.currentTarget = this;
// Namespaced event handlers
@@
-400,7
+400,7
@@
jQuery.event = {
event.data = handleObj.data;
event.handleObj = handleObj;
event.data = handleObj.data;
event.handleObj = handleObj;
- var ret = handleObj.handler.apply( this, arguments );
+ var ret = handleObj.handler.apply( this, args );
if ( ret !== undefined ) {
event.result = ret;
if ( ret !== undefined ) {
event.result = ret;
@@
-1080,7
+1080,7
@@
jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl
// Handle event binding
jQuery.fn[ name ] = function( data, fn ) {
// Handle event binding
jQuery.fn[ name ] = function( data, fn ) {
- if ( fn == undefined ) {
+ if ( fn == null ) {
fn = data;
data = null;
}
fn = data;
data = null;
}