From d848faee8eb2c7a48c1c34d193575bb3d31e276c Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Sat, 12 Jul 2014 14:08:10 -0600 Subject: [PATCH] fix(quests): show completion dialog --- public/js/controllers/notificationCtrl.js | 2 +- views/shared/modals/quests.jade | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/js/controllers/notificationCtrl.js b/public/js/controllers/notificationCtrl.js index 255365403f..d20082d471 100644 --- a/public/js/controllers/notificationCtrl.js +++ b/public/js/controllers/notificationCtrl.js @@ -126,7 +126,7 @@ habitrpg.controller('NotificationCtrl', // Completed quest modal $rootScope.$watch('user.party.quest.completed', function(after, before){ - if (after == before || after != true) return; + if (!after) return; $rootScope.openModal('questCompleted', {controller:'InventoryCtrl'}); }); diff --git a/views/shared/modals/quests.jade b/views/shared/modals/quests.jade index d7f80e6060..150611bd26 100644 --- a/views/shared/modals/quests.jade +++ b/views/shared/modals/quests.jade @@ -2,13 +2,13 @@ include ./quest-rewards script(type='text/ng-template', id='modals/questCompleted.html') .modal-header - h4 "{{Content.quests[user.party.quest.completed].text()}}" + h4 "{{::Content.quests[user.party.quest.completed].text()}}" =env.t('completed') .modal-body - p {{Content.quests[user.party.quest.completed].completion()}} + p {{::Content.quests[user.party.quest.completed].completion()}} quest-rewards(key='{{user.party.quest.completed}}', header=env.t('youReceived')) .modal-footer - button.btn.btn-primary(ng-click='set({"party.quest.completed":""}); $close()')=env.t('accept') + button.btn.btn-primary(ng-click='set({"party.quest.completed":""}); $close()')=env.t('ok') script(type='text/ng-template', id='modals/showQuest.html') .modal-header