Widget factory: _trigger will now set event.result if the callback returns a value. The created event is now always run through $.Event to reset isDefaultPrevent(), isPropagationStopped(), isImmediatePropagationStopped().

1 files changed, 11 insertions, 4 deletions

diff --git a/ui/ui.core.js b/ui/ui.core.js
index d5949c30d..03bb59849 100644
--- a/ui/ui.core.js
+++ b/ui/ui.core.js
@@ -370,13 +370,20 @@ $.widget.prototype = {
 			eventName = (type == this.widgetEventPrefix
 				? type : this.widgetEventPrefix + type);
 
-		event = event ? $.event.fix(event) : $.Event();
+		// event can be null, a hash, a native event, a fixed event
+		event = $.Event(event);
 		event.type = eventName;
 
 		this.element.trigger(event, data);
-
-		return !(callback && callback.call(this.element[0], event, data) === false
-			|| event.isDefaultPrevented());
+		var callbackResult = callback
+			? callback.call(this.element[0], event, data)
+			: undefined;
+		
+		event.result = callbackResult !== undefined
+			? callbackResult
+			: event.result;
+		
+		return event.result !== false;
 	}
 };