From 2ab2f3c7e10ffd109f8b2409ace6adcbd5cbcb61 Mon Sep 17 00:00:00 2001 From: Eduardo Lundgren Date: Mon, 10 Nov 2008 06:39:52 +0000 Subject: Change name of intersect methods to isOverHeight/isOverWidth/isOver. --- ui/ui.droppable.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ui/ui.droppable.js') 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 ( -- cgit v1.2.3