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

Callback fix and code cleanup #14

Merged
merged 3 commits into from
Jun 12, 2013
Merged

Callback fix and code cleanup #14

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52016d0
update sortable.js to allow proper callback setup and user callback e…
aloise Jun 8, 2013
47b1f99
js lint fixes
aloise Jun 8, 2013
ad69224
remove unnecessary semicolon
aloise Jun 8, 2013
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
211 changes: 98 additions & 113 deletions src/sortable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,124 +3,109 @@

@param [ui-sortable] {object} Options to pass to $.fn.sortable() merged onto ui.config
*/
angular.module('ui.sortable', []).value('uiSortableConfig',{}).directive('uiSortable', [
'uiSortableConfig', function(uiSortableConfig) {
return {
require: '?ngModel',
link: function(scope, element, attrs, ngModel) {
var onReceive, onRemove, onStart, onStop, onUpdate, opts = {};

angular.extend(opts, uiSortableConfig);

scope.$watch(attrs.uiSortable, function(newVal, oldVal){
angular.forEach(newVal, function(value, key){
element.sortable('option', key, value);
});
}, true);

if (ngModel) {

ngModel.$render = function() {
element.sortable( "refresh" );
};

onStart = function(e, ui) {
// Save position of dragged item
ui.item.sortable = { index: ui.item.index() };
};

onUpdate = function(e, ui) {
// For some reason the reference to ngModel in stop() is wrong
ui.item.sortable.resort = ngModel;
};

onReceive = function(e, ui) {
ui.item.sortable.relocate = true;
// added item to array into correct position and set up flag
ngModel.$modelValue.splice(ui.item.index(), 0, ui.item.sortable.moved);
};

onRemove = function(e, ui) {
// copy data into item
if (ngModel.$modelValue.length === 1) {
ui.item.sortable.moved = ngModel.$modelValue.splice(0, 1)[0];
} else {
ui.item.sortable.moved = ngModel.$modelValue.splice(ui.item.sortable.index, 1)[0];
}
};
angular.module('ui.sortable', [])
.value('uiSortableConfig',{})
.directive('uiSortable', [ 'uiSortableConfig',
function(uiSortableConfig) {
return {
require: '?ngModel',
link: function(scope, element, attrs, ngModel) {

function combineCallbacks(first,second){
if( second && (typeof second === "function") ){
return function(e,ui){
first(e,ui);
second(e,ui);
};
}
return first;
}

onStop = function(e, ui) {
// digest all prepared changes
if (ui.item.sortable.resort && !ui.item.sortable.relocate) {
var opts = {};

// Fetch saved and current position of dropped element
var end, start;
start = ui.item.sortable.index;
end = ui.item.index();
var callbacks = {
receive: null,
remove:null,
start:null,
stop:null,
update:null
};

// Reorder array and apply change to scope
ui.item.sortable.resort.$modelValue.splice(end, 0, ui.item.sortable.resort.$modelValue.splice(start, 1)[0]);
angular.extend(opts, uiSortableConfig);

if (ngModel) {

ngModel.$render = function() {
element.sortable( "refresh" );
};

callbacks.start = function(e, ui) {
// Save position of dragged item
ui.item.sortable = { index: ui.item.index() };
};

callbacks.update = function(e, ui) {
// For some reason the reference to ngModel in stop() is wrong
ui.item.sortable.resort = ngModel;
};

callbacks.receive = function(e, ui) {
ui.item.sortable.relocate = true;
// added item to array into correct position and set up flag
ngModel.$modelValue.splice(ui.item.index(), 0, ui.item.sortable.moved);
};

callbacks.remove = function(e, ui) {
// copy data into item
if (ngModel.$modelValue.length === 1) {
ui.item.sortable.moved = ngModel.$modelValue.splice(0, 1)[0];
} else {
ui.item.sortable.moved = ngModel.$modelValue.splice(ui.item.sortable.index, 1)[0];
}
};

callbacks.stop = function(e, ui) {
// digest all prepared changes
if (ui.item.sortable.resort && !ui.item.sortable.relocate) {

// Fetch saved and current position of dropped element
var end, start;
start = ui.item.sortable.index;
end = ui.item.index();

// Reorder array and apply change to scope
ui.item.sortable.resort.$modelValue.splice(end, 0, ui.item.sortable.resort.$modelValue.splice(start, 1)[0]);

}
if (ui.item.sortable.resort || ui.item.sortable.relocate) {
scope.$apply();
}
};

}
if (ui.item.sortable.resort || ui.item.sortable.relocate) {
scope.$apply();
}
};

// If user provided 'start' callback compose it with onStart function
opts.start = (function(_start){
return function(e, ui) {
onStart(e, ui);
if ( typeof _start === "function") {
_start(e, ui);
}
};
})(opts.start);

// If user provided 'stop' callback compose it with onStop function
opts.stop = (function(_stop){
return function(e, ui) {
onStop(e, ui);
if (typeof _stop === "function") {
_stop(e, ui);
}
};
})(opts.stop);

// If user provided 'update' callback compose it with onUpdate function
opts.update = (function(_update){
return function(e, ui) {
onUpdate(e, ui);
if (typeof _update === "function") {
_update(e, ui);
}
};
})(opts.update);

// If user provided 'receive' callback compose it with onReceive function
opts.receive = (function(_receive){
return function(e, ui) {
onReceive(e, ui);
if (typeof _receive === "function") {
_receive(e, ui);
}
};
})(opts.receive);

// If user provided 'remove' callback compose it with onRemove function
opts.remove = (function(_remove){
return function(e, ui) {
onRemove(e, ui);
if (typeof _remove === "function") {
_remove(e, ui);
}
};
})(opts.remove);
}

// Create sortable
element.sortable(opts);

scope.$watch(attrs.uiSortable, function(newVal, oldVal){
angular.forEach(newVal, function(value, key){

if( callbacks[key] ){
// wrap the callback
value = combineCallbacks( callbacks[key], value );
}

element.sortable('option', key, value);
});
}, true);

angular.forEach(callbacks, function(value, key ){

opts[key] = combineCallbacks(value, opts[key]);
});

// Create sortable

element.sortable(opts);
}
};
}
};
}
]);