diff options
| author | Paul Bakaus <paul.bakaus@googlemail.com> | 2009-01-09 16:52:27 +0000 |
|---|---|---|
| committer | Paul Bakaus <paul.bakaus@googlemail.com> | 2009-01-09 16:52:27 +0000 |
| commit | 842753690a230820639f702176c52de11404f376 (patch) | |
| tree | 4d98b7e4db50a8d6080b9bb511293101d3d2a5ea | |
| parent | de1d540d94b6f1c839e7480f675afb411ffdc935 (diff) | |
| download | jquery-ui-842753690a230820639f702176c52de11404f376.tar.gz jquery-ui-842753690a230820639f702176c52de11404f376.zip | |
core: fixed _trigger not modifing the original event with event.result
sortable: use event.result to listen for a return false
| -rw-r--r-- | ui/ui.core.js | 2 | ||||
| -rw-r--r-- | ui/ui.sortable.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/ui.core.js b/ui/ui.core.js index 03bb59849..4afd2066f 100644 --- a/ui/ui.core.js +++ b/ui/ui.core.js @@ -371,7 +371,7 @@ $.widget.prototype = { ? 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); diff --git a/ui/ui.sortable.js b/ui/ui.sortable.js index 174cde6b4..49387a442 100644 --- a/ui/ui.sortable.js +++ b/ui/ui.sortable.js @@ -895,7 +895,7 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, { _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: {}, |