From: Eduardo Lundgren Date: Tue, 28 Oct 2008 18:05:02 +0000 (+0000) Subject: Sortable - delta direction improved X-Git-Tag: 1.6rc3~496 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=95980d34da7f4ef6637a107df5fd669c624fd9c6;p=jquery-ui.git Sortable - delta direction improved --- diff --git a/ui/ui.sortable.js b/ui/ui.sortable.js index 572725529..5406575d0 100644 --- a/ui/ui.sortable.js +++ b/ui/ui.sortable.js @@ -128,12 +128,24 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, { if (this.floating) { if (isOverElement) { - return horizontalDirection == "right" ? 2 : 1; + + if (horizontalDirection == false) { + return false; + } + + var direction = horizontalDirection == "right" ? 2 : 1; + return direction; } } else { if (isOverElement) { - return verticalDirection == "down" ? 2 : 1; + + if (verticalDirection == false) { + return false; + } + + var direction = verticalDirection == "down" ? 2 : 1; + return direction; } } @@ -143,14 +155,26 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, { _getDragVerticalDirection: function() { var helperTop = this.positionAbs.top; var lastTop = this.lastPositionAbs.top; - var direction = helperTop - lastTop > 0 ? "down" : "up"; + var delta = helperTop - lastTop; + + if (delta == 0) { + return false; + } + + var direction = delta > 0 ? "down" : "up"; return direction; }, _getDragHorizontalDirection: function() { var helperLeft = this.positionAbs.left; var lastLeft = this.lastPositionAbs.left; - var direction = helperLeft - lastLeft > 0 ? "right" : "left"; + var delta = helperLeft - lastLeft; + + if (delta == 0) { + return false; + } + + var direction = delta > 0 ? "right" : "left"; return direction; },