r897 - trunk/ui
r897 - trunk/ui
Author: eduardolundgren
Date: Sun Nov 9 22:39:52 2008
New Revision: 897
Modified:
trunk/ui/ui.core.js
trunk/ui/ui.draggable.js
trunk/ui/ui.droppable.js
trunk/ui/ui.sortable.js
Log:
Change name of intersect methods to isOverHeight/isOverWidth/isOver.
Modified: trunk/ui/ui.core.js
==============================================================================
--- trunk/ui/ui.core.js (original)
+++ trunk/ui/ui.core.js Sun Nov 9 22:39:52 2008
@@ -106,19 +106,19 @@
return has;
},
- intersectHeight: function(aTop, bTop, bHeight) {
- //Determines when "aTop" element coordinate intersects with b element
height
- return (aTop > bTop) && (aTop < (bTop + bHeight));
+ isOverHeight: function(y, bTop, bHeight) {
+ //Determines when "y" coordinate intersects with b element height
+ return (y > bTop) && (y < (bTop + bHeight));
},
- intersectWidth: function(aLeft, bLeft, bWidth) {
- //Determines when "aLeft" element coordinate intersects with b element
width
- return (aLeft > bLeft) && (aLeft < (bLeft + bWidth));
+ isOverWidth: function(x, bLeft, bWidth) {
+ //Determines when "x" coordinate intersects with b element width
+ return (x > bLeft) && (x < (bLeft + bWidth));
},
- intersects: function(aTop, aLeft, bTop, bLeft, bHeight, bWidth) {
+ isOver: function(y, x, bTop, bLeft, bHeight, bWidth) {
//Determines when element "a" coordinates intersects with element "b"
- return $.ui.intersectHeight(aTop, bTop, bHeight) &&
$.ui.intersectWidth(aLeft, bLeft, bWidth);
+ return $.ui.isOverHeight(y, bTop, bHeight) && $.ui.isOverWidth(x, bLeft,
bWidth);
}
};
Modified: trunk/ui/ui.draggable.js
==============================================================================
--- trunk/ui/ui.draggable.js (original)
+++ trunk/ui/ui.draggable.js Sun Nov 9 22:39:52 2008
@@ -606,7 +606,7 @@
var itemHeight = o.height, itemWidth = o.width;
var itemTop = o.top, itemLeft = o.left;
- return $.ui.intersects(helperTop + dyClick, helperLeft + dxClick,
itemTop, itemLeft, itemHeight, itemWidth);
+ return $.ui.isOver(helperTop + dyClick, helperLeft + dxClick, itemTop,
itemLeft, itemHeight, itemWidth);
};
$.each(inst.sortables, function(i) {
Modified: trunk/ui/ui.droppable.js
==============================================================================
--- trunk/ui/ui.droppable.js (original)
+++ trunk/ui/ui.droppable.js Sun Nov 9 22:39:52 2008
@@ -163,8 +163,10 @@
&& 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 (
Modified: trunk/ui/ui.sortable.js
==============================================================================
--- trunk/ui/ui.sortable.js (original)
+++ trunk/ui/ui.sortable.js Sun Nov 9 22:39:52 2008
@@ -160,8 +160,8 @@
var itemHeight = item.height, itemWidth = item.width;
var itemTop = item.top, itemLeft = item.left;
- var isOverElementHeight = $.ui.intersectHeight(helperTop + dyClick,
itemTop, itemHeight);
- var isOverElementWidth = $.ui.intersectWidth(helperLeft + dxClick,
itemLeft, itemWidth);
+ var isOverElementHeight = $.ui.isOverHeight(helperTop + dyClick,
itemTop, itemHeight);
+ var isOverElementWidth = $.ui.isOverWidth(helperLeft + dxClick,
itemLeft, itemWidth);
var isOverElement = isOverElementHeight && isOverElementWidth;
var verticalDirection = this._getDragVerticalDirection();
var horizontalDirection = this._getDragHorizontalDirection();