From 1d037d3f0f110a9731393cafdc17a6f75ed1687b Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 16 Jun 2022 20:19:26 +0200 Subject: [PATCH] converted confirm dialog to new pattern --- src/public/app/dialogs/confirm.js | 80 ------------ src/public/app/dialogs/options/shortcuts.js | 5 +- src/public/app/layouts/desktop_layout.js | 4 +- src/public/app/layouts/mobile_layout.js | 6 +- src/public/app/services/hoisted_note.js | 5 +- src/public/app/widgets/dialog.js | 8 +- src/public/app/widgets/dialogs/confirm.js | 116 ++++++++++++++++++ .../app/widgets/dialogs/delete_notes.js | 3 +- src/public/app/widgets/dialogs/move_to.js | 1 - .../app/widgets/dialogs/note_revisions.js | 10 +- .../app/widgets/dialogs/note_type_chooser.js | 2 +- .../app/widgets/dialogs/recent_changes.js | 6 +- src/public/app/widgets/note_type.js | 4 +- src/public/app/widgets/shared_switch.js | 5 +- .../app/widgets/type_widgets/relation_map.js | 8 +- src/views/desktop.ejs | 1 - src/views/dialogs/confirm.ejs | 25 ---- src/views/mobile.ejs | 2 - 18 files changed, 149 insertions(+), 142 deletions(-) delete mode 100644 src/public/app/dialogs/confirm.js create mode 100644 src/public/app/widgets/dialogs/confirm.js delete mode 100644 src/views/dialogs/confirm.ejs diff --git a/src/public/app/dialogs/confirm.js b/src/public/app/dialogs/confirm.js deleted file mode 100644 index a2f9f5b0b..000000000 --- a/src/public/app/dialogs/confirm.js +++ /dev/null @@ -1,80 +0,0 @@ -const $dialog = $("#confirm-dialog"); -const $confirmContent = $("#confirm-dialog-content"); -const $okButton = $("#confirm-dialog-ok-button"); -const $cancelButton = $("#confirm-dialog-cancel-button"); -const $custom = $("#confirm-dialog-custom"); - -const DELETE_NOTE_BUTTON_ID = "confirm-dialog-delete-note"; - -let resolve; -let $originallyFocused; // element focused before the dialog was opened so we can return to it afterwards - -export function confirm(message) { - $originallyFocused = $(':focus'); - - $custom.hide(); - - glob.activeDialog = $dialog; - - if (typeof message === 'string') { - message = $("
").text(message); - } - - $confirmContent.empty().append(message); - - $dialog.modal(); - - return new Promise((res, rej) => { resolve = res; }); -} - -export function confirmDeleteNoteBoxWithNote(title) { - glob.activeDialog = $dialog; - - $confirmContent.text(`Are you sure you want to remove the note "${title}" from relation map?`); - - $custom.empty() - .append("
") - .append($("
").addClass("form-check") - .append($("") - .attr("id", DELETE_NOTE_BUTTON_ID) - .attr("type", "checkbox") - .addClass("form-check-input")) - .append($("