From: Dave Methvin Date: Tue, 12 Apr 2011 22:46:21 +0000 (-0400) Subject: Merge branch 'fix-8790-quick-trigger' X-Git-Tag: 1.6b1~8^2~5 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6d49e84dafd8990221913944727e4f5dcaec078d;p=jquery.git Merge branch 'fix-8790-quick-trigger' Conflicts: src/event.js --- 6d49e84dafd8990221913944727e4f5dcaec078d diff --cc src/event.js index 316a7fee1,f6cd97ccf..f005f7285 --- a/src/event.js +++ b/src/event.js @@@ -304,10 -314,10 +304,11 @@@ jQuery.event = // jQuery.Event object event[ jQuery.expando ] ? event : // Object literal - jQuery.extend( jQuery.Event(type), event ) : + jQuery.extend( new jQuery.Event(type), event ) : // Just the event type (string) - jQuery.Event(type); + new jQuery.Event(type); + + event.type = type; event.namespace = namespaces.join("."); event.namespace_re = new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)"); event.exclusive = exclusive;