Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop items are not necessarily deep copied #294

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Drop items are not necessarily deep copied #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
352ba1e
no deep copy of drop item if settings don't specify so
Oct 11, 2016
993fcc1
git ignore sublime
Oct 11, 2016
3dcc1be
add unit test for drag 'deepCopy' setting
Nov 29, 2016
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
components
todo.TODO
/*.sublime-*
4 changes: 2 additions & 2 deletions src/angular-dragdrop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,15 @@ var jqyoui = angular.module('ngDragDrop', []).service('ngDragDropService', ['$ti
if (dragSettings.index > dropSettings.index) {
temp = dragModelValue[dragSettings.index];
for (var i = dragSettings.index; i > dropSettings.index; i--) {
dropModelValue[i] = angular.copy(dropModelValue[i - 1]);
dropModelValue[i] = dragSettings.deepCopy ? angular.copy(dropModelValue[i - 1]) : dropModelValue[i - 1];
dropModelValue[i - 1] = {};
dropModelValue[i][dragSettings.direction] = 'left';
}
dropModelValue[dropSettings.index] = temp;
} else {
temp = dragModelValue[dragSettings.index];
for (var i = dragSettings.index; i < dropSettings.index; i++) {
dropModelValue[i] = angular.copy(dropModelValue[i + 1]);
dropModelValue[i] = dragSettings.deepCopy ? angular.copy(dropModelValue[i + 1]) : dropModelValue[i + 1];
dropModelValue[i + 1] = {};
dropModelValue[i][dragSettings.direction] = 'right';
}
Expand Down
66 changes: 66 additions & 0 deletions test/spec/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,4 +200,70 @@ describe('Service: ngDragDropService', function() {
timeout.flush();
expect(scope.list.map(function(item) { return item.title; }).join('')).toBe('NNLIIE');
});

it('should not deep copy dragged element by default', function(){
var itemA = { 'title': 'A' };
var itemB = { 'title': 'B' };
var itemC = { 'title': 'C' };
scope.list = [
itemA,
itemB,
itemC
];
var copy = scope.list.slice();
ngDragDropService.draggableScope = ngDragDropService.droppableScope = scope;
ngDragDropService.invokeDrop(
$('<div data-drop="true" data-drag="true" ng-model="list" jqyoui-droppable="{index: 2}" jqyoui-draggable="{index: 2, insertInline: true, direction:\'jqyouiDirection\'}">' + scope.list[2].title + '</div>').data('$scope', scope),
$('<div data-drop="true" data-drag="true" ng-model="list" jqyoui-droppable="{index: 0}" jqyoui-draggable="{index: 0, insertInline: true, direction:\'jqyouiDirection\'}">' + scope.list[0].title + '</div>').data('$scope', scope),
document.createEvent('Event'),
{}
);
timeout.flush();
expect(copy[0]).toBe(scope.list[1]);
});

it('should not deep copy dragged element when settings specify not to', function(){
var itemA = { 'title': 'A' };
var itemB = { 'title': 'B' };
var itemC = { 'title': 'C' };
scope.list = [
itemA,
itemB,
itemC
];
var copy = scope.list.slice();
ngDragDropService.draggableScope = ngDragDropService.droppableScope = scope;
ngDragDropService.invokeDrop(
$('<div data-drop="true" data-drag="true" ng-model="list" jqyoui-droppable="{index: 2}" jqyoui-draggable="{index: 2, insertInline: true, direction:\'jqyouiDirection\', deepCopy:false}">' + scope.list[2].title + '</div>').data('$scope', scope),
$('<div data-drop="true" data-drag="true" ng-model="list" jqyoui-droppable="{index: 0}" jqyoui-draggable="{index: 0, insertInline: true, direction:\'jqyouiDirection\', deepCopy:false}">' + scope.list[0].title + '</div>').data('$scope', scope),
document.createEvent('Event'),
{}
);
timeout.flush();
expect(copy[0]).toBe(scope.list[1]);
});

it('should deep copy dragged element when settings specify so', function(){
var itemA = { 'title': 'A' };
var itemB = { 'title': 'B' };
var itemC = { 'title': 'C' };
scope.list = [
itemA,
itemB,
itemC
];
var copy = scope.list.slice();
ngDragDropService.draggableScope = ngDragDropService.droppableScope = scope;
ngDragDropService.invokeDrop(
$('<div data-drop="true" data-drag="true" ng-model="list" jqyoui-droppable="{index: 2}" jqyoui-draggable="{index: 2, insertInline: true, direction:\'jqyouiDirection\', deepCopy:true}">' + scope.list[2].title + '</div>').data('$scope', scope),
$('<div data-drop="true" data-drag="true" ng-model="list" jqyoui-droppable="{index: 0}" jqyoui-draggable="{index: 0, insertInline: true, direction:\'jqyouiDirection\', deepCopy:true}">' + scope.list[0].title + '</div>').data('$scope', scope),
document.createEvent('Event'),
{}
);
timeout.flush();
expect(copy[0]).not.toBe(scope.list[1]);
for(var prop in copy[0]){
expect(copy[0][prop]).toBe(scope.list[1][prop]);
}
});
});