From 69a5c90ada3cbb0d950998ed3174cc5b4992211c Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 12 Apr 2025 10:13:12 +0300 Subject: [PATCH] refactor(mobile): share protected session & confirm dialogs --- src/public/app/layouts/desktop_layout.ts | 2 -- src/public/app/layouts/layout_commons.ts | 6 ++++-- src/public/app/layouts/mobile_layout.ts | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/public/app/layouts/desktop_layout.ts b/src/public/app/layouts/desktop_layout.ts index 0d1183530..6268a5c90 100644 --- a/src/public/app/layouts/desktop_layout.ts +++ b/src/public/app/layouts/desktop_layout.ts @@ -256,11 +256,9 @@ export default class DesktopLayout { .child(new PasswordNoteSetDialog()) .child(new UploadAttachmentsDialog()) - .child(new ProtectedSessionPasswordDialog()) .child(new RevisionsDialog()) .child(new DeleteNotesDialog()) .child(new InfoDialog()) - .child(new ConfirmDialog()) .child(new CloseZenButton()); diff --git a/src/public/app/layouts/layout_commons.ts b/src/public/app/layouts/layout_commons.ts index 988539e8b..c21ac09a9 100644 --- a/src/public/app/layouts/layout_commons.ts +++ b/src/public/app/layouts/layout_commons.ts @@ -16,6 +16,8 @@ import CloneToDialog from "../widgets/dialogs/clone_to.js"; import ImportDialog from "../widgets/dialogs/import.js"; import ExportDialog from "../widgets/dialogs/export.js"; import MarkdownImportDialog from "../widgets/dialogs/markdown_import.js"; +import ProtectedSessionPasswordDialog from "../widgets/dialogs/protected_session_password.js"; +import ConfirmDialog from "../widgets/dialogs/confirm.js"; export function applyModals(rootContainer: RootContainer) { rootContainer @@ -34,10 +36,10 @@ export function applyModals(rootContainer: RootContainer) { .child(new ImportDialog()) .child(new ExportDialog()) .child(new MarkdownImportDialog()) - // .child(new ProtectedSessionPasswordDialog()) + .child(new ProtectedSessionPasswordDialog()) // .child(new RevisionsDialog()) // .child(new DeleteNotesDialog()) // .child(new InfoDialog()) - // .child(new ConfirmDialog()) + .child(new ConfirmDialog()) .child(new PromptDialog()) } diff --git a/src/public/app/layouts/mobile_layout.ts b/src/public/app/layouts/mobile_layout.ts index aeb60f8bb..f652e5f23 100644 --- a/src/public/app/layouts/mobile_layout.ts +++ b/src/public/app/layouts/mobile_layout.ts @@ -168,8 +168,6 @@ export default class MobileLayout { ) .child(new MobileEditorToolbar()) ) - .child(new ProtectedSessionPasswordDialog()) - .child(new ConfirmDialog()) ) .child( new FlexContainer("column")