From 93fcc8e71bd5b7d85e94422a141cad37adbc36fd Mon Sep 17 00:00:00 2001 From: hairlessbear Date: Wed, 22 Apr 2015 21:54:08 -0400 Subject: [PATCH 1/5] Fixed challenges achievement always displaying --- website/views/shared/profiles/achievements.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/views/shared/profiles/achievements.jade b/website/views/shared/profiles/achievements.jade index f365ffe300..e33dbe0f46 100644 --- a/website/views/shared/profiles/achievements.jade +++ b/website/views/shared/profiles/achievements.jade @@ -144,7 +144,7 @@ div(ng-if=':: profile.achievements.originalUser') small!=env.t('originalUserText') hr -div(ng-if='profile.achievements.challenges || user._id == profile._id') +div(ng-if='profile.achievements.challenges.length || user._id == profile._id') // This is a very strange icon to use. revisit .achievement.achievement-karaoke(ng-show='profile.achievements.challenges') div(ng-class='{muted: !profile.achievements.challenges}') From e16c1c2ec38a6da082eed887d5cfd698de582730 Mon Sep 17 00:00:00 2001 From: hairlessbear Date: Wed, 22 Apr 2015 22:06:50 -0400 Subject: [PATCH 2/5] Fixed challenge achievement always displaying Challenge achievement will now only display if the user has won 1 or more challenges. --- website/views/shared/profiles/achievements.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/views/shared/profiles/achievements.jade b/website/views/shared/profiles/achievements.jade index e33dbe0f46..06c5f1463e 100644 --- a/website/views/shared/profiles/achievements.jade +++ b/website/views/shared/profiles/achievements.jade @@ -144,7 +144,7 @@ div(ng-if=':: profile.achievements.originalUser') small!=env.t('originalUserText') hr -div(ng-if='profile.achievements.challenges.length || user._id == profile._id') +div(ng-if='profile.achievements.challenges.length') // This is a very strange icon to use. revisit .achievement.achievement-karaoke(ng-show='profile.achievements.challenges') div(ng-class='{muted: !profile.achievements.challenges}') From f9eef5c49770bffa35d2b2acd2f425ad49f451a7 Mon Sep 17 00:00:00 2001 From: hairlessbear Date: Fri, 24 Apr 2015 18:36:49 -0400 Subject: [PATCH 3/5] Greyed-out challenges achievement --- website/views/shared/profiles/achievements.jade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/views/shared/profiles/achievements.jade b/website/views/shared/profiles/achievements.jade index 06c5f1463e..be7dbf2bb7 100644 --- a/website/views/shared/profiles/achievements.jade +++ b/website/views/shared/profiles/achievements.jade @@ -144,10 +144,10 @@ div(ng-if=':: profile.achievements.originalUser') small!=env.t('originalUserText') hr -div(ng-if='profile.achievements.challenges.length') +div(ng-if='profile.achievements.challenges || user._id == profile_id') // This is a very strange icon to use. revisit - .achievement.achievement-karaoke(ng-show='profile.achievements.challenges') - div(ng-class='{muted: !profile.achievements.challenges}') + .achievement.achievement-karaoke(ng-show='profile.achievements.challenges.length') + div(ng-class='{muted: !profile.achievements.challenges.length}') h5=env.t('challengeWinner') table.table.table-striped tr(ng-repeat='chal in profile.achievements.challenges track by $index') From 1ee5bbae72ff731dbdbe1fc50ef4463dc3d0ec90 Mon Sep 17 00:00:00 2001 From: hairlessbear Date: Fri, 24 Apr 2015 18:38:15 -0400 Subject: [PATCH 4/5] Added a missing dot --- website/views/shared/profiles/achievements.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/views/shared/profiles/achievements.jade b/website/views/shared/profiles/achievements.jade index be7dbf2bb7..83b70ce1bd 100644 --- a/website/views/shared/profiles/achievements.jade +++ b/website/views/shared/profiles/achievements.jade @@ -144,7 +144,7 @@ div(ng-if=':: profile.achievements.originalUser') small!=env.t('originalUserText') hr -div(ng-if='profile.achievements.challenges || user._id == profile_id') +div(ng-if='profile.achievements.challenges || user._id == profile._id') // This is a very strange icon to use. revisit .achievement.achievement-karaoke(ng-show='profile.achievements.challenges.length') div(ng-class='{muted: !profile.achievements.challenges.length}') From 708ef0882bf8ef83fbe62f13a3d0ccd89bc6e32f Mon Sep 17 00:00:00 2001 From: hairlessbear Date: Sat, 25 Apr 2015 19:32:41 -0400 Subject: [PATCH 5/5] Changed ng-show to ng-if and added one-time bindings --- .../views/shared/profiles/achievements.jade | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/website/views/shared/profiles/achievements.jade b/website/views/shared/profiles/achievements.jade index 83b70ce1bd..fe1ec5f9bd 100644 --- a/website/views/shared/profiles/achievements.jade +++ b/website/views/shared/profiles/achievements.jade @@ -15,8 +15,8 @@ if mobile .item.item-divider=env.t('achievements') div(ng-if='::profile.achievements.habitSurveys || user._id == profile._id') - .achievement.achievement-tree(ng-show='profile.achievements.habitSurveys') - div(ng-class='{muted: !profile.achievements.habitSurveys}') + .achievement.achievement-tree(ng-if='::profile.achievements.habitSurveys') + div(ng-class='::{muted: !profile.achievements.habitSurveys}') h5=env.t('helped') small(ng-if='profile.achievements.habitSurveys > 1') =env.t('surveysMultiple', {surveys: "{{profile.achievements.habitSurveys}}"}) @@ -53,8 +53,8 @@ div(ng-if='::profile.backer.tier') hr div(ng-if='profile.achievements.streak || user._id == profile._id') - .achievement.achievement-thermometer(ng-show='profile.achievements.streak') - div(ng-class='{muted: !profile.achievements.streak}') + .achievement.achievement-thermometer(ng-if='::profile.achievements.streak') + div(ng-class='::{muted: !profile.achievements.streak}') h5(ng-show='profile.achievements.streak > 1 || !profile.achievements.streak') | {{profile.achievements.streak || 0 }}  @@ -66,8 +66,8 @@ div(ng-if='profile.achievements.streak || user._id == profile._id') hr div(ng-if='profile.achievements.perfect || user._id == profile._id') - .achievement.achievement-perfect(ng-show='profile.achievements.perfect') - div(ng-class='{muted: !profile.achievements.perfect}') + .achievement.achievement-perfect(ng-if='::profile.achievements.perfect') + div(ng-class='::{muted: !profile.achievements.perfect}') h5(ng-show='profile.achievements.perfect > 1 || !profile.achievements.perfect') | {{profile.achievements.perfect || 0 }}  @@ -93,8 +93,8 @@ div(ng-if='::user._id == profile._id') hr div(ng-if='profile.achievements.beastMaster || user._id == profile._id') - .achievement.achievement-rat(ng-show='profile.achievements.beastMaster') - div(ng-class='{muted: !profile.achievements.beastMaster}') + .achievement.achievement-rat(ng-if='::profile.achievements.beastMaster') + div(ng-class='::{muted: !profile.achievements.beastMaster}') h5=env.t('beastMasterName') small=env.t('beastMasterText') small(ng-if='profile.achievements.beastMasterCount') @@ -102,8 +102,8 @@ div(ng-if='profile.achievements.beastMaster || user._id == profile._id') hr div(ng-if='profile.achievements.mountMaster || user._id == profile._id') - .achievement.achievement-wolf(ng-show='profile.achievements.mountMaster') - div(ng-class='{muted: !profile.achievements.mountMaster}') + .achievement.achievement-wolf(ng-if='::profile.achievements.mountMaster') + div(ng-class='::{muted: !profile.achievements.mountMaster}') h5=env.t('mountMasterName') small=env.t('mountMasterText') small(ng-if='profile.achievements.mountMasterCount') @@ -111,8 +111,8 @@ div(ng-if='profile.achievements.mountMaster || user._id == profile._id') hr div(ng-if='profile.achievements.triadBingo || user._id == profile._id') - .achievement.achievement-triadbingo(ng-show='profile.achievements.triadBingo') - div(ng-class='{muted: !profile.achievements.triadBingo}') + .achievement.achievement-triadbingo(ng-if='::profile.achievements.triadBingo') + div(ng-class='::{muted: !profile.achievements.triadBingo}') h5=env.t('triadBingoName') small=env.t('triadBingoText') @@ -130,14 +130,14 @@ div(ng-if='profile.achievements.rebirths') | {{profile.achievements.rebirthLevel}}. hr -div(ng-if=':: profile.achievements.veteran') +div(ng-if='::profile.achievements.veteran') .achievement.achievement-cake div(ng-if='::profile.achievements.veteran') h5=env.t('veteran') small=env.t('veteranText') hr -div(ng-if=':: profile.achievements.originalUser') +div(ng-if='::profile.achievements.originalUser') .achievement.achievement-alpha div(ng-if='::profile.achievements.originalUser') h5=env.t('originalUser') @@ -146,8 +146,8 @@ div(ng-if=':: profile.achievements.originalUser') div(ng-if='profile.achievements.challenges || user._id == profile._id') // This is a very strange icon to use. revisit - .achievement.achievement-karaoke(ng-show='profile.achievements.challenges.length') - div(ng-class='{muted: !profile.achievements.challenges.length}') + .achievement.achievement-karaoke(ng-if='::profile.achievements.challenges.length') + div(ng-class='::{muted: !profile.achievements.challenges.length}') h5=env.t('challengeWinner') table.table.table-striped tr(ng-repeat='chal in profile.achievements.challenges track by $index') @@ -155,8 +155,8 @@ div(ng-if='profile.achievements.challenges || user._id == profile._id') hr div(ng-if='profile.achievements.quests || user._id == profile._id') - .achievement.achievement-alien(ng-show='profile.achievements.quests') - div(ng-class='{muted: !profile.achievements.quests}') + .achievement.achievement-alien(ng-if='::profile.achievements.quests') + div(ng-class='::{muted: !profile.achievements.quests}') h5=env.t('completedQuests') table.table.table-striped tr(ng-repeat='(k,v) in profile.achievements.quests') @@ -164,21 +164,21 @@ div(ng-if='profile.achievements.quests || user._id == profile._id') td x{{v}} hr -div(ng-if='profile.achievements.snowball') +div(ng-if='::profile.achievements.snowball') .achievement.achievement-snowball h5=env.t('annoyingFriends') small =env.t('annoyingFriendsText', {snowballs: "{{profile.achievements.snowball}}"}) hr -div(ng-if='profile.achievements.spookDust') +div(ng-if='::profile.achievements.spookDust') .achievement.achievement-spookDust h5=env.t('alarmingFriends') small =env.t('alarmingFriendsText', {spookDust: "{{profile.achievements.spookDust}}"}) hr -div(ng-if='profile.achievements.shinySeed') +div(ng-if='::profile.achievements.shinySeed') .achievement.achievement-shinySeed h5=env.t('agriculturalFriends') small