diff options
| author | Eduardo Lundgren <eduardolundgren@gmail.com> | 2008-11-10 06:39:52 +0000 |
|---|---|---|
| committer | Eduardo Lundgren <eduardolundgren@gmail.com> | 2008-11-10 06:39:52 +0000 |
| commit | 2ab2f3c7e10ffd109f8b2409ace6adcbd5cbcb61 (patch) | |
| tree | 7c597c1f3e083dbb2f3b6d4194a892532d3e1009 /ui/ui.droppable.js | |
| parent | ad0cdb776e61c4855e87a0f7a1e49ca6cde3a8d6 (diff) | |
| download | jquery-ui-2ab2f3c7e10ffd109f8b2409ace6adcbd5cbcb61.tar.gz jquery-ui-2ab2f3c7e10ffd109f8b2409ace6adcbd5cbcb61.zip | |
Change name of intersect methods to isOverHeight/isOverWidth/isOver.
Diffstat (limited to 'ui/ui.droppable.js')
| -rw-r--r-- | ui/ui.droppable.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/ui.droppable.js b/ui/ui.droppable.js index 2de012351..92a779611 100644 --- a/ui/ui.droppable.js +++ b/ui/ui.droppable.js @@ -163,8 +163,10 @@ $.ui.intersect = function(draggable, droppable, toleranceMode) { && y2 - (draggable.helperProportions.height / 2) < b ); // Top Half break; case 'pointer': - return (l < ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left) && ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left) < r - && t < ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top) && ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top) < b); + var draggableLeft = ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left), + draggableTop = ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top), + isOver = $.ui.isOver(draggableTop, draggableLeft, t, l, droppable.proportions.height, droppable.proportions.width); + return isOver; break; case 'touch': return ( |