From b3fcf174716203013e9844f1aee3216f971fcd43 Mon Sep 17 00:00:00 2001
From: Michael DellaNoce <mdellanoce@mailtrust.com>
Date: Tue, 1 Feb 2011 06:57:48 -0500
Subject: Widget: Modified _trigger to invoke callbacks with apply so that
 handlers are invoked the same way .trigger() invokes them. Fixes #6795 -
 Widget: _trigger passes array arguments to handlers inconsistently.

---
 ui/jquery.ui.widget.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'ui/jquery.ui.widget.js')

diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index c8e5348ac..1ec934469 100644
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -289,7 +289,8 @@ $.Widget.prototype = {
 	},
 
 	_trigger: function( type, event, data ) {
-		var callback = this.options[ type ];
+		var callback = this.options[ type ],
+			args;
 
 		event = $.Event( event );
 		event.type = ( type === this.widgetEventPrefix ?
@@ -309,8 +310,12 @@ $.Widget.prototype = {
 
 		this.element.trigger( event, data );
 
-		return !( $.isFunction(callback) &&
-			callback.call( this.element[0], event, data ) === false ||
+		args = $.isArray( data ) ?
+			[ event ].concat( data ) :
+			[ event, data ];
+
+		return !( $.isFunction( callback ) &&
+			callback.apply( this.element[0], args ) === false ||
 			event.isDefaultPrevented() );
 	}
 };
-- 
cgit v1.2.3