Commit 6d49e84d authored by Dave Methvin's avatar Dave Methvin

Merge branch 'fix-8790-quick-trigger'

Conflicts:
	src/event.js
parents 0d8b247c 9e71ad1b
...@@ -275,7 +275,7 @@ jQuery.event = { ...@@ -275,7 +275,7 @@ jQuery.event = {
"changeData": true "changeData": true
}, },
trigger: function( event, data, elem, bubbling /* For Internal Use Only */ ) { trigger: function( event, data, elem ) {
// Event object or event type // Event object or event type
var type = event.type || event, var type = event.type || event,
namespaces = [], namespaces = [],
...@@ -304,10 +304,11 @@ jQuery.event = { ...@@ -304,10 +304,11 @@ jQuery.event = {
// jQuery.Event object // jQuery.Event object
event[ jQuery.expando ] ? event : event[ jQuery.expando ] ? event :
// Object literal // Object literal
jQuery.extend( jQuery.Event(type), event ) : jQuery.extend( new jQuery.Event(type), event ) :
// Just the event type (string) // Just the event type (string)
jQuery.Event(type); new jQuery.Event(type);
event.type = type;
event.namespace = namespaces.join("."); event.namespace = namespaces.join(".");
event.namespace_re = new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)"); event.namespace_re = new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)");
event.exclusive = exclusive; event.exclusive = exclusive;
...@@ -980,7 +981,7 @@ jQuery.fn.extend({ ...@@ -980,7 +981,7 @@ jQuery.fn.extend({
triggerHandler: function( type, data ) { triggerHandler: function( type, data ) {
if ( this[0] ) { if ( this[0] ) {
var event = jQuery.Event( type ); var event = new jQuery.Event( type );
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
jQuery.event.trigger( event, data, this[0] ); jQuery.event.trigger( event, data, this[0] );
......
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