From c1ce57801826ca721dc65b4aca9ef2dc98c687e7 Mon Sep 17 00:00:00 2001 From: Jin <22962980+JYC333@users.noreply.github.com> Date: Tue, 3 Sep 2024 18:15:10 +0200 Subject: [PATCH] fix all dialogs --- src/public/app/services/utils.js | 4 +- src/public/app/widgets/dialogs/about.js | 6 +-- src/public/app/widgets/dialogs/add_link.js | 8 +--- .../app/widgets/dialogs/branch_prefix.js | 20 +++----- .../app/widgets/dialogs/bulk_actions.js | 5 +- src/public/app/widgets/dialogs/clone_to.js | 16 +++---- src/public/app/widgets/dialogs/confirm.js | 20 ++++---- .../app/widgets/dialogs/delete_notes.js | 25 ++++------ src/public/app/widgets/dialogs/export.js | 11 ++--- src/public/app/widgets/dialogs/help.js | 3 +- .../app/widgets/dialogs/include_note.js | 27 ++++------- src/public/app/widgets/dialogs/info.js | 12 ++--- .../app/widgets/dialogs/jump_to_note.js | 5 +- .../app/widgets/dialogs/markdown_import.js | 11 ++--- src/public/app/widgets/dialogs/move_to.js | 9 ++-- .../app/widgets/dialogs/note_type_chooser.js | 5 +- .../app/widgets/dialogs/password_not_set.js | 9 ++-- src/public/app/widgets/dialogs/prompt.js | 12 ++--- .../dialogs/protected_session_password.js | 10 ++-- .../app/widgets/dialogs/recent_changes.js | 9 ++-- src/public/app/widgets/dialogs/revisions.js | 9 ++-- .../app/widgets/dialogs/sort_child_notes.js | 48 +++++++------------ .../app/widgets/dialogs/upload_attachments.js | 4 +- 23 files changed, 107 insertions(+), 181 deletions(-) diff --git a/src/public/app/services/utils.js b/src/public/app/services/utils.js index 3a6a46a56..e8c92351e 100644 --- a/src/public/app/services/utils.js +++ b/src/public/app/services/utils.js @@ -201,7 +201,7 @@ function getMimeTypeClass(mime) { function closeActiveDialog() { if (glob.activeDialog) { - glob.activeDialog.hide(); + bootstrap.Modal.getOrCreateInstance(glob.activeDialog).hide(); glob.activeDialog = null; } } @@ -245,7 +245,7 @@ async function openDialog($dialog, closeActDialog = true) { } saveFocusedElement(); - bootstrap.Modal.getInstance($dialog).show(); + bootstrap.Modal.getOrCreateInstance($dialog).show(); $dialog.on('hidden.bs.modal', () => { $(".aa-input").autocomplete("close"); diff --git a/src/public/app/widgets/dialogs/about.js b/src/public/app/widgets/dialogs/about.js index 1cab6460d..ed508768c 100644 --- a/src/public/app/widgets/dialogs/about.js +++ b/src/public/app/widgets/dialogs/about.js @@ -8,8 +8,8 @@ const TPL = `
-
${t("about.title")}
- +
${t("about.title")}
+
@@ -52,8 +52,6 @@ const TPL = ` export default class AboutDialog extends BasicWidget { doRender() { this.$widget = $(TPL); - bootstrap.Modal.getOrCreateInstance(this.$widget); - this.$appVersion = this.$widget.find(".app-version"); this.$dbVersion = this.$widget.find(".db-version"); this.$syncVersion = this.$widget.find(".sync-version"); diff --git a/src/public/app/widgets/dialogs/add_link.js b/src/public/app/widgets/dialogs/add_link.js index e449cd4b4..0de28cce3 100644 --- a/src/public/app/widgets/dialogs/add_link.js +++ b/src/public/app/widgets/dialogs/add_link.js @@ -9,11 +9,9 @@ const TPL = `
-
${t('add_link.add_link')}
- +
${t('add_link.add_link')}
- - +
@@ -60,8 +58,6 @@ const TPL = ` export default class AddLinkDialog extends BasicWidget { doRender() { this.$widget = $(TPL); - bootstrap.Modal.getOrCreateInstance(this.$widget); - this.$form = this.$widget.find(".add-link-form"); this.$autoComplete = this.$widget.find(".add-link-note-autocomplete"); this.$linkTitle = this.$widget.find(".link-title"); diff --git a/src/public/app/widgets/dialogs/branch_prefix.js b/src/public/app/widgets/dialogs/branch_prefix.js index 4fa05ba6f..ca5007101 100644 --- a/src/public/app/widgets/dialogs/branch_prefix.js +++ b/src/public/app/widgets/dialogs/branch_prefix.js @@ -14,13 +14,9 @@ const TPL = `
-
${t('branch_prefix.edit_branch_prefix')}
- +
${t('branch_prefix.edit_branch_prefix')}
- - +
@@ -28,10 +24,7 @@ const TPL = `
- -
-
-
+
@@ -46,6 +39,7 @@ const TPL = `
-
${t('bulk_actions.bulk_actions')}
- +
${t('bulk_actions.bulk_actions')}
@@ -68,8 +67,6 @@ const TPL = ` export default class BulkActionsDialog extends BasicWidget { doRender() { this.$widget = $(TPL); - bootstrap.Modal.getOrCreateInstance(this.$widget); - this.$includeDescendants = this.$widget.find(".include-descendants"); this.$includeDescendants.on("change", () => this.refresh()); diff --git a/src/public/app/widgets/dialogs/clone_to.js b/src/public/app/widgets/dialogs/clone_to.js index b578ed4ae..5dfa8f05e 100644 --- a/src/public/app/widgets/dialogs/clone_to.js +++ b/src/public/app/widgets/dialogs/clone_to.js @@ -13,13 +13,9 @@ const TPL = `
-
${t('clone_to.clone_notes_to')}
- +
${t('clone_to.clone_notes_to')}
- - +
@@ -81,9 +77,9 @@ export default class CloneToDialog extends BasicWidget { }); } - async cloneNoteIdsToEvent({noteIds}) { + async cloneNoteIdsToEvent({ noteIds }) { if (!noteIds || noteIds.length === 0) { - noteIds = [ appContext.tabManager.getActiveContextNoteId() ]; + noteIds = [appContext.tabManager.getActiveContextNoteId()]; } this.clonedNoteIds = []; @@ -111,7 +107,7 @@ export default class CloneToDialog extends BasicWidget { } async cloneNotesTo(notePath) { - const {noteId, parentNoteId} = treeService.getNoteIdAndParentIdFromUrl(notePath); + const { noteId, parentNoteId } = treeService.getNoteIdAndParentIdFromUrl(notePath); const targetBranchId = await froca.getBranchId(parentNoteId, noteId); for (const cloneNoteId of this.clonedNoteIds) { @@ -120,7 +116,7 @@ export default class CloneToDialog extends BasicWidget { const clonedNote = await froca.getNote(cloneNoteId); const targetNote = await froca.getBranch(targetBranchId).getNote(); - toastService.showMessage(t('clone_to.note_cloned', {clonedTitle: clonedNote.title, targetTitle: targetNote.title})); + toastService.showMessage(t('clone_to.note_cloned', { clonedTitle: clonedNote.title, targetTitle: targetNote.title })); } } } diff --git a/src/public/app/widgets/dialogs/confirm.js b/src/public/app/widgets/dialogs/confirm.js index b72445e5c..8a12a0755 100644 --- a/src/public/app/widgets/dialogs/confirm.js +++ b/src/public/app/widgets/dialogs/confirm.js @@ -8,11 +8,8 @@ const TPL = `
-
${t('confirm.confirmation')}
- - +
${t('confirm.confirmation')}
+
@@ -40,6 +37,7 @@ export default class ConfirmDialog extends BasicWidget { doRender() { this.$widget = $(TPL); + this.modal = bootstrap.Modal.getOrCreateInstance(this.$widget); this.$confirmContent = this.$widget.find(".confirm-dialog-content"); this.$okButton = this.$widget.find(".confirm-dialog-ok-button"); this.$cancelButton = this.$widget.find(".confirm-dialog-cancel-button"); @@ -62,7 +60,7 @@ export default class ConfirmDialog extends BasicWidget { this.$okButton.on('click', () => this.doResolve(true)); } - showConfirmDialogEvent({message, callback}) { + showConfirmDialogEvent({ message, callback }) { this.$originallyFocused = $(':focus'); this.$custom.hide(); @@ -75,15 +73,15 @@ export default class ConfirmDialog extends BasicWidget { this.$confirmContent.empty().append(message); - this.$widget.modal(); + this.modal.show(); this.resolve = callback; } - showConfirmDeleteNoteBoxWithNoteDialogEvent({title, callback}) { + showConfirmDeleteNoteBoxWithNoteDialogEvent({ title, callback }) { glob.activeDialog = this.$widget; - this.$confirmContent.text(`${t('confirm.are_you_sure_remove_note', {title: title})}`); + this.$confirmContent.text(`${t('confirm.are_you_sure_remove_note', { title: title })}`); this.$custom.empty() .append("
") @@ -104,7 +102,7 @@ export default class ConfirmDialog extends BasicWidget { this.$custom.show(); - this.$widget.modal(); + this.modal.show(); this.resolve = callback; } @@ -117,6 +115,6 @@ export default class ConfirmDialog extends BasicWidget { this.resolve = null; - this.$widget.modal("hide"); + this.modal.hide(); } } diff --git a/src/public/app/widgets/dialogs/delete_notes.js b/src/public/app/widgets/dialogs/delete_notes.js index 6d56d8cce..4249e4dea 100644 --- a/src/public/app/widgets/dialogs/delete_notes.js +++ b/src/public/app/widgets/dialogs/delete_notes.js @@ -10,27 +10,18 @@ const TPL = `
-

${t('delete_notes.delete_notes_preview')}

- - +

${t('delete_notes.delete_notes_preview')}

+
-
- +
+ +
-
- +
+ +
diff --git a/src/public/app/widgets/dialogs/export.js b/src/public/app/widgets/dialogs/export.js index b65b6a06d..92357afa0 100644 --- a/src/public/app/widgets/dialogs/export.js +++ b/src/public/app/widgets/dialogs/export.js @@ -34,9 +34,7 @@ const TPL = `
${t('export.export_note_title')}
- +
@@ -127,6 +125,7 @@ export default class ExportDialog extends BasicWidget { doRender() { this.$widget = $(TPL); + this.modal = bootstrap.Modal.getOrCreateInstance(this.$widget); this.$form = this.$widget.find(".export-form"); this.$noteTitle = this.$widget.find(".export-note-title"); this.$subtreeFormats = this.$widget.find(".export-subtree-formats"); @@ -137,7 +136,7 @@ export default class ExportDialog extends BasicWidget { this.$opmlVersions = this.$widget.find(".opml-versions"); this.$form.on('submit', () => { - this.$widget.modal('hide'); + this.modal.hide(); const exportType = this.$widget.find("input[name='export-type']:checked").val(); @@ -188,7 +187,7 @@ export default class ExportDialog extends BasicWidget { }); } - async showExportDialogEvent({notePath, defaultType}) { + async showExportDialogEvent({ notePath, defaultType }) { this.taskId = ''; this.$exportButton.removeAttr("disabled"); @@ -208,7 +207,7 @@ export default class ExportDialog extends BasicWidget { utils.openDialog(this.$widget); - const {noteId, parentNoteId} = treeService.getNoteIdAndParentIdFromUrl(notePath); + const { noteId, parentNoteId } = treeService.getNoteIdAndParentIdFromUrl(notePath); this.branchId = await froca.getBranchId(parentNoteId, noteId); this.$noteTitle.text(await treeService.getNoteTitle(noteId)); diff --git a/src/public/app/widgets/dialogs/help.js b/src/public/app/widgets/dialogs/help.js index b7b4f9dc6..120bc98af 100644 --- a/src/public/app/widgets/dialogs/help.js +++ b/src/public/app/widgets/dialogs/help.js @@ -7,7 +7,7 @@ const TPL = `
-
${t('help.fullDocumentation')}
+
${t('help.fullDocumentation')}
@@ -152,7 +152,6 @@ const TPL = ` export default class HelpDialog extends BasicWidget { doRender() { this.$widget = $(TPL); - bootstrap.Modal.getOrCreateInstance(this.$widget); } showHelpEvent() { diff --git a/src/public/app/widgets/dialogs/include_note.js b/src/public/app/widgets/dialogs/include_note.js index 692912667..e5fcad8a4 100644 --- a/src/public/app/widgets/dialogs/include_note.js +++ b/src/public/app/widgets/dialogs/include_note.js @@ -11,9 +11,7 @@ const TPL = `
${t('include_note.dialog_title')}
- +
@@ -27,22 +25,16 @@ const TPL = ` ${t('include_note.box_size_prompt')}
- + +
- + +
- + +
@@ -56,13 +48,14 @@ const TPL = ` export default class IncludeNoteDialog extends BasicWidget { doRender() { this.$widget = $(TPL); + this.modal = bootstrap.Modal.getOrCreateInstance(this.$widget); this.$form = this.$widget.find(".include-note-form"); this.$autoComplete = this.$widget.find(".include-note-autocomplete"); this.$form.on('submit', () => { const notePath = this.$autoComplete.getSelectedNotePath(); if (notePath) { - this.$widget.modal('hide'); + this.modal.hide(); this.includeNote(notePath); } else { logError("No noteId to include."); @@ -72,7 +65,7 @@ export default class IncludeNoteDialog extends BasicWidget { }) } - async showIncludeNoteDialogEvent({textTypeWidget}) { + async showIncludeNoteDialogEvent({ textTypeWidget }) { this.textTypeWidget = textTypeWidget; await this.refresh(); utils.openDialog(this.$widget); diff --git a/src/public/app/widgets/dialogs/info.js b/src/public/app/widgets/dialogs/info.js index 5bfdb31cd..fce06510e 100644 --- a/src/public/app/widgets/dialogs/info.js +++ b/src/public/app/widgets/dialogs/info.js @@ -7,11 +7,8 @@ const TPL = `
-
${t("info.modalTitle")}
- - +
${t("info.modalTitle")}
+
@@ -33,6 +30,7 @@ export default class InfoDialog extends BasicWidget { doRender() { this.$widget = $(TPL); + this.modal = bootstrap.Modal.getOrCreateInstance(this.$widget); this.$infoContent = this.$widget.find(".info-dialog-content"); this.$okButton = this.$widget.find(".info-dialog-ok-button"); @@ -49,10 +47,10 @@ export default class InfoDialog extends BasicWidget { } }); - this.$okButton.on('click', () => this.$widget.modal("hide")); + this.$okButton.on('click', () => this.modal.hide()); } - showInfoDialogEvent({message, callback}) { + showInfoDialogEvent({ message, callback }) { this.$originallyFocused = $(':focus'); this.$infoContent.text(message); diff --git a/src/public/app/widgets/dialogs/jump_to_note.js b/src/public/app/widgets/dialogs/jump_to_note.js index 86885dd92..5324b4588 100644 --- a/src/public/app/widgets/dialogs/jump_to_note.js +++ b/src/public/app/widgets/dialogs/jump_to_note.js @@ -12,7 +12,6 @@ const TPL = `
-
@@ -36,7 +35,7 @@ export default class JumpToNoteDialog extends BasicWidget { doRender() { this.$widget = $(TPL); - bootstrap.Modal.getOrCreateInstance(this.$widget); + this.modal = bootstrap.Modal.getOrCreateInstance(this.$widget); this.$autoComplete = this.$widget.find(".jump-to-note-autocomplete"); this.$results = this.$widget.find(".jump-to-note-results"); @@ -96,6 +95,6 @@ export default class JumpToNoteDialog extends BasicWidget { this.triggerCommand('searchNotes', { searchString }); - this.$widget.modal('hide'); + this.modal.hide(); } } diff --git a/src/public/app/widgets/dialogs/markdown_import.js b/src/public/app/widgets/dialogs/markdown_import.js index 48bbf851d..5fbb76118 100644 --- a/src/public/app/widgets/dialogs/markdown_import.js +++ b/src/public/app/widgets/dialogs/markdown_import.js @@ -12,9 +12,7 @@ const TPL = `
${t("markdown_import.dialog_title")}
- +

${t("markdown_import.modal_body_text")}

@@ -37,6 +35,7 @@ export default class MarkdownImportDialog extends BasicWidget { doRender() { this.$widget = $(TPL); + this.modal = bootstrap.Modal.getOrCreateInstance(this.$widget); this.$importTextarea = this.$widget.find('.markdown-import-textarea'); this.$importButton = this.$widget.find('.markdown-import-button'); @@ -48,7 +47,7 @@ export default class MarkdownImportDialog extends BasicWidget { } async convertMarkdownToHtml(markdownContent) { - const {htmlContent} = await server.post('other/render-markdown', { markdownContent }); + const { htmlContent } = await server.post('other/render-markdown', { markdownContent }); const textEditor = await appContext.tabManager.getActiveContext().getTextEditor(); @@ -70,7 +69,7 @@ export default class MarkdownImportDialog extends BasicWidget { } if (utils.isElectron()) { - const {clipboard} = utils.dynamicRequire('electron'); + const { clipboard } = utils.dynamicRequire('electron'); const text = clipboard.readText(); this.convertMarkdownToHtml(text); @@ -83,7 +82,7 @@ export default class MarkdownImportDialog extends BasicWidget { async sendForm() { const text = this.$importTextarea.val(); - this.$widget.modal('hide'); + this.modal.hide(); await this.convertMarkdownToHtml(text); diff --git a/src/public/app/widgets/dialogs/move_to.js b/src/public/app/widgets/dialogs/move_to.js index 38063dd17..4e596715e 100644 --- a/src/public/app/widgets/dialogs/move_to.js +++ b/src/public/app/widgets/dialogs/move_to.js @@ -5,18 +5,15 @@ import froca from "../../services/froca.js"; import branchService from "../../services/branches.js"; import treeService from "../../services/tree.js"; import BasicWidget from "../basic_widget.js"; -import { t } from "../../services/i18n.js"; // Added import +import { t } from "../../services/i18n.js"; const TPL = `