diff options
| author | Mike Sherov <mike.sherov@gmail.com> | 2014-08-13 19:36:07 -0400 |
|---|---|---|
| committer | Mike Sherov <mike.sherov@gmail.com> | 2014-08-13 19:36:07 -0400 |
| commit | 4dad6bb99dae280108338c040d016f795d0da328 (patch) | |
| tree | 201fac7883facbe2e8f12266e08c916b13cad123 /ui/droppable.js | |
| parent | 98b7a7dd12d8c798eaecfcb743138586d62b868f (diff) | |
| download | jquery-ui-4dad6bb99dae280108338c040d016f795d0da328.tar.gz jquery-ui-4dad6bb99dae280108338c040d016f795d0da328.zip | |
Droppable: Account for draggable margins when detecting hover
Fixes #6876
Diffstat (limited to 'ui/droppable.js')
| -rw-r--r-- | ui/droppable.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/droppable.js b/ui/droppable.js index fce8d9bd9..e889d89cd 100644 --- a/ui/droppable.js +++ b/ui/droppable.js @@ -235,8 +235,8 @@ $.ui.intersect = (function() { return false; } - var x1 = ( draggable.positionAbs || draggable.position.absolute ).left, - y1 = ( draggable.positionAbs || draggable.position.absolute ).top, + var x1 = ( draggable.positionAbs || draggable.position.absolute ).left + draggable.margins.left, + y1 = ( draggable.positionAbs || draggable.position.absolute ).top + draggable.margins.top, x2 = x1 + draggable.helperProportions.width, y2 = y1 + draggable.helperProportions.height, l = droppable.offset.left, |