git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
25b0ba9
)
Retooled the native triggering code, simplifying it.
author
John Resig
<jeresig@gmail.com>
Sat, 5 Dec 2009 04:18:05 +0000
(23:18 -0500)
committer
John Resig
<jeresig@gmail.com>
Sat, 5 Dec 2009 04:18:05 +0000
(23:18 -0500)
src/event.js
patch
|
blob
|
history
diff --git
a/src/event.js
b/src/event.js
index
acf363b
..
3e673d6
100644
(file)
--- a/
src/event.js
+++ b/
src/event.js
@@
-257,18
+257,20
@@
jQuery.event = {
nativeHandler = elem[ "on" + type ];
// prevent IE from throwing an error for some elements with some event types, see #3533
} catch (e) {}
nativeHandler = elem[ "on" + type ];
// prevent IE from throwing an error for some elements with some event types, see #3533
} catch (e) {}
- // Handle triggering native .onfoo handlers (and on links since we don't call .click() for links)
- if ( (!nativeFn || (jQuery.nodeName(elem, 'a') && type === "click")) && nativeHandler && nativeHandler.apply( elem, data ) === false ) {
- event.result = false;
- }
+
+ var isClick = jQuery.nodeName(elem, "a") && type === "click";
// Trigger the native events (except for clicks on links)
// Trigger the native events (except for clicks on links)
- if ( !bubbling && nativeFn && !event.isDefaultPrevented() && !(jQuery.nodeName(elem, 'a') && type === "click") ) {
+ if ( !bubbling && nativeFn && !event.isDefaultPrevented() && !isClick ) {
this.triggered = true;
try {
nativeFn();
// prevent IE from throwing an error for some hidden elements
} catch (e) {}
this.triggered = true;
try {
nativeFn();
// prevent IE from throwing an error for some hidden elements
} catch (e) {}
+
+ // Handle triggering native .onfoo handlers
+ } else if ( nativeHandler && nativeHandler.apply( elem, data ) === false ) {
+ event.result = false;
}
this.triggered = false;
}
this.triggered = false;