git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:jquery/jquery
[jquery.git]
/
src
/
event.js
diff --git
a/src/event.js
b/src/event.js
index
d830c4d
..
b4b4da9
100644
(file)
--- a/
src/event.js
+++ b/
src/event.js
@@
-32,6
+32,9
@@
jQuery.event = {
if ( handler === false ) {
handler = returnFalse;
if ( handler === false ) {
handler = returnFalse;
+ } else if ( !handler ) {
+ // Fixes bug #7229. Fix recommended by jdalton
+ return;
}
var handleObjIn, handleObj;
}
var handleObjIn, handleObj;
@@
-792,6
+795,8
@@
if ( !jQuery.support.changeBubbles ) {
filters: {
focusout: testChange,
filters: {
focusout: testChange,
+ beforedeactivate: testChange,
+
click: function( e ) {
var elem = e.target, type = elem.type;
click: function( e ) {
var elem = e.target, type = elem.type;
@@
-1063,7
+1068,7
@@
function liveHandler( event ) {
if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
return;
}
if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
return;
}
-
+
if ( event.namespace ) {
namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)");
}
if ( event.namespace ) {
namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)");
}
@@
-1127,6
+1132,9
@@
function liveHandler( event ) {
if ( ret === false ) {
stop = false;
}
if ( ret === false ) {
stop = false;
}
+ if ( event.isImmediatePropagationStopped() ) {
+ break;
+ }
}
}
}
}