Skip to content

Commit

Permalink
Merge branch 'master' of github.com:jquery/jquery into fix-8790-quick…
Browse files Browse the repository at this point in the history
…-trigger

Conflicts:
	src/event.js
  • Loading branch information
dmethvin committed Apr 11, 2011
2 parents 1cca081 + 868e1e2 commit 7957516
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/event.js
Expand Up @@ -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 ||
Expand Down Expand Up @@ -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(" ");


Expand Down

0 comments on commit 7957516

Please sign in to comment.