sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-31 23:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rewrite: misc bug fixes

Browse source
This commit is contained in:
Tyler Renelle 2013-09-01 13:44:52 -04:00
parent fb0ffd075e
commit 3ba4330dfc
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assets/js/controllers/tasksCtrl.js
View file

@ -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});

2
views/shared/header/avatar.jade
View file

@ -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

2
views/tasks/task.jade
View file

@ -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')