diff --git a/apps/client/src/layouts/desktop_layout.ts b/apps/client/src/layouts/desktop_layout.ts index 81fda813c..e522e6f19 100644 --- a/apps/client/src/layouts/desktop_layout.ts +++ b/apps/client/src/layouts/desktop_layout.ts @@ -259,7 +259,8 @@ export default class DesktopLayout { // Desktop-specific dialogs. .child(new PasswordNoteSetDialog()) .child(new UploadAttachmentsDialog()) - .child(new PopupEditorDialog()); + .child(new PopupEditorDialog() + .child(new NoteDetailWidget())); applyModals(rootContainer); return rootContainer; diff --git a/apps/client/src/widgets/dialogs/popup_editor.ts b/apps/client/src/widgets/dialogs/popup_editor.ts index 3090e31f6..6cb2eea58 100644 --- a/apps/client/src/widgets/dialogs/popup_editor.ts +++ b/apps/client/src/widgets/dialogs/popup_editor.ts @@ -1,5 +1,6 @@ import { openDialog } from "../../services/dialog.js"; import BasicWidget from "../basic_widget.js"; +import Container from "../containers/container.js"; const TPL = /*html*/`\ `; -export default class PopupEditorDialog extends BasicWidget { +export default class PopupEditorDialog extends Container { constructor() { super(); @@ -28,7 +29,13 @@ export default class PopupEditorDialog extends BasicWidget { } doRender() { - this.$widget = $(TPL); + // This will populate this.$widget with the content of the children. + super.doRender(); + + // Now we wrap it in the modal. + const $newWidget = $(TPL); + $newWidget.find(".modal-body").append(this.$widget.children()); + this.$widget = $newWidget; } async refresh() {