From 0083c3f881e3a940c7c83c6f0dc0e721896ad4af Mon Sep 17 00:00:00 2001
From: Alys <alice.harris@oldgods.net>
Date: Mon, 13 Apr 2015 19:34:59 +1000
Subject: [PATCH] Revert "Put list back into removeTask fn, update removal
 logic within challegeCtrl"

---
 website/public/js/controllers/challengesCtrl.js | 6 +++---
 website/views/shared/tasks/task.jade            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/public/js/controllers/challengesCtrl.js b/website/public/js/controllers/challengesCtrl.js
index 6df490571a..14925b2ac1 100644
--- a/website/public/js/controllers/challengesCtrl.js
+++ b/website/public/js/controllers/challengesCtrl.js
@@ -58,7 +58,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
       var groupsWithChallenges = _.uniq(_.pluck($scope.groupsFilter, '_id'));
       var len = groupsWithChallenges.length;
       var filterCount = 0;
-
+      
       for ( var i = 0; i < len; i += 1 ) {
         if ( $scope.search.group[groupsWithChallenges[i]] == true ) {
           filterCount += 1;
@@ -186,11 +186,11 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
       delete listDef.newTask;
     };
 
-    $scope.removeTask = function(task, list) {
+    $scope.removeTask = function(list, $index) {
       if (!confirm(window.env.t('sureDelete'))) return;
       //TODO persist
       // User.log({op: "delTask", data: task});
-      _.remove(list, task);
+      list.splice($index, 1);
     };
 
     $scope.saveTask = function(task){
diff --git a/website/views/shared/tasks/task.jade b/website/views/shared/tasks/task.jade
index 4f7c084947..9d0c032bef 100644
--- a/website/views/shared/tasks/task.jade
+++ b/website/views/shared/tasks/task.jade
@@ -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'))
           | &nbsp;
       // delete
-      a(ng-if='!task.challenge.id', ng-click='removeTask(task, obj[list.type+"s"])', tooltip=env.t('delete'))
+      a(ng-if='!task.challenge.id', ng-click='removeTask(task)', tooltip=env.t('delete'))
         span.glyphicon.glyphicon-trash
         | &nbsp;
 
@@ -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')
             | &nbsp;&nbsp;
-            a(ng-click='removeTask(task, obj[list.type+"s"])')=env.t('removeIt')
+            a(ng-click="removeTask(task)")=env.t('removeIt')
         div(ng-if='task.challenge.broken=="CHALLENGE_DELETED"')
           p
             |&nbsp;