diff options
| author | Paul Bakaus <paul.bakaus@googlemail.com> | 2009-01-19 11:34:22 +0000 |
|---|---|---|
| committer | Paul Bakaus <paul.bakaus@googlemail.com> | 2009-01-19 11:34:22 +0000 |
| commit | 513f19e60bbbf20305e16fe7efdfc86aa157fdca (patch) | |
| tree | 260adbb4a2e02e991355ef304d72ab3429db544b | |
| parent | 895512190ace390a31e91d248f936ab664816a63 (diff) | |
| download | jquery-ui-513f19e60bbbf20305e16fe7efdfc86aa157fdca.tar.gz jquery-ui-513f19e60bbbf20305e16fe7efdfc86aa157fdca.zip | |
draggable,sortable: if connectToSortable is used, ui.sender has to be the original draggable (fixes #3856)
| -rw-r--r-- | ui/ui.draggable.js | 7 | ||||
| -rw-r--r-- | ui/ui.sortable.js | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/ui/ui.draggable.js b/ui/ui.draggable.js index a1d17aef4..b70435e77 100644 --- a/ui/ui.draggable.js +++ b/ui/ui.draggable.js @@ -466,10 +466,7 @@ $.ui.plugin.add("draggable", "connectToSortable", { //Trigger the stop of the sortable this.instance._mouseStop(event); - - //Also propagate receive event, since the sortable is actually receiving a element - this.instance.element.triggerHandler("sortreceive", [event, $.extend(this.instance._uiHash(), { sender: inst.element })], this.instance.options["receive"]); - + this.instance.options.helper = this.instance.options._helper; //If the helper has been the original item, restore properties in the sortable @@ -523,7 +520,7 @@ $.ui.plugin.add("draggable", "connectToSortable", { inst._trigger("toSortable", event); inst.dropped = this.instance.element; //draggable revert needs that - this.instance.fromOutside = true; //Little hack so receive/update callbacks work + this.instance.fromOutside = inst; //Little hack so receive/update callbacks work } diff --git a/ui/ui.sortable.js b/ui/ui.sortable.js index 5e7ffa1ca..a51c20f5b 100644 --- a/ui/ui.sortable.js +++ b/ui/ui.sortable.js @@ -902,7 +902,7 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, { this.currentItem.show(); } - if(this.fromOutside && !noPropagation) this._trigger("receive", event, this._uiHash(this)); + if(this.fromOutside && !noPropagation) this._trigger("receive", event, this._uiHash(this.fromOutside)); if((this.fromOutside || this.domPosition.prev != this.currentItem.prev().not("."+this.options.cssNamespace+"-sortable-helper")[0] || this.domPosition.parent != this.currentItem.parent()[0]) && !noPropagation) this._trigger("update", event, this._uiHash()); //Trigger update callback if the DOM position has changed if(!$.ui.contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element if(!noPropagation) this._trigger("remove", event, this._uiHash()); |