Widget factory: Fixed event triggering (again).

Draggable: To modify the position during drag, you now set ui.position instead of returning new coords.

1 files changed, 4 insertions, 11 deletions

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