Merge pull request jquery#501 from maljub01/master

scottgonzalez · scottgonzalez · commit 69f6f585ae74 · 2011-11-17T07:31:03.000-08:00
Fixed ticket #7800 - Draggable helper="clone" doesn't remove the dragged clone if original element is removed upon drop
diff --git a/ui/jquery.ui.core.js b/ui/jquery.ui.core.js
@@ -255,7 +255,7 @@ $.extend( $.ui, {
 		},
 		call: function( instance, name, args ) {
 			var set = instance.plugins[ name ];
-			if ( !set || !instance.element[ 0 ].parentNode ) {
+			if ( !set || !instance.element[ 0 ].parentNode || instance.element[ 0 ].parentNode.nodeType === 11 ) {
 				return;
 			}
 	
diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
@@ -208,7 +208,7 @@ $.widget("ui.draggable", $.ui.mouse, {
 		}
 		
 		//if the original element is removed, don't bother to continue
-		if(!this.element[0] || !this.element[0].parentNode)
+		if((!this.element[0] || !this.element[0].parentNode) && this.options.helper === "original")
 			return false;
 
 		if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ $.extend( $.ui, {`
`255`	`255`	`},`
`256`	`256`	`call: function( instance, name, args ) {`
`257`	`257`	`var set = instance.plugins[ name ];`
`258`		`- if ( !set \|\| !instance.element[ 0 ].parentNode ) {`
	`258`	`+ if ( !set \|\| !instance.element[ 0 ].parentNode \|\| instance.element[ 0 ].parentNode.nodeType === 11 ) {`
`259`	`259`	`return;`
`260`	`260`	`}`
`261`	`261`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ $.widget("ui.draggable", $.ui.mouse, {`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`//if the original element is removed, don't bother to continue`
`211`		`- if(!this.element[0] \|\| !this.element[0].parentNode)`
	`211`	`+ if((!this.element[0] \|\| !this.element[0].parentNode) && this.options.helper === "original")`
`212`	`212`	`return false;`
`213`	`213`
`214`	`214`	`if((this.options.revert == "invalid" && !dropped) \|\| (this.options.revert == "valid" && dropped) \|\| this.options.revert === true \|\| ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {`