deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:jquery/jquery into fix-8790-quick-trigger

Browse source 
Conflicts:
	src/event.js
This commit is contained in:
Dave Methvin 2011-04-11 11:44:26 -04:00
parent 1cca0817a0 868e1e28ce
commit 7957516671
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/event.js
View file

@ -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
// by a handler lower down the tree; reflect the correct value.
this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
@ -1049,7 +1052,7 @@ jQuery.each(["live", "die"], function( i, name ) {
if ( data === false || jQuery.isFunction( data ) ) {
fn = data || returnFalse;
data = undefined;
}
}
types = (types || "").split(" ");