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:
84eb2cf
)
Fixed a bug in event - "native" is a reserved word in Safari 2.
author
John Resig
<jeresig@gmail.com>
Fri, 7 Sep 2007 19:28:25 +0000
(19:28 +0000)
committer
John Resig
<jeresig@gmail.com>
Fri, 7 Sep 2007 19:28:25 +0000
(19:28 +0000)
src/event/event.js
patch
|
blob
|
history
diff --git
a/src/event/event.js
b/src/event/event.js
index
df982ec
..
205b510
100644
(file)
--- a/
src/event/event.js
+++ b/
src/event/event.js
@@
-135,7
+135,7
@@
jQuery.event = {
}
},
}
},
- trigger: function(type, data, element, native, extra) {
+ trigger: function(type, data, element, donative, extra) {
// Clone the incoming data, if any
data = jQuery.makeArray(data || []);
// Clone the incoming data, if any
data = jQuery.makeArray(data || []);
@@
-172,7
+172,7
@@
jQuery.event = {
val = false;
// Trigger the native events (except for clicks on links)
val = false;
// Trigger the native events (except for clicks on links)
- if ( fn && native !== false && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) {
+ if ( fn && donative !== false && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) {
this.triggered = true;
element[ type ]();
}
this.triggered = true;
element[ type ]();
}