diff options
| author | Paul Bakaus <paul.bakaus@googlemail.com> | 2008-06-05 06:35:16 +0000 |
|---|---|---|
| committer | Paul Bakaus <paul.bakaus@googlemail.com> | 2008-06-05 06:35:16 +0000 |
| commit | 7a64afb4e36594ec549ad71b640d41a1b137e1fe (patch) | |
| tree | 17e4d6f37c204bff67a266b1217763120a872d84 /ui | |
| parent | a91370e4f5621b85e0b39c04ebf76274c9703064 (diff) | |
| download | jquery-ui-7a64afb4e36594ec549ad71b640d41a1b137e1fe.tar.gz jquery-ui-7a64afb4e36594ec549ad71b640d41a1b137e1fe.zip | |
sortable: fixed issue with dropOnEmpty not working, tolerance "guess" wasn't checked in the intersectsWith container method.
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/source/ui.sortable.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/source/ui.sortable.js b/ui/source/ui.sortable.js index 847a054bf..b170f2c3c 100644 --- a/ui/source/ui.sortable.js +++ b/ui/source/ui.sortable.js @@ -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; |