enmi-conf.org: comparison wp/wp-includes/js/jquery/ui/droppable.js

Mercurial Mercurial > enmi-conf.org / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

wp/wp-includes/js/jquery/ui/droppable.js

changeset 19	3d72ae0968f4
parent 18	be944660c56a
child 21	48c4eec2b7e6

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 /*!
-* jQuery UI Droppable 1.12.1
+* jQuery UI Droppable 1.13.1
 * http://jqueryui.com
 *
 * Copyright jQuery Foundation and other contributors
 * Released under the MIT license.
 * http://jquery.org/license
 //>>description: Enables drop targets for draggable elements.
 //>>docs: http://api.jqueryui.com/droppable/
 //>>demos: http://jqueryui.com/droppable/
 ( function( factory ) {
+	"use strict";
 	if ( typeof define === "function" && define.amd ) {
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
 	} else {
 		// Browser globals
 		factory( jQuery );
 	}
-}( function( $ ) {
+} )( function( $ ) {
+"use strict";
 $.widget( "ui.droppable", {
-	version: "1.12.1",
+	version: "1.13.1",
 	widgetEventPrefix: "drop",
 	options: {
 		accept: "*",
 		addClasses: true,
 		greedy: false,
 			accept = o.accept;
 		this.isover = false;
 		this.isout = true;
-		this.accept = $.isFunction( accept ) ? accept : function( d ) {
+		this.accept = typeof accept === "function" ? accept : function( d ) {
 			return d.is( accept );
 		};
 		this.proportions = function( /* valueToWrite */ ) {
 			if ( arguments.length ) {
 			}
 		};
 		this._addToManager( o.scope );
-		o.addClasses && this._addClass( "ui-droppable" );
+		if ( o.addClasses ) {
+			this._addClass( "ui-droppable" );
+		}
 	},
 	_addToManager: function( scope ) {
 	},
 	_setOption: function( key, value ) {
 		if ( key === "accept" ) {
-			this.accept = $.isFunction( value ) ? value : function( d ) {
+			this.accept = typeof value === "function" ? value : function( d ) {
 				return d.is( value );
 			};
 		} else if ( key === "scope" ) {
 			var drop = $.ui.ddmanager.droppables[ this.options.scope ];
 		var draggable = $.ui.ddmanager.current;
 		// Bail if draggable and droppable are same element
 		if ( !draggable || ( draggable.currentItem ||
-				draggable.element )[ 0 ] === this.element[ 0 ] ) {
+			draggable.element )[ 0 ] === this.element[ 0 ] ) {
 			return;
 		}
 		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem ||
-				draggable.element ) ) ) {
+			draggable.element ) ) ) {
 			this._addHoverClass();
 			this._trigger( "over", event, this.ui( draggable ) );
 		}
 	},
 		var draggable = $.ui.ddmanager.current;
 		// Bail if draggable and droppable are same element
 		if ( !draggable || ( draggable.currentItem ||
-				draggable.element )[ 0 ] === this.element[ 0 ] ) {
+			draggable.element )[ 0 ] === this.element[ 0 ] ) {
 			return;
 		}
 		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem ||
-				draggable.element ) ) ) {
+			draggable.element ) ) ) {
 			this._removeHoverClass();
 			this._trigger( "out", event, this.ui( draggable ) );
 		}
 	},
 		var draggable = custom || $.ui.ddmanager.current,
 			childrenIntersection = false;
 		// Bail if draggable and droppable are same element
 		if ( !draggable || ( draggable.currentItem ||
-				draggable.element )[ 0 ] === this.element[ 0 ] ) {
+			draggable.element )[ 0 ] === this.element[ 0 ] ) {
 			return false;
 		}
 		this.element
 			.find( ":data(ui-droppable)" )
 					!inst.options.disabled &&
 					inst.options.scope === draggable.options.scope &&
 					inst.accept.call(
 						inst.element[ 0 ], ( draggable.currentItem || draggable.element )
 					) &&
-					intersect(
+					$.ui.intersect(
 						draggable,
 						$.extend( inst, { offset: inst.element.offset() } ),
 						inst.options.tolerance, event
 					)
 				) {
 					childrenIntersection = true;
-					return false; }
+					return false;
+				}
 			} );
 		if ( childrenIntersection ) {
 			return false;
 		}
 		if ( this.accept.call( this.element[ 0 ],
-				( draggable.currentItem || draggable.element ) ) ) {
+			( draggable.currentItem || draggable.element ) ) ) {
 			this._removeActiveClass();
 			this._removeHoverClass();
 			this._trigger( "drop", event, this.ui( draggable ) );
 			return this.element;
 			offset: c.positionAbs
 		};
 	},
 	// Extension points just to make backcompat sane and avoid duplicating logic
