Skip to content
This repository was archived by the owner on Mar 14, 2020. It is now read-only.

[Layout View] Improve the sorting algorithm to solve jittering problem #297

Open
zhizhangchen wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[Layout View] Improve the sorting algorithm to solve jittering problem #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f030a0
[Layout View] Improve the sorting algorithm to solve jittering problem
zhizhangchen Sep 13, 2012
ebe691f
[Layout View] Fix the problem that lists can't be sorted
zhizhangchen Sep 25, 2012
6c383af
[Layout View] Call refresh using more official way
zhizhangchen Sep 25, 2012
6293ce5
[Layout View] Fix the problem that horizontal buttons can't be sorted
zhizhangchen Sep 25, 2012
9261662
[Layout View] Exclude currentItem from distance calculation
zhizhangchen Sep 25, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/js/composer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,9 +527,9 @@ $(function() {
$(this).sortable('refresh');
$.each($(this).data('sortable').containers, function () {
this.options.connectWith = '.ui-sortable-connected';
this._refreshItems();
this.refresh();
});
$(this).data('sortable')._refreshItems();
$(this).sortable('refresh');



Expand Down
26 changes: 13 additions & 13 deletions src/js/jquery-workarounds.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ $.widget("ui.sortable", $.extend({}, $.ui.sortable.prototype, {
_contactContainers: function(event) {

// get innermost container that intersects with item
var innermostContainer = null, innermostIndex = null, direction, intersection;
var innermostContainer = null, innermostIndex = null;


for (var i = this.containers.length - 1; i >= 0; i--){
Expand All @@ -384,8 +384,7 @@ $.widget("ui.sortable", $.extend({}, $.ui.sortable.prototype, {
continue;


if(intersection = this._intersectsWithPointer(this.containers[i].containerCache)) {
direction = intersection == 1 ? "down" : "up";
if(this._intersectsWithPointer(this.containers[i].containerCache)) {

// if we've already found a container and it's more "inner" than this, then continue
if(innermostContainer && $.ui.contains(this.containers[i].element[0], innermostContainer.element[0]))
Expand Down Expand Up @@ -414,23 +413,24 @@ $.widget("ui.sortable", $.extend({}, $.ui.sortable.prototype, {

//When entering a new container, we will find the item with the least distance and append our item near it
var dist = 10000; var itemWithLeastDistance = null;
var posProperty = this.containers[innermostIndex].floating ? 'left' : 'top';
var sizeProperty = this.containers[innermostIndex].floating ? 'width' : 'height';
var base = this.positionAbs[posProperty] + this.offset.click[posProperty];
var floating = this.containers[innermostIndex].floating;
for (var j = this.items.length - 1; j >= 0; j--) {
if(!$.ui.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) continue;
if(this.items[j].item[0] == this.currentItem[0]) continue;
floating = floating || (/left|right/).test(this.items[j].item.css('float')) || (/inline|table-cell/).test(this.items[j].item.css('display'));
var posProperty = floating ? 'left' : 'top';
var sizeProperty = floating ? 'width' : 'height';
var base = this.positionAbs[posProperty] + this.offset.click[posProperty];
var cur = this.items[j][posProperty];
if(Math.abs(cur - base) > Math.abs(cur + this.items[j][sizeProperty] - base))
var nearBottom = false;
if(Math.abs(cur - base) > Math.abs(cur + this.items[j][sizeProperty] - base)) {
cur += this.items[j][sizeProperty];
nearBottom = true;
}

if(Math.abs(cur - base) < dist) {
dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j];
if(!this._intersectsWithPointer(itemWithLeastDistance) && base != cur)
{
this.direction = base > cur ? "up": "down";
}
else
this.direction = direction;
this.direction = nearBottom ? "up": "down";
}
}

Expand Down