jQuery UI Development

Timestamp:

12/17/08 11:35:13 (15 months ago)

Author:

paul.bakaus

Message:

sortable: removed default tolerance "guess" for the simplier (and better working) default mode, and the plain "pointer" intersection

Files:

• trunk/ui/ui.sortable.js (modified) (4 diffs)

trunk/ui/ui.sortable.js

@@ -211 +211 @@
                                 this.direction = intersection == 1 ? "down" : "up";
 
-                                if (this.options.tolerance == "pointer" || (this.options.tolerance == "guess" && this._intersectsGuess(item))) {
+                                if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
                                         this.options.sortIndicator.call(this, event, item);
+                                } else {
+                                        break;
                                 }
 
@@ -349 +351 @@
                 if(        this.options.tolerance == "pointer"
                         || this.options.forcePointerForContainers
-                        || (this.options.tolerance == "guess" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])
+                        || (this.options.tolerance != "pointer" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])
                 ) {
                         return isOverElement;
@@ -379 +381 @@
         },
 
-        _intersectsGuess: function(item) {
+        _intersectsWithSides: function(item) {
 
                 var isOverBottomHalf = $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
@@ -907 +909 @@
                 scrollSpeed: 20,
                 sortIndicator: $.ui.sortable.prototype._rearrange,
-                tolerance: "guess",
+                tolerance: "default",
                 zIndex: 1000
         }