Skip to content

Commit 21642af

Browse files
committed
Restore game focus after closing the journal
1 parent eba7bb7 commit 21642af

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,6 +1064,7 @@ <h2 id="journal-title">SIGNAL LOG</h2>
10641064
journalDialog.showModal();
10651065
});
10661066
journalClose.addEventListener('click', () => journalDialog.close());
1067+
journalDialog.addEventListener('close', () => canvas.focus({ preventScroll: true }));
10671068

10681069
let statusTimer = 0;
10691070
function showStatus(message, duration = 1.5) {

tests/runtime-smoke.test.cjs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ test('runtime initializes and renders a frame', () => {
5252
'journal-list': element(),
5353
'journal-close': element(),
5454
};
55+
elements.game.focus = () => { listeners.canvasFocused = true; };
5556
const sandbox = {
5657
LittleAndroidLogic,
5758
LittleAndroidContent,
@@ -95,6 +96,8 @@ test('runtime initializes and renders a frame', () => {
9596
{ ...keyboardTargets },
9697
{ game: true, canvas: true, control: false },
9798
);
99+
listeners.close();
100+
assert.equal(listeners.canvasFocused, true);
98101

99102
const retrieval = vm.runInContext(`
100103
const fragment = signalFragments[0];
@@ -143,11 +146,11 @@ test('runtime initializes and renders a frame', () => {
143146
const replay = vm.runInContext(`
144147
player.tileX = signalFragments[0].x;
145148
player.tileY = signalFragments[0].y;
146-
const refused = resetQuest();
149+
const replayRefused = resetQuest();
147150
player.tileX = 4;
148151
player.tileY = 6;
149-
const accepted = resetQuest();
150-
({ refused, accepted, collected: signalFragments.filter(fragment => fragment.collected).length });
152+
const replayAccepted = resetQuest();
153+
({ refused: replayRefused, accepted: replayAccepted, collected: signalFragments.filter(fragment => fragment.collected).length });
151154
`, sandbox);
152155
assert.deepEqual({ ...replay }, { refused: false, accepted: true, collected: 0 });
153156
});

0 commit comments

Comments
 (0)