-	// TODO: Remove in 1.13 along with call to it below
+	// TODO: Remove in 1.14 along with call to it below
 	_addHoverClass: function() {
 		this._addClass( "ui-droppable-hover" );
 	},
 	_removeHoverClass: function() {
 	_removeActiveClass: function() {
 		this._removeClass( "ui-droppable-active" );
 	}
 } );
-var intersect = $.ui.intersect = ( function() {
+$.ui.intersect = ( function() {
 	function isOverAxis( x, reference, size ) {
 		return ( x >= reference ) && ( x < ( reference + size ) );
 	}
 	return function( draggable, droppable, toleranceMode, event ) {
 			t = droppable.offset.top,
 			r = l + droppable.proportions().width,
 			b = t + droppable.proportions().height;
 		switch ( toleranceMode ) {
-		case "fit":
+			case "fit":
-			return ( l <= x1 && x2 <= r && t <= y1 && y2 <= b );
+				return ( l <= x1 && x2 <= r && t <= y1 && y2 <= b );
-		case "intersect":
+			case "intersect":
-			return ( l < x1 + ( draggable.helperProportions.width / 2 ) && // Right Half
+				return ( l < x1 + ( draggable.helperProportions.width / 2 ) && // Right Half
-				x2 - ( draggable.helperProportions.width / 2 ) < r && // Left Half
+					x2 - ( draggable.helperProportions.width / 2 ) < r && // Left Half
-				t < y1 + ( draggable.helperProportions.height / 2 ) && // Bottom Half
+					t < y1 + ( draggable.helperProportions.height / 2 ) && // Bottom Half
-				y2 - ( draggable.helperProportions.height / 2 ) < b ); // Top Half
+					y2 - ( draggable.helperProportions.height / 2 ) < b ); // Top Half
-		case "pointer":
+			case "pointer":
-			return isOverAxis( event.pageY, t, droppable.proportions().height ) &&
+				return isOverAxis( event.pageY, t, droppable.proportions().height ) &&
-				isOverAxis( event.pageX, l, droppable.proportions().width );
+					isOverAxis( event.pageX, l, droppable.proportions().width );
-		case "touch":
+			case "touch":
-			return (
+				return (
-				( y1 >= t && y1 <= b ) || // Top edge touching
+					( y1 >= t && y1 <= b ) || // Top edge touching
-				( y2 >= t && y2 <= b ) || // Bottom edge touching
+					( y2 >= t && y2 <= b ) || // Bottom edge touching
-				( y1 < t && y2 > b ) // Surrounded vertically
+					( y1 < t && y2 > b ) // Surrounded vertically
-			) && (
+				) && (
-				( x1 >= l && x1 <= r ) || // Left edge touching
+					( x1 >= l && x1 <= r ) || // Left edge touching
-				( x2 >= l && x2 <= r ) || // Right edge touching
+					( x2 >= l && x2 <= r ) || // Right edge touching
-				( x1 < l && x2 > r ) // Surrounded horizontally
+					( x1 < l && x2 > r ) // Surrounded horizontally
-			);
+				);
-		default:
+			default:
-			return false;
+				return false;
 		}
 	};
 } )();
 /*
 		droppablesLoop: for ( i = 0; i < m.length; i++ ) {
 			// No disabled and non-accepted
 			if ( m[ i ].options.disabled || ( t && !m[ i ].accept.call( m[ i ].element[ 0 ],
-					( t.currentItem || t.element ) ) ) ) {
+				( t.currentItem || t.element ) ) ) ) {
 				continue;
 			}
 			// Filter out elements in the current dragged item
 			for ( j = 0; j < list.length; j++ ) {
 			if ( !this.options ) {
 				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;
 			}
 			if ( !this.options.disabled && this.visible && this.accept.call( this.element[ 0 ],
-					( draggable.currentItem || draggable.element ) ) ) {
+				( draggable.currentItem || draggable.element ) ) ) {
 				this.isout = true;
 				this.isover = false;
 				this._deactivate.call( this, event );
 			}
 			if ( this.options.disabled || this.greedyChild || !this.visible ) {
 				return;
 			}
 			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 );
 			if ( !c ) {
 				return;
 	} );
 }
 return $.ui.droppable;
-} ) );
+} );

enmi-conf.org