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

feat(sortable): add extra properties to ui.item.sortable #261

Merged
merged 5 commits into from
Sep 7, 2014
Merged

feat(sortable): add extra properties to ui.item.sortable #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d18029
fix(sortable): clear ui.item.sortable properties after drag stop
thgreasi Aug 31, 2014
14ae8da
test(sortable): add tests for ui.item.sortable proper destruction
thgreasi Aug 31, 2014
d777fef
refactor(sortable): replace for-in-hasOwnProperty with angular.forEach
thgreasi Sep 3, 2014
ff25513
feat(sortable): add extra properties to ui.item.sortable
thgreasi Sep 3, 2014
3a845c5
tests(sortable): add tests for the properties of ui.item.sortable
thgreasi Sep 4, 2014
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
23 changes: 21 additions & 2 deletions src/sortable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ angular.module('ui.sortable', [])
return (/left|right/).test(item.css('float')) || (/inline|table-cell/).test(item.css('display'));
}

function afterStop(e, ui) {
ui.item.sortable._destroy();
}

var opts = {};

// directive specific options
Expand Down Expand Up @@ -84,7 +88,10 @@ angular.module('ui.sortable', [])

// Save the starting position of dragged item
ui.item.sortable = {
model: ngModel.$modelValue[ui.item.index()],
index: ui.item.index(),
source: ui.item.parent(),
sourceModel: ngModel.$modelValue,
cancel: function () {
ui.item.sortable._isCanceled = true;
},
Expand All @@ -95,7 +102,12 @@ angular.module('ui.sortable', [])
return !!ui.item.sortable._isCustomHelperUsed;
},
_isCanceled: false,
_isCustomHelperUsed: ui.item.sortable._isCustomHelperUsed
_isCustomHelperUsed: ui.item.sortable._isCustomHelperUsed,
_destroy: function () {
angular.forEach(ui.item.sortable, function(value, key) {
ui.item.sortable[key] = undefined;
});
}
};
};

Expand Down Expand Up @@ -136,7 +148,9 @@ angular.module('ui.sortable', [])
// the value will be overwritten with the old value
if(!ui.item.sortable.received) {
ui.item.sortable.dropindex = ui.item.index();
ui.item.sortable.droptarget = ui.item.parent();
var droptarget = ui.item.parent();
ui.item.sortable.droptarget = droptarget;
ui.item.sortable.droptargetModel = droptarget.scope().$eval(droptarget.attr('ng-model'));

// Cancel the sort (let ng-repeat do the sort for us)
// Don't cancel if this is the received list because it has
Expand Down Expand Up @@ -262,6 +276,8 @@ angular.module('ui.sortable', [])
// call apply after stop
value = combineCallbacks(
value, function() { scope.$apply(); });

value = combineCallbacks(value, afterStop);
}
// wrap the callback
value = combineCallbacks(callbacks[key], value);
Expand All @@ -277,6 +293,9 @@ angular.module('ui.sortable', [])

