Widget: Simplify data normalization in _trigger().

This commit is contained in:
Scott González 2011-11-21 11:31:51 -05:00
parent 91ef69d750
commit 5fb9629766

View File

@ -374,7 +374,7 @@ $.Widget.prototype = {
}, },
_trigger: function( type, event, data ) { _trigger: function( type, event, data ) {
var args, prop, orig, var prop, orig,
callback = this.options[ type ]; callback = this.options[ type ];
data = data || {}; data = data || {};
@ -397,13 +397,8 @@ $.Widget.prototype = {
} }
this.element.trigger( event, data ); this.element.trigger( event, data );
args = $.isArray( data ) ?
[ event ].concat( data ) :
[ event, data ];
return !( $.isFunction( callback ) && return !( $.isFunction( callback ) &&
callback.apply( this.element[0], args ) === false || callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
event.isDefaultPrevented() ); event.isDefaultPrevented() );
} }
}; };