library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Droppable: Refactored touch tolerance.

Browse Source
This commit is contained in:
Scott González 2012-01-15 12:49:44 -05:00
parent d4bc923f56
commit 3a90f455e6
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/jquery.ui.droppable.js vendored
View File

@ -120,7 +120,7 @@ $.widget( "ui.droppable", {
});
$.ui.droppable.tolerance = {
// Half of the draggable is over the droppable, horizontally and vertically
// Half of the draggable overlaps the droppable, horizontally and vertically
intersect: function( event, edges, ui ) {
var xHalf = ui.offset.left + this.draggableProportions.width / 2,
yHalf = ui.offset.top + this.draggableProportions.height / 2;
@ -129,17 +129,15 @@ $.ui.droppable.tolerance = {
this.offset.top < yHalf && edges.bottom > yHalf;
},
// Determines if draggable is over droppable based on touch tolerance
// Draggable overlaps droppable by at least one pixel
touch: function( event, edges, ui ) {
var xOverlap = edges.draggableRight >= this.offset.left &&
ui.offset.left <= edges.right,
yOverlap = edges.draggableBottom >= this.offset.top &&
ui.offset.top <= edges.bottom;
return xOverlap && yOverlap;
return this.offset.left < edges.draggableRight &&
edges.right > ui.offset.left &&
this.offset.top < edges.draggableBottom &&
edges.bottom > ui.offset.top;
},
// Determines if draggable is over droppable based on pointer tolerance
// Pointer overlaps droppable
pointer: function( event, edges, ui ) {
var xOverlap = event.pageX >= this.offset.left &&
event.pageX <= edges.right,