Widget factory: _trigger will now set event.result if the callback returns a value...

diff --git a/ui/ui.core.js b/ui/ui.core.js
index d5949c30d90627dacd0d07767a026949ebd4537e..03bb598496e61b690dcd13fb8b75a616cbfedeac 100644 (file)
--- 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;
        }
 };