Skip to content
Permalink
Browse files

Merge branch 'fix-8790-quick-trigger'

Conflicts:
	src/event.js
  • Loading branch information...
dmethvin committed Apr 12, 2011
2 parents 0d8b247 + 9e71ad1 commit 6d49e84dafd8990221913944727e4f5dcaec078d
Showing with 5 additions and 4 deletions.
  1. +5 −4 src/event.js
@@ -275,7 +275,7 @@ jQuery.event = {
"changeData": true
},

trigger: function( event, data, elem, bubbling /* For Internal Use Only */ ) {
trigger: function( event, data, elem ) {
// Event object or event type
var type = event.type || event,
namespaces = [],
@@ -304,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;
@@ -980,7 +981,7 @@ jQuery.fn.extend({

triggerHandler: function( type, data ) {
if ( this[0] ) {
var event = jQuery.Event( type );
var event = new jQuery.Event( type );
event.preventDefault();
event.stopPropagation();
jQuery.event.trigger( event, data, this[0] );

0 comments on commit 6d49e84

Please sign in to comment.
You can’t perform that action at this time.