Skip to content

Commit f9d3588

Browse files
author
Dono
committed
(1) quests: fix error with draft quest not selected in the quest list
1 parent 7eb249d commit f9d3588

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

app/modules/quests/client/quests-list.hbs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<ul class="quests">
1818
{{#if newQuest}}
19-
<li class="js-quest quest creating {{#if isQuestSelected draftQuestId}}selected{{/if}}" data-quest-id="{{draftQuestId}}"><i>(draft) {{newQuest}}</i></li>
19+
<li class="js-quest quest creating {{#if draftQuestSelected}}selected{{/if}}" data-quest-id="{{draftQuestId}}"><i>(draft) {{newQuest}}</i></li>
2020
{{/if}}
2121

2222
{{#each quests}}

app/modules/quests/client/quests-list.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ const autoSelectQuest = template => {
6262
const quest = Quests.findOne(selectedQuestId);
6363

6464
let mode = modes.mine;
65-
if (quest.completed) mode = modes.completed;
65+
if (!quest) mode = modes.mine;
66+
else if (quest.completed) mode = modes.completed;
6667
else if (!quest.targets.length) mode = modes.available;
6768
template.questListMode.set(mode);
6869
}
@@ -71,9 +72,7 @@ const autoSelectQuest = template => {
7172
const draftQuestId = () => {
7273
const selectedQuestId = Session.get('quests')?.selectedQuestId;
7374
if (!selectedQuestId) return undefined;
74-
75-
const isNewQuest = !Quests.findOne(selectedQuestId);
76-
if (!isNewQuest) return undefined;
75+
if (Quests.findOne(selectedQuestId)) return undefined;
7776

7877
return selectedQuestId;
7978
};
@@ -184,6 +183,7 @@ Template.questsList.helpers({
184183
},
185184
draftQuestId() { return draftQuestId(); },
186185
questListModeIsActive(mode) { return Template.instance().questListMode.get() === mode; },
186+
draftQuestSelected() { return Session.get('selectedQuestId') === draftQuestId(); },
187187
});
188188

189189
Template.questListEntry.helpers({

0 commit comments

Comments
 (0)