Skip to content
Permalink
Browse files

draggable,sortable: if connectToSortable is used, ui.sender has to be…

… the original draggable (fixes #3856)
  • Loading branch information
Paul Bakaus
Paul Bakaus committed Jan 19, 2009
1 parent 8955121 commit 513f19e60bbbf20305e16fe7efdfc86aa157fdca
Showing with 3 additions and 6 deletions.
  1. +2 −5 ui/ui.draggable.js
  2. +1 −1 ui/ui.sortable.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

}

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

0 comments on commit 513f19e

Please sign in to comment.
You can’t perform that action at this time.