diff options
| author | Felix Nagel <info@felixnagel.com> | 2012-12-12 16:44:19 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2012-12-12 16:44:19 +0100 |
| commit | f6372bd7eac41ae2c022ef510ec414d016e820ed (patch) | |
| tree | b764593154e334e03701dbc896dbac0154c5d136 /ui/jquery.ui.droppable.js | |
| parent | d1350f9f1113ef5590ec010f16da7068646aec01 (diff) | |
| parent | 747d8534520fc3abad81b3c171fa931149398d99 (diff) | |
| download | jquery-ui-f6372bd7eac41ae2c022ef510ec414d016e820ed.tar.gz jquery-ui-f6372bd7eac41ae2c022ef510ec414d016e820ed.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.droppable.js')
| -rw-r--r-- | ui/jquery.ui.droppable.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js index 9d904992d..e2da0b9f6 100644 --- a/ui/jquery.ui.droppable.js +++ b/ui/jquery.ui.droppable.js @@ -16,6 +16,10 @@ */ (function( $, undefined ) { +function isOverAxis( x, reference, size ) { + return ( x > reference ) && ( x < ( reference + size ) ); +} + $.widget("ui.droppable", { version: "@VERSION", widgetEventPrefix: "drop", @@ -203,7 +207,7 @@ $.ui.intersect = function(draggable, droppable, toleranceMode) { case 'pointer': 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); - return $.ui.isOver(draggableTop, draggableLeft, t, l, droppable.proportions.height, droppable.proportions.width); + return isOverAxis( draggableTop, t, droppable.proportions.height ) && isOverAxis( draggableLeft, l, droppable.proportions.width ); case 'touch': return ( (y1 >= t && y1 <= b) || // Top edge touching |