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:
291f071
)
Fixed regression with 5276 where return false in first handler of multiple handlers...
author
Brandon Aaron
<brandon.aaron@gmail.com>
Wed, 23 Apr 2008 18:57:17 +0000
(18:57 +0000)
committer
Brandon Aaron
<brandon.aaron@gmail.com>
Wed, 23 Apr 2008 18:57:17 +0000
(18:57 +0000)
src/event.js
patch
|
blob
|
history
diff --git
a/src/event.js
b/src/event.js
index
e08a085
..
25161d3
100644
(file)
--- a/
src/event.js
+++ b/
src/event.js
@@
-231,7
+231,7
@@
jQuery.event = {
handle: function(event) {
// returned undefined or false
handle: function(event) {
// returned undefined or false
- var val, namespace, all, handlers;
+ var val, ret, namespace, all, handlers;
event = arguments[0] = jQuery.event.fix( event || window.event );
event = arguments[0] = jQuery.event.fix( event || window.event );
@@
-253,14
+253,17
@@
jQuery.event = {
event.handler = handler;
event.data = handler.data;
event.handler = handler;
event.data = handler.data;
- val = handler.apply( this, arguments );
+ ret = handler.apply( this, arguments );
+
+ if ( val !== false )
+ val = ret;
+
+ if ( ret === false ) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
}
}
}
}
-
- if ( val === false ) {
- event.preventDefault();
- event.stopPropagation();
- }
// Clean up added properties in IE to prevent memory leak
if (jQuery.browser.msie)
// Clean up added properties in IE to prevent memory leak
if (jQuery.browser.msie)