Skip to content
Permalink
Browse files
Droppable: Remove $.ui.intersect()
Fixes #10534
  • Loading branch information
mikesherov committed Nov 5, 2014
1 parent 6a242ab commit 20a636844961a1fb2de7a892ab28890091822e6a
Showing with 4 additions and 4 deletions.
  1. +4 −4 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;

0 comments on commit 20a6368

Please sign in to comment.