diff --git a/src/public/app/dialogs/backend_log.js b/src/public/app/dialogs/backend_log.js deleted file mode 100644 index ac145f13d..000000000 --- a/src/public/app/dialogs/backend_log.js +++ /dev/null @@ -1,28 +0,0 @@ -import server from "../services/server.js"; -import utils from "../services/utils.js"; - -const $dialog = $("#backend-log-dialog"); -const $backendLogTextArea = $("#backend-log-textarea"); -const $refreshBackendLog = $("#refresh-backend-log-button"); - -export async function showDialog() { - utils.openDialog($dialog); - - load(); -} - -function scrollToBottom() { - $backendLogTextArea.scrollTop($backendLogTextArea[0].scrollHeight); -} - -async function load() { - const backendLog = await server.get('backend-log'); - - $backendLogTextArea.text(backendLog); - - scrollToBottom(); -} - -$refreshBackendLog.on('click', load); - -$dialog.on('shown.bs.modal', scrollToBottom); \ No newline at end of file diff --git a/src/public/app/layouts/desktop_layout.js b/src/public/app/layouts/desktop_layout.js index 3bc745601..0b33f9c0c 100644 --- a/src/public/app/layouts/desktop_layout.js +++ b/src/public/app/layouts/desktop_layout.js @@ -55,6 +55,7 @@ import AboutDialog from "../widgets/dialogs/about.js"; import NoteSourceDialog from "../dialogs/note_source.js"; import HelpDialog from "../widgets/dialogs/help.js"; import RecentChangesDialog from "../widgets/dialogs/recent_changes.js"; +import BackendLogDialog from "../widgets/dialogs/backend_log.js"; export default class DesktopLayout { constructor(customWidgets) { @@ -184,6 +185,7 @@ export default class DesktopLayout { .child(new AboutDialog()) .child(new NoteSourceDialog()) .child(new HelpDialog()) - .child(new RecentChangesDialog()); + .child(new RecentChangesDialog()) + .child(new BackendLogDialog()); } } diff --git a/src/public/app/services/root_command_executor.js b/src/public/app/services/root_command_executor.js index 52fe5507a..33a797033 100644 --- a/src/public/app/services/root_command_executor.js +++ b/src/public/app/services/root_command_executor.js @@ -78,10 +78,6 @@ export default class RootCommandExecutor extends Component { this.searchNotesCommand({ancestorNoteId: noteId}); } - showBackendLogCommand() { - import("../dialogs/backend_log.js").then(d => d.showDialog()); - } - openNoteExternallyCommand() { const noteId = appContext.tabManager.getActiveContextNoteId(); diff --git a/src/public/app/widgets/dialogs/backend_log.js b/src/public/app/widgets/dialogs/backend_log.js new file mode 100644 index 000000000..0a6bb3889 --- /dev/null +++ b/src/public/app/widgets/dialogs/backend_log.js @@ -0,0 +1,53 @@ +import server from "../../services/server.js"; +import utils from "../../services/utils.js"; +import BasicWidget from "../basic_widget.js"; + +const TPL = ` +