krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed all party.quest.key instances in quest invite modal to user.party.quest.key and changed invite modal check

Browse Source
This commit is contained in:
hairlessbear
2015-05-27 18:49:35 -04:00
parent 966f9d2aca
commit dc8647d6ae
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/public/js/controllers/notificationCtrl.js
View File

@@ -148,9 +148,8 @@ habitrpg.controller('NotificationCtrl',
}); });
// Quest invitation modal // Quest invitation modal
$rootScope.$watch('user.party.quest.RSVPNeeded == true', function(after, before){ $rootScope.$watch('user.party.quest.RSVPNeeded', function(after, before){
if (after != true) return; if (after != true) return;
$rootScope.party.$get();
$rootScope.openModal('questInvitation'); $rootScope.openModal('questInvitation');
}); });

20
website/views/shared/modals/quests.jade
View File

@@ -67,23 +67,23 @@ script(type='text/ng-template', id='modals/buyQuest.html')
script(type='text/ng-template', id='modals/questInvitation.html') script(type='text/ng-template', id='modals/questInvitation.html')
.modal-header .modal-header
h4=env.t('questInvitation') h4=env.t('questInvitation')
| {{::Content.quests[party.quest.key].text()}} | {{::Content.quests[user.party.quest.key].text()}}
.modal-body .modal-body
.pull-right-sm.text-center .pull-right-sm.text-center
.col-centered(class='quest_{{::Content.quests[party.quest.key].key}}') .col-centered(class='quest_{{::Content.quests[user.party.quest.key].key}}')
div(ng-if='::Content.quests[party.quest.key].boss') div(ng-if='::Content.quests[user.party.quest.key].boss')
h4 {{::Content.quests[party.quest.key].boss.name()}} h4 {{::Content.quests[user.party.quest.key].boss.name()}}
p p
strong=env.t('bossHP') + ': ' strong=env.t('bossHP') + ': '
| {{::Content.quests[party.quest.key].boss.hp}} | {{::Content.quests[user.party.quest.key].boss.hp}}
p p
strong=env.t('bossStrength') + ': ' strong=env.t('bossStrength') + ': '
| {{::Content.quests[party.quest.key].boss.str}} | {{::Content.quests[user.party.quest.key].boss.str}}
div(ng-if='::Content.quests[party.quest.key].collect') div(ng-if='::Content.quests[user.party.quest.key].collect')
p(ng-repeat='(k,v) in ::Content.quests[party.quest.key].collect') p(ng-repeat='(k,v) in ::Content.quests[user.party.quest.key].collect')
strong=env.t('collect') + ': ' strong=env.t('collect') + ': '
| {{::Content.quests[party.quest.key].collect[k].count}} {{::Content.quests[party.quest.key].collect[k].text()}} | {{::Content.quests[user.party.quest.key].collect[k].count}} {{::Content.quests[user.party.quest.key].collect[k].text()}}
div(ng-bind-html='::Content.quests[party.quest.key].notes()') div(ng-bind-html='::Content.quests[user.party.quest.key].notes()')
quest-rewards(key='{{::user.party.quest.key}}', header=env.t('rewards')) quest-rewards(key='{{::user.party.quest.key}}', header=env.t('rewards'))
.modal-footer .modal-footer
button.btn.btn-default(ng-click='questHold = true; $close()')=env.t('askLater') button.btn.btn-default(ng-click='questHold = true; $close()')=env.t('askLater')