Permalink
Browse files

Sortable: Redetermine floating flag when recalculating positions

This addresses a bug where users initialize empty sortable lists are
add items dynamically. In this situation refresh() should recognize the
position and orientation of the new items.

Fixes #7498
Closes gh-1381
(cherry picked from commit f656aeb)
  • Loading branch information...
tjvantoll authored and scottgonzalez committed Oct 31, 2014
1 parent 258dbe3 commit 189f1d476c2d6f53c88f9e92bdaffbc64ed9c572
Showing with 40 additions and 5 deletions.
  1. +35 −0 tests/unit/sortable/sortable_methods.js
  2. +5 −5 ui/sortable.js
@@ -90,4 +90,39 @@ test( "disable", function() {
equal( chainable, element, "disable is chainable" );
});
test( "refresh() should update the positions of initially empty lists (see #7498)", function() {
expect( 1 );
var changeCount = 0,
element = $( "#qunit-fixture" ).html( "<ul></ul>" ).find( "ul" );
element
.css({
"float": "left",
width: "100px"
})
.sortable({
change: function() {
changeCount++;
}
})
.append( "<li>a</li><li>a</li>" )
.find( "li" )
.css({
"float": "left",
width: "50px",
height: "50px"
});
element.sortable( "refresh" );
// Switch the order of the two li elements
element.find( "li" ).eq( 0 ).simulate( "drag", {
dx: 55,
moves: 15
});
equal( changeCount, 1 );
});
})(jQuery);
View
@@ -77,17 +77,12 @@ return $.widget("ui.sortable", $.ui.mouse, {
},
_create: function() {
var o = this.options;
this.containerCache = {};
this.element.addClass("ui-sortable");
//Get the items
this.refresh();
//Let's determine if the items are being displayed horizontally
this.floating = this.items.length ? o.axis === "x" || this._isFloating(this.items[0].item) : false;
//Let's determine the parent's offset
this.offset = this.element.offset();
@@ -731,6 +726,11 @@ return $.widget("ui.sortable", $.ui.mouse, {
refreshPositions: function(fast) {
// Determine whether items are being displayed horizontally
this.floating = this.items.length ?
this.options.axis === "x" || this._isFloating( this.items[ 0 ].item ) :
false;
//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
if(this.offsetParent && this.helper) {
this.offset.parent = this._getParentOffset();

0 comments on commit 189f1d4

Please sign in to comment.