From 39f31da37e3ed5ac58f3eb701f59bdc956cd2b79 Mon Sep 17 00:00:00 2001 From: Jeremy Mickelson Date: Sun, 24 Nov 2013 16:38:03 -0700 Subject: [PATCH 1/2] Only remove placeholder elements if they don't have classes marking them as angular generated. Fixes #62 --- src/sortable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sortable.js b/src/sortable.js index a4daf13..5ee2581 100644 --- a/src/sortable.js +++ b/src/sortable.js @@ -79,7 +79,7 @@ angular.module('ui.sortable', []) if (placeholder && placeholder.element) { savedNodes = savedNodes.not(element.find( "." + placeholder.element() - .attr('class').split(/\s+/).join('.'))); + .attr('class').split(/\s+/).join('.') + ':not(.ng-scope)')); } }; From d2c5a08c92e63fc92ddb9e6178aecf7bd8a93b99 Mon Sep 17 00:00:00 2001 From: Jeremy Mickelson Date: Sun, 24 Nov 2013 16:45:37 -0700 Subject: [PATCH 2/2] Wrapped a really long line --- src/sortable.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/sortable.js b/src/sortable.js index 5ee2581..e0ebc39 100644 --- a/src/sortable.js +++ b/src/sortable.js @@ -120,7 +120,10 @@ angular.module('ui.sortable', []) // If the received flag hasn't be set on the item, this is a // normal sort, if dropindex is set, the item was moved, so move // the items in the list. - if(!ui.item.sortable.received && ('dropindex' in ui.item.sortable) && !ui.item.sortable.isCanceled()) { + if(!ui.item.sortable.received && + ('dropindex' in ui.item.sortable) && + !ui.item.sortable.isCanceled()) { + scope.$apply(function () { ngModel.$modelValue.splice( ui.item.sortable.dropindex, 0,