library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

draggable,sortable: if connectToSortable is used, ui.sender has to be the original draggable (fixes #3856)

Browse Source
This commit is contained in:
Paul Bakaus 2009-01-19 11:34:22 +00:00
parent 895512190a
commit 513f19e60b
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/ui.draggable.js
View File

@ -467,9 +467,6 @@ $.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
}

2
ui/ui.sortable.js
View File

@ -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());