diff --git a/src/public/app/dialogs/about.js b/src/public/app/dialogs/about.js deleted file mode 100644 index 0b48712e4..000000000 --- a/src/public/app/dialogs/about.js +++ /dev/null @@ -1,24 +0,0 @@ -import server from "../services/server.js"; -import utils from "../services/utils.js"; - -const $dialog = $("#about-dialog"); -const $appVersion = $("#app-version"); -const $dbVersion = $("#db-version"); -const $syncVersion = $("#sync-version"); -const $buildDate = $("#build-date"); -const $buildRevision = $("#build-revision"); -const $dataDirectory = $("#data-directory"); - -export async function showDialog() { - const appInfo = await server.get('app-info'); - - $appVersion.text(appInfo.appVersion); - $dbVersion.text(appInfo.dbVersion); - $syncVersion.text(appInfo.syncVersion); - $buildDate.text(appInfo.buildDate); - $buildRevision.text(appInfo.buildRevision); - $buildRevision.attr('href', 'https://github.com/zadam/trilium/commit/' + appInfo.buildRevision); - $dataDirectory.text(appInfo.dataDirectory); - - utils.openDialog($dialog); -} \ 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 cc70dce10..e20513434 100644 --- a/src/public/app/layouts/desktop_layout.js +++ b/src/public/app/layouts/desktop_layout.js @@ -51,6 +51,7 @@ import SharedInfoWidget from "../widgets/shared_info.js"; import FindWidget from "../widgets/find.js"; import TocWidget from "../widgets/toc.js"; import BulkActionsDialog from "../widgets/dialogs/bulk_actions.js"; +import AboutDialog from "../widgets/dialogs/about.js"; export default class DesktopLayout { constructor(customWidgets) { @@ -176,6 +177,7 @@ export default class DesktopLayout { ) ) ) - .child(new BulkActionsDialog()); + .child(new BulkActionsDialog()) + .child(new AboutDialog()); } } diff --git a/src/public/app/widgets/buttons/global_menu.js b/src/public/app/widgets/buttons/global_menu.js index 93f7c8678..6dc1295c3 100644 --- a/src/public/app/widgets/buttons/global_menu.js +++ b/src/public/app/widgets/buttons/global_menu.js @@ -132,8 +132,7 @@ export default class GlobalMenuWidget extends BasicWidget { $button.tooltip({ trigger: "hover" }); $button.on("click", () => $button.tooltip("hide")); - this.$widget.find(".show-about-dialog-button").on('click', - () => import("../../dialogs/about.js").then(d => d.showDialog())); + this.$widget.find(".show-about-dialog-button").on('click', () => this.triggerCommand("openAboutDialog")); const isElectron = utils.isElectron(); diff --git a/src/public/app/widgets/dialogs/about.js b/src/public/app/widgets/dialogs/about.js new file mode 100644 index 000000000..2c62a577e --- /dev/null +++ b/src/public/app/widgets/dialogs/about.js @@ -0,0 +1,84 @@ +import server from "../../services/server.js"; +import utils from "../../services/utils.js"; +import BasicWidget from "../basic_widget.js"; + +const TPL = ` +`; + +export default class AboutDialog extends BasicWidget { + doRender() { + this.$widget = $(TPL); + + this.$dialog = this.$widget.find(".about-dialog"); + this.$appVersion = this.$widget.find(".app-version"); + this.$dbVersion = this.$widget.find(".db-version"); + this.$syncVersion = this.$widget.find(".sync-version"); + this.$buildDate = this.$widget.find(".build-date"); + this.$buildRevision = this.$widget.find(".build-revision"); + this.$dataDirectory = this.$widget.find(".data-directory"); + } + + async refresh() { + const appInfo = await server.get('app-info'); + + this.$appVersion.text(appInfo.appVersion); + this.$dbVersion.text(appInfo.dbVersion); + this.$syncVersion.text(appInfo.syncVersion); + this.$buildDate.text(appInfo.buildDate); + this.$buildRevision.text(appInfo.buildRevision); + this.$buildRevision.attr('href', 'https://github.com/zadam/trilium/commit/' + appInfo.buildRevision); + this.$dataDirectory.text(appInfo.dataDirectory); + } + + async openAboutDialogEvent() { + await this.refresh(); + + utils.openDialog(this.$widget); + } +} diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs index f5a7fd308..a09e704a4 100644 --- a/src/views/desktop.ejs +++ b/src/views/desktop.ejs @@ -17,7 +17,6 @@ -<%- include('dialogs/about.ejs') %> <%- include('dialogs/add_link.ejs') %> <%- include('dialogs/branch_prefix.ejs') %> <%- include('dialogs/export.ejs') %> diff --git a/src/views/dialogs/about.ejs b/src/views/dialogs/about.ejs deleted file mode 100644 index e01747e1e..000000000 --- a/src/views/dialogs/about.ejs +++ /dev/null @@ -1,47 +0,0 @@ -