From 72300d1b0cf63cff6ee8338710f29408604bb7a8 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Tue, 7 Jun 2022 22:35:26 -0500 Subject: [PATCH] Lightbox escape keyboard shortcut also works --- src/domain/ViewModel.ts | 6 ++++++ src/domain/session/room/LightboxViewModel.js | 2 +- src/domain/session/room/timeline/TimelineViewModel.js | 1 - 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/domain/ViewModel.ts b/src/domain/ViewModel.ts index 0bc52f6e..6e3bfd77 100644 --- a/src/domain/ViewModel.ts +++ b/src/domain/ViewModel.ts @@ -28,12 +28,14 @@ import type {Clock} from "../platform/web/dom/Clock"; import type {ILogger} from "../logging/types"; import type {Navigation} from "./navigation/Navigation"; import type {URLRouter} from "./navigation/URLRouter"; +import type {History} from "../platform/web/dom/History"; export type Options = { platform: Platform logger: ILogger urlCreator: URLRouter navigation: Navigation + history: History emitChange?: (params: any) => void } @@ -142,4 +144,8 @@ export class ViewModel extends EventEmitter<{change get navigation(): Navigation { return this._options.navigation; } + + get history(): History { + return this._options.history; + } } diff --git a/src/domain/session/room/LightboxViewModel.js b/src/domain/session/room/LightboxViewModel.js index 52e518c7..b22ba1c4 100644 --- a/src/domain/session/room/LightboxViewModel.js +++ b/src/domain/session/room/LightboxViewModel.js @@ -96,6 +96,6 @@ export class LightboxViewModel extends ViewModel { } close() { - this.platform.history.pushUrl(this.closeUrl); + this.history.pushUrl(this.closeUrl); } } diff --git a/src/domain/session/room/timeline/TimelineViewModel.js b/src/domain/session/room/timeline/TimelineViewModel.js index 3e12bd2f..b5dd6273 100644 --- a/src/domain/session/room/timeline/TimelineViewModel.js +++ b/src/domain/session/room/timeline/TimelineViewModel.js @@ -36,7 +36,6 @@ import {ViewModel} from "../../../ViewModel"; export class TimelineViewModel extends ViewModel { constructor(options) { - console.log('TimelineViewModel asdf', options) super(options); const {timeline, tileOptions} = options; this._timeline = this.track(timeline);