Merge branch 'master' into dev

9 years ago · d57aee37a5
2 changed files with 23 additions and 20 deletions
--- a/Sortable.js
+++ b/Sortable.js
@ -830,6 +830,11 @@
 					}
 				}

+			}
+			this._nulling();
+		},
+
+		_nulling: function() {
 			// Nulling
 			rootEl =
 			dragEl =
@ -852,10 +857,8 @@

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

-
 		handleEvent: function (/**Event*/evt) {
 			var type = evt.type;

--- a/ng-sortable.js
+++ b/ng-sortable.js
@ -149,7 +149,7 @@
 						return opts;
 					}, {
 						onStart: function (/**Event*/evt) {
-							nextSibling = evt.item.nextSibling;
+							nextSibling = evt.from === evt.item.parentNode ? evt.item.nextSibling : evt.clone.nextSibling;
 							_emitEvent(evt);
 							scope.$apply();
 						},