r1577 - trunk/ui
r1577 - trunk/ui
Author: paul.bakaus
Date: Fri Jan 9 08:52:27 2009
New Revision: 1577
Modified:
trunk/ui/ui.core.js
trunk/ui/ui.sortable.js
Log:
core: fixed _trigger not modifing the original event with event.result
sortable: use event.result to listen for a return false
Modified: trunk/ui/ui.core.js
==============================================================================
--- trunk/ui/ui.core.js (original)
+++ trunk/ui/ui.core.js Fri Jan 9 08:52:27 2009
@@ -371,7 +371,7 @@
? type : this.widgetEventPrefix + type);
// event can be null, a hash, a native event, a fixed event
- event = $.Event(event);
+ event = event ? $.extend(event, $.Event()) : $.Event();
event.type = eventName;
this.element.trigger(event, data);
Modified: trunk/ui/ui.sortable.js
==============================================================================
--- trunk/ui/ui.sortable.js (original)
+++ trunk/ui/ui.sortable.js Fri Jan 9 08:52:27 2009
@@ -895,7 +895,7 @@
_trigger: function(type, event, inst, noPropagation) {
$.ui.plugin.call(this, type, [event, this._uiHash(inst)]);
if(!noPropagation) $.widget.prototype._trigger.call(this, type, event,
this._uiHash(inst));
- if(event && event.returnValue === false) this.cancel();
+ if(event && event.result === false) this.cancel();
},
plugins: {},