Merge pull request #1 from filipkis/fix-46

Fixes SortableJS#46
filipkis · Mar 16, 2019 · a670535 · a670535
2 parents f63b6c0 + 520c69f
commit a670535
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/angular-legacy-sortable.js b/angular-legacy-sortable.js
@@ -153,6 +153,7 @@
 							watchers = null;
 							sortable = null;
 							nextSibling = null;
+							removed = null;
 						}
 
 
@@ -169,6 +170,7 @@
 							onEnd: function (/**Event*/evt) {
 								_emitEvent(evt, removed);
 								scope.$apply();
+								removed = null;
 							},
 							onAdd: function (/**Event*/evt) {
 								_sync(evt);

diff --git a/e2e/nested-drag-drop.e2e.js b/e2e/nested-drag-drop.e2e.js
@@ -1,4 +1,22 @@
 describe('nested drag and drop', () => {
+  it('should have correct model after moving between lists', () => {
+    browser.get('http://localhost:8080/nested.html')
+    browser.executeScript('$("#item2").simulate("drag-n-drop", { dragTarget: $("#item3"), interpolation: {stepWidth: 2, stepDelay: 30}});')
+    browser.sleep(1000)
+    element(by.id('main-list')).evaluate('$ctrl.lastDragged.name').then(function(value){
+      expect(value).toBe('item2');
+    })
+    browser.executeScript('$("#item3").simulate("drag-n-drop", { dragTarget: $("#subitem1"), interpolation: {stepWidth: 2, stepDelay: 30}});')    
+    browser.sleep(1000)
+    element(by.id('main-list')).evaluate('$ctrl.lastDragged.name').then(function(value){
+      expect(value).toBe('item3');
+    })
+    browser.executeScript('$("#item1").simulate("drag-n-drop", { dragTarget: $("#item2"), interpolation: {stepWidth: 2, stepDelay: 30}});')    
+    browser.sleep(1000)
+    element(by.id('main-list')).evaluate('$ctrl.lastDragged.name').then(function(value){
+      expect(value).toBe('item1');
+    })
+  })
 
   it('should allow list with nested list to be dropped in a nested list', () => {
     browser.get('http://localhost:8080/nested.html')