droppable: drag event; fixes

Peter Evans · Peter Evans · commit ab7efd38f81c · 2015-01-14T16:24:22.000-06:00
diff --git a/ui/droppable.js b/ui/droppable.js
@@ -48,7 +48,8 @@ $.widget( "ui.droppable", {
 		deactivate: null,
 		drop: null,
 		out: null,
-		over: null
+		over: null,
+		drag: null
 	},
 	_create: function() {
 
@@ -161,6 +162,21 @@ $.widget( "ui.droppable", {
 
 	},
 
+	_drag: function( event ) {
+
+		var draggable = $.ui.ddmanager.current;
+
+		// Bail if draggable and droppable are same element
+		if ( !draggable || ( draggable.currentItem || draggable.element )[ 0 ] === this.element[ 0 ] ) {
+			return;
+		}
+
+		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem || draggable.element ) ) ) {
+			this._trigger( "drag", event, this.ui( draggable ) );
+		}
+
+	},
+
 	_out: function( event ) {
 
 		var draggable = $.ui.ddmanager.current;
@@ -328,6 +344,7 @@ $.ui.ddmanager = {
 			if ( !this.options ) {
 				return;
 			}
+
 			if ( !this.options.disabled && this.visible && intersect( draggable, this, this.options.tolerance, event ) ) {
 				dropped = this._drop.call( this, event ) || dropped;
 			}
@@ -360,14 +377,18 @@ $.ui.ddmanager = {
 		// Run through all droppables and check their positions based on specific tolerance options
 		$.each( $.ui.ddmanager.droppables[ draggable.options.scope ] || [], function() {
 
-			if ( this.options.disabled || this.greedyChild || !this.visible ) {
+			if ( !this.options || this.options.disabled || this.greedyChild || !this.visible ) {
 				return;
 			}
 
 			var parentInstance, scope, parent,
 				intersects = intersect( draggable, this, this.options.tolerance, event ),
 				c = !intersects && this.isover ? "isout" : ( intersects && !this.isover ? "isover" : null );
 			if ( !c ) {
+				if (intersects && this.isover) {
+					this._drag.call(this, event);
+				}
+
 				return;
 			}
 
