diff --git a/src/public/app/dialogs/clone_to.js b/src/public/app/dialogs/clone_to.js deleted file mode 100644 index a992b1def..000000000 --- a/src/public/app/dialogs/clone_to.js +++ /dev/null @@ -1,73 +0,0 @@ -import noteAutocompleteService from "../services/note_autocomplete.js"; -import utils from "../services/utils.js"; -import treeService from "../services/tree.js"; -import toastService from "../services/toast.js"; -import froca from "../services/froca.js"; -import branchService from "../services/branches.js"; -import appContext from "../services/app_context.js"; - -const $dialog = $("#clone-to-dialog"); -const $form = $("#clone-to-form"); -const $noteAutoComplete = $("#clone-to-note-autocomplete"); -const $clonePrefix = $("#clone-prefix"); -const $noteList = $("#clone-to-note-list"); - -let clonedNoteIds; - -export async function showDialog(noteIds) { - if (!noteIds || noteIds.length === 0) { - noteIds = [ appContext.tabManager.getActiveContextNoteId() ]; - } - - clonedNoteIds = []; - - for (const noteId of noteIds) { - if (!clonedNoteIds.includes(noteId)) { - clonedNoteIds.push(noteId); - } - } - - utils.openDialog($dialog); - - $noteAutoComplete.val('').trigger('focus'); - - $noteList.empty(); - - for (const noteId of clonedNoteIds) { - const note = await froca.getNote(noteId); - - $noteList.append($("
  • ").text(note.title)); - } - - noteAutocompleteService.initNoteAutocomplete($noteAutoComplete); - noteAutocompleteService.showRecentNotes($noteAutoComplete); -} - -async function cloneNotesTo(notePath) { - const {noteId, parentNoteId} = treeService.getNoteIdAndParentIdFromNotePath(notePath); - const targetBranchId = await froca.getBranchId(parentNoteId, noteId); - - for (const cloneNoteId of clonedNoteIds) { - await branchService.cloneNoteToBranch(cloneNoteId, targetBranchId, $clonePrefix.val()); - - const clonedNote = await froca.getNote(cloneNoteId); - const targetNote = await froca.getBranch(targetBranchId).getNote(); - - toastService.showMessage(`Note "${clonedNote.title}" has been cloned into ${targetNote.title}`); - } -} - -$form.on('submit', () => { - const notePath = $noteAutoComplete.getSelectedNotePath(); - - if (notePath) { - $dialog.modal('hide'); - - cloneNotesTo(notePath); - } - else { - logError("No path to clone to."); - } - - return false; -}); diff --git a/src/public/app/layouts/desktop_layout.js b/src/public/app/layouts/desktop_layout.js index fa696fb76..f1757d05c 100644 --- a/src/public/app/layouts/desktop_layout.js +++ b/src/public/app/layouts/desktop_layout.js @@ -63,6 +63,7 @@ import IncludeNoteDialog from "../widgets/dialogs/include_note.js"; import NoteTypeChooserDialog from "../widgets/dialogs/note_type_chooser.js"; import JumpToNoteDialog from "../widgets/dialogs/jump_to_note.js"; import AddLinkDialog from "../widgets/dialogs/add_link.js"; +import CloneToDialog from "../widgets/dialogs/clone_to.js"; export default class DesktopLayout { constructor(customWidgets) { @@ -200,6 +201,7 @@ export default class DesktopLayout { .child(new IncludeNoteDialog()) .child(new NoteTypeChooserDialog()) .child(new JumpToNoteDialog()) - .child(new AddLinkDialog()); + .child(new AddLinkDialog()) + .child(new CloneToDialog()); } } diff --git a/src/public/app/services/root_command_executor.js b/src/public/app/services/root_command_executor.js index 2a66e69ff..71ad2c814 100644 --- a/src/public/app/services/root_command_executor.js +++ b/src/public/app/services/root_command_executor.js @@ -23,11 +23,6 @@ export default class RootCommandExecutor extends Component { appContext.triggerEvent("readOnlyTemporarilyDisabled", { noteContext }); } - async cloneNoteIdsToCommand({noteIds}) { - const d = await import("../dialogs/clone_to.js"); - d.showDialog(noteIds); - } - async moveBranchIdsToCommand({branchIds}) { const d = await import("../dialogs/move_to.js"); d.showDialog(branchIds); diff --git a/src/public/app/widgets/dialogs/clone_to.js b/src/public/app/widgets/dialogs/clone_to.js new file mode 100644 index 000000000..f8ad4d1da --- /dev/null +++ b/src/public/app/widgets/dialogs/clone_to.js @@ -0,0 +1,125 @@ +import noteAutocompleteService from "../../services/note_autocomplete.js"; +import utils from "../../services/utils.js"; +import treeService from "../../services/tree.js"; +import toastService from "../../services/toast.js"; +import froca from "../../services/froca.js"; +import branchService from "../../services/branches.js"; +import appContext from "../../services/app_context.js"; +import BasicWidget from "../basic_widget.js"; + +const TPL = ` +`; + +export default class CloneToDialog extends BasicWidget { + constructor() { + super(); + + this.clonedNoteIds = null; + } + + doRender() { + this.$widget = $(TPL); + this.$form = this.$widget.find(".clone-to-form"); + this.$noteAutoComplete = this.$widget.find(".clone-to-note-autocomplete"); + this.$clonePrefix = this.$widget.find(".clone-prefix"); + this.$noteList = this.$widget.find(".clone-to-note-list"); + + this.$form.on('submit', () => { + const notePath = this.$noteAutoComplete.getSelectedNotePath(); + + if (notePath) { + this.$widget.modal('hide'); + + this.cloneNotesTo(notePath); + } + else { + logError("No path to clone to."); + } + + return false; + }); + } + + async cloneNoteIdsToEvent({noteIds}) { + if (!noteIds || noteIds.length === 0) { + noteIds = [ appContext.tabManager.getActiveContextNoteId() ]; + } + + this.clonedNoteIds = []; + + for (const noteId of noteIds) { + if (!this.clonedNoteIds.includes(noteId)) { + this.clonedNoteIds.push(noteId); + } + } + + utils.openDialog(this.$widget); + + this.$noteAutoComplete.val('').trigger('focus'); + + this.$noteList.empty(); + + for (const noteId of this.clonedNoteIds) { + const note = await froca.getNote(noteId); + + this.$noteList.append($("
  • ").text(note.title)); + } + + noteAutocompleteService.initNoteAutocomplete(this.$noteAutoComplete); + noteAutocompleteService.showRecentNotes(this.$noteAutoComplete); + } + + async cloneNotesTo(notePath) { + const {noteId, parentNoteId} = treeService.getNoteIdAndParentIdFromNotePath(notePath); + const targetBranchId = await froca.getBranchId(parentNoteId, noteId); + + for (const cloneNoteId of this.clonedNoteIds) { + await branchService.cloneNoteToBranch(cloneNoteId, targetBranchId, this.$clonePrefix.val()); + + const clonedNote = await froca.getNote(cloneNoteId); + const targetNote = await froca.getBranch(targetBranchId).getNote(); + + toastService.showMessage(`Note "${clonedNote.title}" has been cloned into ${targetNote.title}`); + } + } +} diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs index 797bae1b8..ac1f348ab 100644 --- a/src/views/desktop.ejs +++ b/src/views/desktop.ejs @@ -26,7 +26,6 @@ <%- include('dialogs/info.ejs') %> <%- include('dialogs/prompt.ejs') %> <%- include('dialogs/confirm.ejs') %> -<%- include('dialogs/clone_to.ejs') %> <%- include('dialogs/move_to.ejs') %> <%- include('dialogs/delete_notes.ejs') %> diff --git a/src/views/dialogs/clone_to.ejs b/src/views/dialogs/clone_to.ejs deleted file mode 100644 index 93ac01af6..000000000 --- a/src/views/dialogs/clone_to.ejs +++ /dev/null @@ -1,38 +0,0 @@ -