From 3ba4330dfc5a3684f99ff903901e1633405be2f0 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Sun, 1 Sep 2013 13:44:52 -0400 Subject: [PATCH] rewrite: misc bug fixes --- assets/js/controllers/tasksCtrl.js | 4 ++-- views/shared/header/avatar.jade | 2 +- views/tasks/task.jade | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/js/controllers/tasksCtrl.js b/assets/js/controllers/tasksCtrl.js index 3140f7bf79..18ddb59fe3 100644 --- a/assets/js/controllers/tasksCtrl.js +++ b/assets/js/controllers/tasksCtrl.js @@ -24,7 +24,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User', ' main: true, editable: true }, { - header: 'Reward', + header: 'Rewards', type: 'reward', placeHolder: 'New Reward', main: true, @@ -72,7 +72,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User', ' }; $scope.addTask = function(list) { - var task = window.habitrpgShared.helpers.taskDefaults({text: list.newTask, type: list.type}); + var task = window.habitrpgShared.helpers.taskDefaults({text: list.newTask, type: list.type}, User.user.filters); User.user[list.type + "s"].unshift(task); // $scope.showedTasks.unshift newTask # FIXME what's thiss? User.log({op: "addTask", data: task}); diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade index 6085226913..4f61cf3ff1 100644 --- a/views/shared/header/avatar.jade +++ b/views/shared/header/avatar.jade @@ -4,8 +4,8 @@ figure.herobox(ng-click='clickAvatar(profile)', data-name='{{username(profile.au span(class='{{profile.preferences.gender}}_skin_{{profile.preferences.skin}}') span(class='{{profile.preferences.gender}}_hair_{{profile.preferences.hair}}') span(class='{{equipped("armor", profile.items.armor, profile.preferences, profile.backer.tier)}}') - span(class='{{equipped("head", profile.items.head, profile.preferences, profile.backer.tier)}}', ng-show='profile.preferences.showHelm') span(class='{{profile.preferences.gender}}_head_0', ng-hide='profile.preferences.showHelm') + span(class='{{equipped("head", profile.items.head, profile.preferences, profile.backer.tier)}}', ng-show='profile.preferences.showHelm') span(class='{{equipped("shield",profile.items.shield,profile.preferences,profile.backer.tier)}}') span(class='{{equipped("weapon",profile.items.weapon,profile.preferences,profile.backer.tier)}}') // FIXME handle @minimal, this might have to be a directive diff --git a/views/tasks/task.jade b/views/tasks/task.jade index ef6a590ee1..8572424f3f 100644 --- a/views/tasks/task.jade +++ b/views/tasks/task.jade @@ -6,7 +6,7 @@ li(ng-repeat='task in user[list.type + "s"]', class='task {{taskClasses(task,use span(tooltip='Streak Counter') i.icon-forward - i.icon-tags(tooltip='{{appliedTags(user.tags, task.tags)}}', ng-hide='notTags(task.tags)') + i.icon-tags(tooltip='{{appliedTags(user.tags, task.tags)}}', ng-hide='noTags(task.tags)') // edit a(ng-click='task._editing = !task._editing', tooltip='Edit')