From d8077dc562bfca60906a160e20186608a10b7a87 Mon Sep 17 00:00:00 2001 From: Mike Sherov Date: Sat, 8 Nov 2014 20:23:08 -0500 Subject: Draggable: Ensure parent is correct after dragging through sortable Fixes #10669 --- ui/draggable.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'ui') diff --git a/ui/draggable.js b/ui/draggable.js index b59955add..5be628dc8 100644 --- a/ui/draggable.js +++ b/ui/draggable.js @@ -800,6 +800,9 @@ $.ui.plugin.add( "draggable", "connectToSortable", { if ( !sortable.isOver ) { sortable.isOver = 1; + // Store draggable's parent in case we need to reappend to it later. + draggable._parent = ui.helper.parent(); + sortable.currentItem = ui.helper .appendTo( sortable.element ) .data( "ui-sortable-item", true ); @@ -876,8 +879,9 @@ $.ui.plugin.add( "draggable", "connectToSortable", { sortable.placeholder.remove(); } - // Recalculate the draggable's offset considering the sortable - // may have modified them in unexpected ways (#8809) + // Restore and recalculate the draggable's offset considering the sortable + // may have modified them in unexpected ways. (#8809, #10669) + ui.helper.appendTo( draggable._parent ); draggable._refreshOffsets( event ); ui.position = draggable._generatePosition( event, true ); -- cgit v1.2.3