r1170 - trunk/ui
r1170 - trunk/ui
Author: eduardolundgren
Date: Wed Dec 17 11:24:06 2008
New Revision: 1170
Modified:
trunk/ui/ui.sortable.js
Log:
Sortable accurateIntersection using outerWidth/outerHeight
Modified: trunk/ui/ui.sortable.js
==============================================================================
--- trunk/ui/ui.sortable.js (original)
+++ trunk/ui/ui.sortable.js Wed Dec 17 11:24:06 2008
@@ -99,17 +99,18 @@
//Cache the margins of the original element
this._cacheMargins();
-
+
//Get the next scrolling parent
this.scrollParent = this.helper.scrollParent();
//The element's absolute position on the page minus margins
this.offset = this.currentItem.offset();
+
this.offset = {
top: this.offset.top - this.margins.top,
left: this.offset.left - this.margins.left
};
-
+
// Only after we got the offset, we can change the helper's position to
absolute
// TODO: Still need to figure out a way to make relative sorting possible
this.helper.css("position", "absolute");
@@ -141,7 +142,7 @@
//Create the placeholder
this._createPlaceholder();
-
+
//Set a containment if given in the options
if(o.containment)
this._setContainment();
@@ -511,8 +512,8 @@
if (!fast) {
if (this.options.accurateIntersection) {
- item.width = t.width();
- item.height = t.height();
+ item.width = t.outerWidth();
+ item.height = t.outerHeight();
}
else {
item.width = t[0].offsetWidth;
@@ -944,7 +945,7 @@
if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML')
i.overflowOffset = i.scrollParent.offset();
},
sort: function(event, ui) {
-
+
var i = $(this).data("sortable"), o = i.options, scrolled = false;
if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML')
{