aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Sherov <mike.sherov@gmail.com>2014-11-05 18:17:52 -0500
committerMike Sherov <mike.sherov@gmail.com>2014-11-05 18:17:52 -0500
commit20a636844961a1fb2de7a892ab28890091822e6a (patch)
tree4970e50d95816d404a5fef2e7fffb3b19bc9a770
parent6a242ab4ebdcec265826b959fa27881dcf462c96 (diff)
downloadjquery-ui-20a636844961a1fb2de7a892ab28890091822e6a.tar.gz
jquery-ui-20a636844961a1fb2de7a892ab28890091822e6a.zip
Droppable: Remove $.ui.intersect()
Fixes #10534
-rw-r--r--ui/droppable.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/droppable.js b/ui/droppable.js
index e889d89cd..c62af0941 100644
--- a/ui/droppable.js
+++ b/ui/droppable.js
@@ -191,7 +191,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, event )
+ intersect( draggable, $.extend( inst, { offset: inst.element.offset() } ), inst.options.tolerance, event )
) { childrenIntersection = true; return false; }
});
if ( childrenIntersection ) {
@@ -224,7 +224,7 @@ $.widget( "ui.droppable", {
});
-$.ui.intersect = (function() {
+var intersect = (function() {
function isOverAxis( x, reference, size ) {
return ( x >= reference ) && ( x < ( reference + size ) );
}
@@ -323,7 +323,7 @@ $.ui.ddmanager = {
if ( !this.options ) {
return;
}
- if ( !this.options.disabled && this.visible && $.ui.intersect( draggable, this, this.options.tolerance, event ) ) {
+ if ( !this.options.disabled && this.visible && intersect( draggable, this, this.options.tolerance, event ) ) {
dropped = this._drop.call( this, event ) || dropped;
}
@@ -360,7 +360,7 @@ $.ui.ddmanager = {
}
var parentInstance, scope, parent,
- intersects = $.ui.intersect( draggable, this, this.options.tolerance, event ),
+ intersects = intersect( draggable, this, this.options.tolerance, event ),
c = !intersects && this.isover ? "isout" : ( intersects && !this.isover ? "isover" : null );
if ( !c ) {
return;