angular.forEach(callbacks, function(value, key) {
opts[key] = combineCallbacks(value, opts[key]);
if( key === 'stop' ){
opts[key] = combineCallbacks(opts[key], afterStop);
}
});

} else {
Expand Down
130 changes: 129 additions & 1 deletion test/sortable.e2e.callbacks.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ describe('uiSortable', function() {
beforeEach(module('ui.sortable'));
beforeEach(module('ui.sortable.testHelper'));

var EXTRA_DY_PERCENTAGE, listContent;
var EXTRA_DY_PERCENTAGE, listContent, hasUndefinedProperties;

beforeEach(inject(function (sortableTestHelper) {
EXTRA_DY_PERCENTAGE = sortableTestHelper.EXTRA_DY_PERCENTAGE;
listContent = sortableTestHelper.listContent;
hasUndefinedProperties = sortableTestHelper.hasUndefinedProperties;
}));

describe('Callbacks related', function() {
Expand Down Expand Up @@ -188,6 +189,133 @@ describe('uiSortable', function() {
});
});

it('should properly set ui.item.sortable properties', function() {
inject(function($compile, $rootScope) {
var element, updateCallbackExpectations;
element = $compile('<ul ui-sortable="opts" ng-model="items"><li ng-repeat="item in items" id="s-{{$index}}">{{ item }}</li></ul>')($rootScope);
$rootScope.$apply(function() {
$rootScope.opts = {
update: function(e, ui) {
if (ui.item.scope().item === 'Two') {
ui.item.sortable.cancel();
}
updateCallbackExpectations(ui.item.sortable);
}
};
$rootScope.items = ['One', 'Two', 'Three'];
});

host.append(element);

$rootScope.$apply(function() {
});
var li = element.find(':eq(1)');
var dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
updateCallbackExpectations = function(uiItemSortable) {
expect(uiItemSortable.model).toEqual('Two');
expect(uiItemSortable.index).toEqual(1);
expect(uiItemSortable.source.length).toEqual(1);
expect(uiItemSortable.source[0]).toBe(host.children()[0]);
expect(uiItemSortable.sourceModel).toBe($rootScope.items);
expect(uiItemSortable.isCanceled()).toBe(true);
expect(uiItemSortable.isCustomHelperUsed()).toBe(false);
};
li.simulate('drag', { dy: dy });
expect($rootScope.items).toEqual(['One', 'Two', 'Three']);
expect($rootScope.items).toEqual(listContent(element));
updateCallbackExpectations = undefined;

li = element.find(':eq(0)');
dy = (2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
updateCallbackExpectations = function(uiItemSortable) {
expect(uiItemSortable.model).toEqual('One');
expect(uiItemSortable.index).toEqual(0);
expect(uiItemSortable.source.length).toEqual(1);
expect(uiItemSortable.source[0]).toBe(host.children()[0]);
expect(uiItemSortable.sourceModel).toBe($rootScope.items);
expect(uiItemSortable.isCanceled()).toBe(false);
expect(uiItemSortable.isCustomHelperUsed()).toBe(false);
};
li.simulate('drag', { dy: dy });
expect($rootScope.items).toEqual(['Two', 'Three', 'One']);
expect($rootScope.items).toEqual(listContent(element));
updateCallbackExpectations = undefined;

li = element.find(':eq(2)');
dy = -(2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
updateCallbackExpectations = function(uiItemSortable) {
expect(uiItemSortable.model).toEqual('One');
expect(uiItemSortable.index).toEqual(2);
expect(uiItemSortable.source.length).toEqual(1);
expect(uiItemSortable.source[0]).toBe(host.children()[0]);
expect(uiItemSortable.sourceModel).toBe($rootScope.items);
expect(uiItemSortable.isCanceled()).toBe(false);
expect(uiItemSortable.isCustomHelperUsed()).toBe(false);
};
li.simulate('drag', { dy: dy });
expect($rootScope.items).toEqual(['One', 'Two', 'Three']);
expect($rootScope.items).toEqual(listContent(element));
updateCallbackExpectations = undefined;

$(element).remove();
});
});

it('should properly free ui.item.sortable object', function() {
inject(function($compile, $rootScope) {
var element, uiItem, uiItemSortable_Destroy;
element = $compile('<ul ui-sortable="opts" ng-model="items"><li ng-repeat="item in items" id="s-{{$index}}">{{ item }}</li></ul>')($rootScope);
$rootScope.$apply(function() {
$rootScope.opts = {
start: function (e, ui) {
uiItem = ui.item;
spyOn(ui.item.sortable, '_destroy').andCallThrough();
uiItemSortable_Destroy = ui.item.sortable._destroy;
},
update: function(e, ui) {
if (ui.item.scope().item === 'Two') {
ui.item.sortable.cancel();
}
}
};
$rootScope.items = ['One', 'Two', 'Three'];
});

host.append(element);

var li = element.find(':eq(1)');
var dy = (1 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
li.simulate('drag', { dy: dy });
expect($rootScope.items).toEqual(['One', 'Two', 'Three']);
expect($rootScope.items).toEqual(listContent(element));
expect(uiItemSortable_Destroy).toHaveBeenCalled();
expect(hasUndefinedProperties(uiItem.sortable)).toBe(true);
uiItem = uiItemSortable_Destroy = undefined;


li = element.find(':eq(0)');
dy = (2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
li.simulate('drag', { dy: dy });
expect($rootScope.items).toEqual(['Two', 'Three', 'One']);
expect($rootScope.items).toEqual(listContent(element));
expect(uiItemSortable_Destroy).toHaveBeenCalled();
expect(hasUndefinedProperties(uiItem.sortable)).toBe(true);
uiItem = uiItemSortable_Destroy = undefined;


li = element.find(':eq(2)');
dy = -(2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
li.simulate('drag', { dy: dy });
expect($rootScope.items).toEqual(['One', 'Two', 'Three']);
expect($rootScope.items).toEqual(listContent(element));
expect(uiItemSortable_Destroy).toHaveBeenCalled();
expect(hasUndefinedProperties(uiItem.sortable)).toBe(true);
uiItem = uiItemSortable_Destroy = undefined;

$(element).remove();
});
});

});

});
Loading