sortable: fixed issue with dropOnEmpty not working, tolerance "guess" wasn't checked in the intersectsWith container method.

This commit is contained in:
Paul Bakaus 2008-06-05 06:35:16 +00:00
parent a91370e4f5
commit 7a64afb4e3

View File

@ -94,7 +94,7 @@ $.widget("ui.sortable", $.extend($.ui.mouse, {
var l = item.left, r = l + item.width,
t = item.top, b = t + item.height;
if(this.options.tolerance == "pointer") {
if(this.options.tolerance == "pointer" || (this.options.tolerance == "guess" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])) {
return (y1 + this.offset.click.top > t && y1 + this.offset.click.top < b && x1 + this.offset.click.left > l && x1 + this.offset.click.left < r);
} else {
@ -112,7 +112,7 @@ $.widget("ui.sortable", $.extend($.ui.mouse, {
var l = item.left, r = l + item.width,
t = item.top, b = t + item.height;
if(this.options.tolerance == "pointer" || (this.options.tolerance == "guess" && this.currentItem[0]['offset'+(this.floating ? 'Width' : 'Height')] > item.item[0]['offset'+(this.floating ? 'Width' : 'Height')])) {
if(this.options.tolerance == "pointer" || (this.options.tolerance == "guess" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])) {
if(!(y1 + this.offset.click.top > t && y1 + this.offset.click.top < b && x1 + this.offset.click.left > l && x1 + this.offset.click.left < r)) return false;