r846 - trunk/ui

r846 - trunk/ui


Author: eduardolundgren
Date: Tue Oct 28 11:05:02 2008
New Revision: 846
Modified:
trunk/ui/ui.sortable.js
Log:
Sortable - delta direction improved
Modified: trunk/ui/ui.sortable.js
==============================================================================
--- trunk/ui/ui.sortable.js    (original)
+++ trunk/ui/ui.sortable.js    Tue Oct 28 11:05:02 2008
@@ -128,12 +128,24 @@
        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 @@
    _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;
    },