r841 - trunk/ui
r841 - trunk/ui
Author: eduardolundgren
Date: Mon Oct 27 22:44:17 2008
New Revision: 841
Modified:
trunk/ui/ui.sortable.js
Log:
Sortable - Tolerance accuracy sortable improved
Modified: trunk/ui/ui.sortable.js
==============================================================================
--- trunk/ui/ui.sortable.js (original)
+++ trunk/ui/ui.sortable.js Mon Oct 27 22:44:17 2008
@@ -4,7 +4,7 @@
* Copyright (c) 2008 Paul Bakaus
* Dual licensed under the MIT (MIT-LICENSE.txt)
* and GPL (GPL-LICENSE.txt) licenses.
- *
+ *
* http://docs.jquery.com/UI/Sortables
*
* Depends:
@@ -12,37 +12,37 @@
*/
(function($) {
-function contains(a, b) {
- var safari2 = $.browser.safari && $.browser.version < 522;
- if (a.contains && !safari2) {
- return a.contains(b);
- }
+function contains(a, b) {
+ var safari2 = $.browser.safari && $.browser.version < 522;
+ if (a.contains && !safari2) {
+ return a.contains(b);
+ }
if (a.compareDocumentPosition)
- return !!(a.compareDocumentPosition(b) & 16);
+ return !!(a.compareDocumentPosition(b) & 16);
while (b = b.parentNode)
- if (b == a) return true;
- return false;
+ if (b == a) return true;
+ return false;
};
$.widget("ui.sortable", $.extend({}, $.ui.mouse, {
_init: function() {
-
+
var o = this.options;
this.containerCache = {};
this.element.addClass("ui-sortable");
-
+
//Get the items
this.refresh();
-
+
//Let's determine if the items are floating
this.floating = this.items.length ? (/left|
right/).test(this.items[0].item.css('float')) : false;
-
+
//Let's determine the parent's offset
this.offset = this.element.offset();
-
+
//Initialize mouse events for interaction
this._mouseInit();
-
+
},
plugins: {},
ui: function(inst) {
@@ -55,114 +55,116 @@
element: this.element,
item: (inst || this)["currentItem"],
sender: inst ? inst.element : null
- };
+ };
},
-
+
_propagate: function(n,e,inst, noPropagation) {
$.ui.plugin.call(this, n, [e, this.ui(inst)]);
if(!noPropagation) this.element.triggerHandler(n == "sort" ?
n : "sort"+n, [e, this.ui(inst)], this.options[n]);
},
-
+
serialize: function(o) {
-
+
var items = this._getItemsAsjQuery(o && o.connected);
var str = []; o = o || {};
-
+
$(items).each(function() {
var res = ($(o.item || this).attr(o.attribute || 'id') |
| '').match(o.expression || (/(.+)[-=_](.+)/));
if(res) str.push((o.key || res[1]+'[]')+'='+(o.key && o.expression ?
res[1] : res[2]));
});
-
+
return str.join('&');
-
+
},
-
+
toArray: function(o) {
-
+
var items = this._getItemsAsjQuery(o && o.connected);
var ret = []; o = o || {};
-
+
items.each(function() { ret.push($(o.item || this).attr(o.attribute |
| 'id') || ''); });
return ret;
-
+
},
-
+
/* Be careful with the following core functions */
_intersectsWith: function(item) {
var x1 = this.positionAbs.left, x2 = x1 + this.helperProportions.width,
y1 = this.positionAbs.top, y2 = y1 + this.helperProportions.height;
- var l = item.left, r = l + item.width,
+ var l = item.left, r = l + item.width,
t = item.top, b = t + item.height;
-
+
var dyClick = this.offset.click.top, dxClick = this.offset.click.left;
var isOverElement = (y1 + dyClick) > t && (y1 + dyClick) < b && (x1 +
dxClick) > l && (x1 + dxClick) < r;
-
+
if(this.options.tolerance == "pointer" ||
this.options.forcePointerForContainers || (this.options.tolerance
== "guess" && this.helperProportions[this.floating ? 'width' : 'height'] >
item[this.floating ? 'width' : 'height'])) {
return isOverElement;
} else {
-
+
return (l < x1 + (this.helperProportions.width / 2) // Right Half
&& x2 - (this.helperProportions.width / 2) < r // Left Half
&& t < y1 + (this.helperProportions.height / 2) // Bottom Half
&& y2 - (this.helperProportions.height / 2) < b ); // Top Half
-
+
}
},
-
- _intersectsWithEdge: function(item) {
- var x1 = this.positionAbs.left, x2 = x1 + this.helperProportions.width,
- y1 = this.positionAbs.top, y2 = y1 + this.helperProportions.height;
-
- var l = item.left, r = l + item.width,
- t = item.top, b = t + item.height;
-
+
+ _intersectsWithEdge: function(item) {
var dyClick = this.offset.click.top, dxClick = this.offset.click.left;
- var isOverElement = (y1 + dyClick) > t && (y1 + dyClick) < b && (x1 +
dxClick) > l && (x1 + dxClick) < r;
-
- if(this.options.tolerance == "pointer" || (this.options.tolerance
== "guess" && this.helperProportions[this.floating ? 'width' : 'height'] >
item[this.floating ? 'width' : 'height'])) {
- if(!isOverElement) return false;
-
- if(this.floating) {
- if ((x1 + dxClick) > l && (x1 + dxClick) < l + item.width/2) return 2;
- if ((x1 + dxClick) > l + item.width/2 && (x1 + dxClick) < r) return 1;
- } else {
- var height = item.height;
- var direction = y1 - this.updateOriginalPosition.top < 0 ? 2 : 1; // 2
= up
-
- if (direction == 1 && (y1 + dyClick) < t + height/2) { return 2; } //
up
- else if (direction == 2 && (y1 + dyClick) > t + height/2) { return 1;
} // down
+ var helperHeight = this.helperProportions.height, helperWidth =
this.helperProportions.width;
+ var helperTop = this.positionAbs.top, helperLeft = this.positionAbs.left;
+ var itemHeight = item.height, itemWidth = item.width;
+ var itemTop = item.top, itemLeft = item.left;
+
+ var isOverElementHeight = ((helperTop + dyClick) > itemTop) &&
+ ((helperTop + dyClick) < (itemTop + itemHeight));
+
+ var isOverElementWidth = ((helperLeft + dxClick) > itemLeft) &&
+ ((helperLeft + dxClick) < (itemLeft + itemWidth));
+
+ var isOverElement = isOverElementHeight && isOverElementWidth;
+ var verticalDirection = this._getDragVerticalDirection();
+ var horizontalDirection = this._getDragHorizontalDirection();
+
+ if (this.floating) {
+ if (isOverElementWidth) {
+ return horizontalDirection == "right" ? 2 : 1;
}
-
- } else {
- if (!(l < x1 + (this.helperProportions.width / 2) // Right Half
- && x2 - (this.helperProportions.width / 2) < r // Left Half
- && t < y1 + (this.helperProportions.height / 2) // Bottom Half
- && y2 - (this.helperProportions.height / 2) < b )) return false; //
Top Half
-
- if(this.floating) {
- if(x2 > l && x1 < l) return 2; //Crosses left edge
- if(x1 < r && x2 > r) return 1; //Crosses right edge
- } else {
- if(y2 > t && y1 < t) return 1; //Crosses top edge
- if(y1 < b && y2 > b) return 2; //Crosses bottom edge
+ }
+ else {
+ if (isOverElement) {
+ return verticalDirection == "down" ? 2 : 1;
}
}
-
+
return false;
-
},
-
+
+ _getDragVerticalDirection: function() {
+ var helperTop = this.positionAbs.top;
+ var lastTop = this.lastPositionAbs.top;
+ var direction = helperTop - lastTop > 0 ? "down" : "up";
+ return direction;
+ },
+
+ _getDragHorizontalDirection: function() {
+ var helperLeft = this.positionAbs.left;
+ var lastLeft = this.lastPositionAbs.left;
+ var direction = helperLeft - lastLeft > 0 ? "right" : "left";
+ return direction;
+ },
+
refresh: function() {
this._refreshItems();
this.refreshPositions();
},
-
+
_getItemsAsjQuery: function(connected) {
-
+
var self = this;
var items = [];
var queries = [];
-
+
if(this.options.connectWith && connected) {
for (var i = this.options.connectWith.length - 1; i >= 0; i--){
var cur = $(this.options.connectWith[i]);
@@ -174,42 +176,42 @@
};
};
}
-
+
queries.push([$.isFunction(this.options.items) ?
this.options.items.call(this.element, null, { options: this.options, item:
this.currentItem }) : $(this.options.items,
this.element).not(".ui-sortable-helper"), this]);
-
+
for (var i = queries.length - 1; i >= 0; i--){
queries[i][0].each(function() {
items.push(this);
});
};
-
+
return $(items);
-
+
},
-
+
_removeCurrentsFromItems: function() {
-
- var list = this.currentItem.find(":data(sortable-item)");
-
+
+ var list = this.currentItem.find(":data(sortable-item)");
+
for (var i=0; i < this.items.length; i++) {
-
+
for (var j=0; j < list.length; j++) {
if(list[j] == this.items[i].item[0])
this.items.splice(i,1);
};
-
+
};
-
+
},
-
+
_refreshItems: function() {
-
+
this.items = [];
this.containers = [this];
var items = this.items;
var self = this;
var queries = [[$.isFunction(this.options.items) ?
this.options.items.call(this.element, null, { options: this.options, item:
this.currentItem }) : $(this.options.items, this.element), this]];
-
+
if(this.options.connectWith) {
for (var i = this.options.connectWith.length - 1; i >= 0; i--){
var cur = $(this.options.connectWith[i]);
@@ -222,48 +224,54 @@
};
};
}
-
- for (var i = queries.length - 1; i >= 0; i--){
- queries[i][0].each(function() {
- $.data(this, 'sortable-item', queries[i][1]); // Data for target
checking (mouse manager)
+
+ for (var i = queries.length - 1; i >= 0; i--) {
+ var targetData = queries[i][1];
+ var _queries = queries[i][0];
+
+ for (var j=0, queriesLength = _queries.length; j < queriesLength; j++) {
+ var item = $(_queries[j]);
+
+ item.data('sortable-item', targetData); // Data for target checking
(mouse manager)
+
items.push({
- item: $(this),
- instance: queries[i][1],
+ item: item,
+ instance: targetData,
width: 0, height: 0,
left: 0, top: 0
});
- });
+ };
};
-
+
},
-
+
refreshPositions: function(fast) {
-
+
//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) {
var po = this.offsetParent.offset();
this.offset.parent = { top: po.top + this.offsetParentBorders.top,
left: po.left + this.offsetParentBorders.left };
}
-
- for (var i = this.items.length - 1; i >= 0; i--){
-
+
+ for (var i = this.items.length - 1; i >= 0; i--){
+ var item = this.items[i];
+
//We ignore calculating positions of all connected containers when
we're not over them
- if(this.items[i].instance != this.currentContainer &&
this.currentContainer && this.items[i].item[0] != this.currentItem[0])
+ if(item.instance != this.currentContainer && this.currentContainer &&
item.item[0] != this.currentItem[0])
continue;
-
- var t = this.options.toleranceElement ?
$(this.options.toleranceElement, this.items[i].item) : this.items[i].item;
-
- if(!fast) {
- this.items[i].width = t[0].offsetWidth;
- this.items[i].height = t[0].offsetHeight;
+
+ var t = this.options.toleranceElement ?
$(this.options.toleranceElement, item.item) : item.item;
+
+ if (!fast) {
+ item.width = t[0].offsetWidth;
+ item.height = t[0].offsetHeight;
}
-
+
var p = t.offset();
- this.items[i].left = p.left;
- this.items[i].top = p.top;
-
+ item.left = p.left;
+ item.top = p.top;
};
-
+
if(this.options.custom && this.options.custom.refreshContainers) {
this.options.custom.refreshContainers.call(this);
} else {
@@ -275,40 +283,40 @@
this.containers[i].containerCache.height =
this.containers[i].element.outerHeight();
};
}
-
+
},
-
+
destroy: function() {
this.element
.removeClass("ui-sortable ui-sortable-disabled")
.removeData("sortable")
.unbind(".sortable");
this._mouseDestroy();
-
+
for ( var i = this.items.length - 1; i >= 0; i-- )
this.items[i].item.removeData("sortable-item");
},
-
+
_createPlaceholder: function(that) {
-
+
var self = that || this, o = self.options;
-
+
if(!o.placeholder || o.placeholder.constructor == String) {
var className = o.placeholder;
o.placeholder = {
element: function() {
-
+
var el = $(document.createElement(self.currentItem[0].nodeName))
.addClass(className || self.currentItem[0].className+"
ui-sortable-placeholder")
.removeClass('ui-sortable-helper')[0];
-
+
if(!className) {
el.style.visibility = "hidden";
document.body.appendChild(el);
el.innerHTML = self.currentItem[0].innerHTML;
document.body.removeChild(el);
};
-
+
return el;
},
update: function(container, p) {
@@ -318,26 +326,26 @@
}
};
}
-
+
//Create the placeholder
self.placeholder = $(o.placeholder.element.call(self.element,
self.currentItem));
-
+
//Append it after the actual current item
self.currentItem.after(self.placeholder);
-
+
//Update the size of the placeholder (TODO: Logic to fuzzy, see line
316/317)
o.placeholder.update(self, self.placeholder);
-
+
},
-
+
_contactContainers: function(e) {
for (var i = this.containers.length - 1; i >= 0; i--){
-
+
if(this._intersectsWith(this.containers[i].containerCache)) {
if(!this.containers[i].containerCache.over) {
-
+
if(this.currentContainer != this.containers[i]) {
-
+
//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 base =
this.positionAbs[this.containers[i].floating ? 'left' : 'top'];
for (var j = this.items.length - 1; j >= 0; j--) {
@@ -347,20 +355,20 @@
dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j];
}
}
-
+
if(!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if
dropOnEmpty is enabled
continue;
-
+
this.currentContainer = this.containers[i];
itemWithLeastDistance ? this.options.sortIndicator.call(this, e,
itemWithLeastDistance, null, true) : this.options.sortIndicator.call(this,
e, null, this.containers[i].element, true);
this._propagate("change", e); //Call plugins and callbacks
this.containers[i]._propagate("change", e, this); //Call plugins and
callbacks
-
+
//Update the placeholder
this.options.placeholder.update(this.currentContainer,
this.placeholder);
-
+
}
- &nbs