Skip to content
Permalink
Browse files

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

…-trigger

Conflicts:
	src/event.js
  • Loading branch information...
dmethvin committed Apr 11, 2011
2 parents 1cca081 + 868e1e2 commit 7957516671c4fbb54727f7b10a3e068d92c57f7a
Showing with 4 additions and 1 deletion.
  1. +4 −1 src/event.js
@@ -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(" ");

0 comments on commit 7957516

Please sign in to comment.
You can’t perform that action at this time.