From 89d272f3597dbed832bb75c1d6f214b3ce410551 Mon Sep 17 00:00:00 2001 From: Filip Kis Date: Sat, 16 Mar 2019 01:21:36 +0100 Subject: [PATCH] Fixes #44 --- angular-legacy-sortable.js | 3 --- e2e/nested-drag-drop.e2e.js | 8 ++++++++ example/nestedApp.js | 13 +++++++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/angular-legacy-sortable.js b/angular-legacy-sortable.js index 7b40199..26bb846 100644 --- a/angular-legacy-sortable.js +++ b/angular-legacy-sortable.js @@ -137,8 +137,6 @@ evt.from.insertBefore(nextSibling, evt.item.nextSibling); } } - - scope.$apply(); } function _destroy() { @@ -177,7 +175,6 @@ onAdd: function (/**Event*/evt) { _sync(evt); _emitEvent(evt, removed); - scope.$apply(); }, onUpdate: function (/**Event*/evt) { _sync(evt); diff --git a/e2e/nested-drag-drop.e2e.js b/e2e/nested-drag-drop.e2e.js index f599ed5..ef3298d 100644 --- a/e2e/nested-drag-drop.e2e.js +++ b/e2e/nested-drag-drop.e2e.js @@ -17,5 +17,13 @@ describe('nested drag and drop', () => { 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') + browser.executeAsyncScript('var done = arguments[0]; window.onerror = done; $("#item2").simulate("drag-n-drop", { dragTarget: $("#subitem1"), interpolation: {stepWidth: 2, stepDelay: 30}}); setTimeout(done, 1000)').then(response =>{ + expect(response).toBeFalsy() + }) + browser.sleep(1000) + }) }) \ No newline at end of file diff --git a/example/nestedApp.js b/example/nestedApp.js index 361a79b..ccf76f1 100644 --- a/example/nestedApp.js +++ b/example/nestedApp.js @@ -1,12 +1,12 @@ angular.module('nestedApp', ['ng-sortable']) .component('nestedDragAndDropExample', { template: `