Commit 868e1e28 authored by Rick Waldon's avatar Rick Waldon

Ticket #8753 Always set event type explicitly

parent 6591f6dd
...@@ -304,7 +304,7 @@ jQuery.event = { ...@@ -304,7 +304,7 @@ jQuery.event = {
} }
event.namespace = namespaces.join("."); event.namespace = namespaces.join(".");
event.namespace_re = new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)"); event.namespace_re = new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)");
// Handle a global trigger // Handle a global trigger
if ( !elem ) { if ( !elem ) {
// Don't bubble custom events when global (to avoid too much overhead) // Don't bubble custom events when global (to avoid too much overhead)
...@@ -574,6 +574,9 @@ jQuery.Event = function( src ) { ...@@ -574,6 +574,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 ||
...@@ -1033,7 +1036,7 @@ jQuery.each(["live", "die"], function( i, name ) { ...@@ -1033,7 +1036,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