]> source.dussan.org Git - jquery.git/commitdiff
Merge branch 'fix-8790-quick-trigger'
authorDave Methvin <dave.methvin@gmail.com>
Tue, 12 Apr 2011 22:46:21 +0000 (18:46 -0400)
committerDave Methvin <dave.methvin@gmail.com>
Tue, 12 Apr 2011 22:46:21 +0000 (18:46 -0400)
Conflicts:
src/event.js

1  2 
src/event.js

diff --cc src/event.js
index 316a7fee12032c77a45d3d9517cb0588e1c80dc9,f6cd97ccfa590b4f9818aadae6bf03f3a8910eac..f005f7285a652359b33ed609d9cc22547a6a8cd8
@@@ -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;