Merge branch 'nathan-starter' of https://github.com/brown-dash/Dash-Web into nathan-starter

1 files changed, 3 insertions, 4 deletions

diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index c73da35bc..18ec0b6a9 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -15,7 +15,6 @@ import { UndoManager, undoable } from '../util/UndoManager';
 import { ContextMenu } from './ContextMenu';
 import { DocumentDecorations } from './DocumentDecorations';
 import { InkStrokeProperties } from './InkStrokeProperties';
-import { LightboxView } from './LightboxView';
 import { MainView } from './MainView';
 import { CollectionDockingView } from './collections/CollectionDockingView';
 import { CollectionStackedTimeline } from './collections/CollectionStackedTimeline';
@@ -146,7 +145,7 @@ export class KeyManager {
                     }
                     if (doDeselect) {
                         DocumentView.DeselectAll();
-                        LightboxView.Instance.SetLightboxDoc(undefined);
+                        DocumentView.SetLightboxDoc(undefined);
                     }
                     // DictationManager.Controls.stop();
                     GoogleAuthenticationManager.Instance.cancel();
@@ -163,8 +162,8 @@ export class KeyManager {
             case 'delete':
             case 'backspace':
                 if (document.activeElement?.tagName !== 'INPUT' && document.activeElement?.tagName !== 'TEXTAREA') {
-                    if (LightboxView.LightboxDoc) {
-                        LightboxView.Instance.SetLightboxDoc(undefined);
+                    if (DocumentView.LightboxDoc()) {
+                        DocumentView.SetLightboxDoc(undefined);
                         DocumentView.DeselectAll();
                     } else if (!window.getSelection()?.toString()) DocumentDecorations.Instance.onCloseClick(true);
                     return { stopPropagation: true, preventDefault: true };