#864: + check Sortable.active in nulling method

9 years ago · d497e64ca9
1 changed files with 19 additions and 17 deletions
--- a/Sortable.js
+++ b/Sortable.js
@ -815,32 +815,34 @@
 				}

 			}
+
 			this._nulling();
 		},

 		_nulling: function() {
-			// Nulling
-			rootEl =
-			dragEl =
-			parentEl =
-			ghostEl =
-			nextEl =
-			cloneEl =
+			if (Sortable.active === this) {
+				rootEl =
+				dragEl =
+				parentEl =
+				ghostEl =
+				nextEl =
+				cloneEl =

-			scrollEl =
-			scrollParentEl =
+				scrollEl =
+				scrollParentEl =

-			tapEvt =
-			touchEvt =
+				tapEvt =
+				touchEvt =

-			moved =
-			newIndex =
+				moved =
+				newIndex =

-			lastEl =
-			lastCSS =
+				lastEl =
+				lastCSS =

-			activeGroup =
-			Sortable.active = null;
+				activeGroup =
+				Sortable.active = null;
+			}
 		},

 		handleEvent: function (/**Event*/evt) {