Commit 79575166 authored by Dave Methvin's avatar Dave Methvin

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

Conflicts:
	src/event.js
parents 1cca0817 868e1e28
...@@ -590,6 +590,9 @@ jQuery.Event = function( src ) { ...@@ -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 ) { ...@@ -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(" ");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment