mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
Merge branch 'master' of github.com:jquery/jquery into fix-8790-quick-trigger
Conflicts: src/event.js
This commit is contained in:
commit
7957516671
@ -590,6 +590,9 @@ jQuery.Event = function( src ) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Always ensure a type has been explicitly set
|
||||||
|
this.type = src.type;
|
||||||
|
|
||||||
// Events bubbling up the document may have been marked as prevented
|
// Events bubbling up the document may have been marked as prevented
|
||||||
// by a handler lower down the tree; reflect the correct value.
|
// by a handler lower down the tree; reflect the correct value.
|
||||||
this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
|
this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
|
||||||
@ -1049,7 +1052,7 @@ jQuery.each(["live", "die"], function( i, name ) {
|
|||||||
if ( data === false || jQuery.isFunction( data ) ) {
|
if ( data === false || jQuery.isFunction( data ) ) {
|
||||||
fn = data || returnFalse;
|
fn = data || returnFalse;
|
||||||
data = undefined;
|
data = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
types = (types || "").split(" ");
|
types = (types || "").split(" ");
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user