Skip to content

Droppable: fix #4977 - Droppable: tolerance, pointer - bug when pointer ... #991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Droppable: fix #4977 - Droppable: tolerance, pointer - bug when pointer ... #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions tests/unit/droppable/droppable_events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,50 @@ test("drop", function() {
});
*/


test("#4977: tolerance, pointer - when pointer outside draggable", function() {
expect(1);

var draggable1 = $("#draggable1");
var droppable1 = $("#droppable1");
var isDropped = false;

droppable1.droppable({
tolerance: 'pointer',
drop: function() { isDropped = true; }
});

// Contain draggable so only its bottom half can be dragged
// over the droppable.
draggable1.draggable({ containment: [
draggable1.offset().left,
draggable1.offset().top,
droppable1.offset().left + droppable1.width(),
droppable1.offset().top - Math.round(draggable1.height() / 2)
]});

// Pointer starts out over "top of draggable"
draggable1.simulate("mousedown", {
clientX: draggable1.offset().left + draggable1.width() / 2,
clientY: draggable1.offset().top + 1 // draggable1.height() - 1
});

// Pointer ends up below bottom of draggable:
//
// * Top of draggable is *not* inside droppable.
// * Bottom of draggable *is* inside droppable.
// * Pointer *is* inside droppable, and outside droppable.
var pos = {
clientX: droppable1.offset().left + droppable1.width() / 2,
clientY: droppable1.offset().top + draggable1.height()
};
draggable1.simulate("mousemove", pos);
draggable1.simulate("mouseup", pos);

draggable1.draggable("destroy");
droppable1.droppable("destroy");

ok(isDropped, "tolerance, pointer - when pointer outside draggable");
});

})( jQuery );
12 changes: 6 additions & 6 deletions ui/jquery.ui.droppable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ $.widget("ui.droppable", {
!inst.options.disabled &&
inst.options.scope === draggable.options.scope &&
inst.accept.call(inst.element[0], (draggable.currentItem || draggable.element)) &&
$.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance)
$.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance, event)
) { childrenIntersection = true; return false; }
});
if(childrenIntersection) {
Expand Down Expand Up @@ -191,7 +191,7 @@ $.widget("ui.droppable", {

});

$.ui.intersect = function(draggable, droppable, toleranceMode) {
$.ui.intersect = function(draggable, droppable, toleranceMode, event) {

if (!droppable.offset) {
return false;
Expand All @@ -212,8 +212,8 @@ $.ui.intersect = function(draggable, droppable, toleranceMode) {
t < y1 + (draggable.helperProportions.height / 2) && // Bottom Half
y2 - (draggable.helperProportions.height / 2) < b ); // Top Half
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);
draggableLeft = event.pageX;
draggableTop = event.pageY;
return isOverAxis( draggableTop, t, droppable.proportions.height ) && isOverAxis( draggableLeft, l, droppable.proportions.width );
case "touch":
return (
Expand Down Expand Up @@ -284,7 +284,7 @@ $.ui.ddmanager = {
if(!this.options) {
return;
}
if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance)) {
if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance, event)) {
dropped = this._drop.call(this, event) || dropped;
}

Expand Down Expand Up @@ -321,7 +321,7 @@ $.ui.ddmanager = {
}

var parentInstance, scope, parent,
intersects = $.ui.intersect(draggable, this, this.options.tolerance),
intersects = $.ui.intersect(draggable, this, this.options.tolerance, event),
c = !intersects && this.isover ? "isout" : (intersects && !this.isover ? "isover" : null);
if(!c) {
return;
Expand Down