From 98c6526cf74c5a83505966d6e5771cff8598c646 Mon Sep 17 00:00:00 2001
From: Bill Parrott <william.parrott@perceptivesoftware.com>
Date: Thu, 19 Feb 2015 08:46:45 -0600
Subject: [PATCH] add auto-focus when single/multiple is toggled

---
 website/public/js/controllers/tasksCtrl.js | 2 ++
 website/views/shared/tasks/lists.jade      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/website/public/js/controllers/tasksCtrl.js b/website/public/js/controllers/tasksCtrl.js
index 8eecc36f62..7294d5c2f7 100644
--- a/website/public/js/controllers/tasksCtrl.js
+++ b/website/public/js/controllers/tasksCtrl.js
@@ -45,6 +45,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
         addTask(addTo, listDef, listDef.newTask);
       }
       delete listDef.newTask;
+      delete listDef.focus;
     };
 
     $scope.toggleBulk = function(list) {
@@ -52,6 +53,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
         list.bulk = false;
       }
       list.bulk = !list.bulk;
+      list.focus = true;
     };
 
     /**
diff --git a/website/views/shared/tasks/lists.jade b/website/views/shared/tasks/lists.jade
index afc2b579fe..cd37d2962c 100644
--- a/website/views/shared/tasks/lists.jade
+++ b/website/views/shared/tasks/lists.jade
@@ -24,8 +24,8 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
 
           // Add New
           form.task-add(name='new{{list.type}}form', ng-hide='obj._locked', ng-submit='addTask(obj[list.type+"s"],list)')
-            textarea(rows='6', ng-model='list.newTask', placeholder='{{list.placeHolderBulk}}', ng-if='list.bulk', ui-keydown='{"meta-enter ctrl-enter":"addTask(obj[list.type+\'s\'],list)"}', required)
-            input(type='text', ng-model='list.newTask', placeholder='{{list.placeHolder}}', ng-if='!list.bulk', required)
+            textarea(rows='6', task-focus='list.bulk && list.focus', ng-model='list.newTask', placeholder='{{list.placeHolderBulk}}', ng-if='list.bulk', ui-keydown='{"meta-enter ctrl-enter":"addTask(obj[list.type+\'s\'],list)"}', required)
+            input(type='text', task-focus='!list.bulk && list.focus', ng-model='list.newTask', placeholder='{{list.placeHolder}}', ng-if='!list.bulk', required)
             button(type='submit', ng-disabled='new{{list.type}}form.$invalid')
               span.glyphicon.glyphicon-plus
             small.help-block.btn-link.pull-right(ng-click='toggleBulk(list)')