]> source.dussan.org Git - jquery-ui.git/commitdiff
Droppable: Remove $.ui.intersect()
authorMike Sherov <mike.sherov@gmail.com>
Wed, 5 Nov 2014 23:17:52 +0000 (18:17 -0500)
committerMike Sherov <mike.sherov@gmail.com>
Wed, 5 Nov 2014 23:17:52 +0000 (18:17 -0500)
Fixes #10534

ui/droppable.js

index e889d89cda36a76fe0be1212c6ffbc298267cb99..c62af0941e24ae66c0dc3a29681a947696014948 100644 (file)
@@ -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;