aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Methvin <dave.methvin@gmail.com>2011-04-11 11:44:26 -0400
committerDave Methvin <dave.methvin@gmail.com>2011-04-11 11:44:26 -0400
commit7957516671c4fbb54727f7b10a3e068d92c57f7a (patch)
tree25bce109e74fbb3baac91a193889f4973a0fad6a /src
parent1cca0817a0dfaa2726c5c5eb2bdd84a9eb6edf92 (diff)
parent868e1e28ce7cee543e0e47ec2261b44c4c686f99 (diff)
downloadjquery-7957516671c4fbb54727f7b10a3e068d92c57f7a.tar.gz
jquery-7957516671c4fbb54727f7b10a3e068d92c57f7a.zip
Merge branch 'master' of github.com:jquery/jquery into fix-8790-quick-trigger
Conflicts: src/event.js
Diffstat (limited to 'src')
-rw-r--r--src/event.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/event.js b/src/event.js
index 95f305bab..e6e7788da 100644
--- a/src/event.js
+++ b/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(" ");