sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-03 04:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modify removeTask to accept a task object. Update task view to reflect new method signature.

Browse source
This commit is contained in:
Kevin Gisi 2015-04-07 22:37:32 -04:00
parent 33f928b6d8
commit 9bb2f46264
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
website/public/js/controllers/tasksCtrl.js
View file

@ -82,9 +82,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) {
@ -166,7 +166,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
focusChecklist(task,$index-1);
// Don't allow the backspace key to navigate back now that the field is gone
$event.preventDefault();
}
}
}
$scope.swapChecklistItems = function(task, oldIndex, newIndex) {
var toSwap = task.checklist.splice(oldIndex, 1)[0];
@ -186,7 +186,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
/*
------------------------
Items
Items
------------------------
*/

4
website/views/shared/tasks/task.jade
View file

@ -44,7 +44,7 @@ li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s
span.glyphicon.glyphicon-bullhorn(tooltip=env.t('challenge'))
|  
// delete
a(ng-if='!task.challenge.id', ng-click='removeTask(obj[list.type+"s"], $index)', tooltip=env.t('delete'))
a(ng-if='!task.challenge.id', ng-click='removeTask(task)', tooltip=env.t('delete'))
span.glyphicon.glyphicon-trash
|  
@ -101,7 +101,7 @@ li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s
p
a(ng-click='unlink(task, "keep")')=env.t('keepIt')
|   
a(ng-click="removeTask(obj[list.type+'s'], $index)")=env.t('removeIt')
a(ng-click="removeTask(task)")=env.t('removeIt')
div(ng-if='task.challenge.broken=="CHALLENGE_DELETED"')
p
|