From fd30534b73eaf9c076f93a349dbe0c7a77efc209 Mon Sep 17 00:00:00 2001 From: Evelyn Masso Date: Sat, 1 Oct 2016 15:47:36 -0700 Subject: [PATCH] Droppable: Use `$.ui.intersect()` Fixes #14963 --- ui/widgets/droppable.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/widgets/droppable.js b/ui/widgets/droppable.js index 67bcb693d..89bff2511 100644 --- a/ui/widgets/droppable.js +++ b/ui/widgets/droppable.js @@ -199,7 +199,7 @@ $.widget( "ui.droppable", { inst.accept.call( inst.element[ 0 ], ( draggable.currentItem || draggable.element ) ) && - intersect( + $.ui.intersect( draggable, $.extend( inst, { offset: inst.element.offset() } ), inst.options.tolerance, event @@ -253,7 +253,7 @@ $.widget( "ui.droppable", { } } ); -var intersect = $.ui.intersect = ( function() { +$.ui.intersect = ( function() { function isOverAxis( x, reference, size ) { return ( x >= reference ) && ( x < ( reference + size ) ); } @@ -361,7 +361,7 @@ $.ui.ddmanager = { return; } if ( !this.options.disabled && this.visible && - intersect( draggable, this, this.options.tolerance, event ) ) { + $.ui.intersect( draggable, this, this.options.tolerance, event ) ) { dropped = this._drop.call( this, event ) || dropped; } @@ -402,7 +402,7 @@ $.ui.ddmanager = { } var parentInstance, scope, parent, - intersects = intersect( draggable, this, this.options.tolerance, event ), + intersects = $.ui.intersect( draggable, this, this.options.tolerance, event ), c = !intersects && this.isover ? "isout" : ( intersects && !this.isover ? "isover" : null ); -- 2.39.5