Merge branch 'develop' into TheHollidayInn-tasks-add-multiple-maintain-order

This commit is contained in:
Blade Barringer
2015-04-09 17:32:09 -05:00
115 changed files with 609 additions and 17412 deletions

View File

@@ -84,9 +84,9 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
}
};
$scope.removeTask = function(list, $index) {
$scope.removeTask = function(task) {
if (!confirm(window.env.t('sureDelete'))) return;
User.user.ops.deleteTask({params:{id:list[$index].id}})
User.user.ops.deleteTask({params:{id:task.id}})
};
$scope.saveTask = function(task, stayOpen, isSaveAndClose) {