library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Draggable: Ensure parent is correct after dragging through sortable

Browse Source 
Fixes #10669
This commit is contained in:
Mike Sherov 2014-11-08 20:23:08 -05:00
parent 4e860dca95
commit d8077dc562
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/unit/draggable/draggable_options.js
View File

@ -405,6 +405,29 @@ test( "connectToSortable, dragging through one sortable to a second", function()
element.simulate( "drag", dragParams );
});
test( "connectToSortable, dragging through a sortable", function() {
expect( 1 );
var draggable = $( "#draggableSortable" ).draggable({
scroll: false,
connectToSortable: "#sortable2"
}),
sortable = $( "#sortable2" ).sortable(),
sortableOffset = sortable.offset();
// http://bugs.jqueryui.com/ticket/10669
// Draggable: Position issue with connectToSortable
draggable.one( "dragstop", function() {
equal( draggable.parent().attr( "id" ), "sortable", "restored draggable to original parent" );
});
draggable.simulate( "drag", {
x: sortableOffset.left + 25,
y: sortableOffset.top + sortable.outerHeight() + 400,
moves: 20
});
});
test( "{ containment: Element }", function() {
expect( 1 );

8
ui/draggable.js
View File

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