Skip to content
This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Update sortable.js #334

Closed
wants to merge 2 commits into from
Closed

Update sortable.js #334

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c375d05
Update sortable.js
Feb 12, 2015
0eeb40c
Update sortable.js
Feb 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions src/sortable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,9 @@ angular.module('ui.sortable', [])
// stop event where we will know if it was a sort or item was
// moved here from another list
if(ui.item.sortable.received && !ui.item.sortable.isCanceled()) {
scope.$apply(function () {
ngModel.$modelValue.splice(ui.item.sortable.dropindex, 0,
ngModel.$modelValue.splice(ui.item.sortable.dropindex, 0,
ui.item.sortable.moved);
});
scope.$parent.$digest();
}
};

Expand All @@ -238,12 +237,10 @@ angular.module('ui.sortable', [])
if(!ui.item.sortable.received &&
('dropindex' in ui.item.sortable) &&
!ui.item.sortable.isCanceled()) {

scope.$apply(function () {
ngModel.$modelValue.splice(
ngModel.$modelValue.splice(
ui.item.sortable.dropindex, 0,
ngModel.$modelValue.splice(ui.item.sortable.index, 1)[0]);
});
scope.$parent.$digest();
} else {
// if the item was not moved, then restore the elements
// so that the ngRepeat's comment are correct.
Expand Down Expand Up @@ -276,10 +273,9 @@ angular.module('ui.sortable', [])
// Remove the item from this list's model and copy data into item,
// so the next list can retrive it
if (!ui.item.sortable.isCanceled()) {
scope.$apply(function () {
ui.item.sortable.moved = ngModel.$modelValue.splice(
ui.item.sortable.index, 1)[0];
});
ui.item.sortable.moved = ngModel.$modelValue.splice(
ui.item.sortable.index, 1)[0];
scope.$parent.$digest();
}
};

Expand Down Expand Up @@ -315,7 +311,7 @@ angular.module('ui.sortable', [])
if( key === 'stop' ){
// call apply after stop
value = combineCallbacks(
value, function() { scope.$apply(); });
value, function() { scope.$parent.$digest(); });

value = combineCallbacks(value, afterStop);
}
Expand Down