gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

converted help dialog to new pattern

Browse Source
This commit is contained in:
zadam 2022-06-13 00:00:15 +02:00
parent f8fd8e47a9
commit ec6d93b34f
5 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/public/app/dialogs/help.js
View File

@ -1,7 +0,0 @@
import utils from "../services/utils.js";
const $dialog = $("#help-dialog");
export async function showDialog() {
utils.openDialog($dialog);
}

4
src/public/app/layouts/desktop_layout.js
View File

@ -53,6 +53,7 @@ import TocWidget from "../widgets/toc.js";
import BulkActionsDialog from "../widgets/dialogs/bulk_actions.js"; import BulkActionsDialog from "../widgets/dialogs/bulk_actions.js";
import AboutDialog from "../widgets/dialogs/about.js"; import AboutDialog from "../widgets/dialogs/about.js";
import NoteSourceDialog from "../dialogs/note_source.js"; import NoteSourceDialog from "../dialogs/note_source.js";
import HelpDialog from "../widgets/dialogs/help.js";
export default class DesktopLayout { export default class DesktopLayout {
constructor(customWidgets) { constructor(customWidgets) {
@ -180,6 +181,7 @@ export default class DesktopLayout {
) )
.child(new BulkActionsDialog()) .child(new BulkActionsDialog())
.child(new AboutDialog()) .child(new AboutDialog())
.child(new NoteSourceDialog()); .child(new NoteSourceDialog())
.child(new HelpDialog());
} }
} }

4
src/public/app/services/root_command_executor.js
View File

@ -54,10 +54,6 @@ export default class RootCommandExecutor extends Component {
import("../dialogs/options.js").then(d => d.showDialog(openTab)); import("../dialogs/options.js").then(d => d.showDialog(openTab));
} }
showHelpCommand() {
import("../dialogs/help.js").then(d => d.showDialog());
}
async showSQLConsoleCommand() { async showSQLConsoleCommand() {
const sqlConsoleNote = await dateNoteService.createSqlConsole(); const sqlConsoleNote = await dateNoteService.createSqlConsole();

18
src/views/dialogs/help.ejs → src/public/app/widgets/dialogs/help.js
View File

@ -1,4 +1,8 @@
<div id="help-dialog" class="modal" tabindex="-1" role="dialog"> import utils from "../../services/utils.js";
import BasicWidget from "../basic_widget.js";
const TPL = `
<div class="help-dialog modal" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document" style="min-width: 100%; height: 100%; margin: 0;"> <div class="modal-dialog" role="document" style="min-width: 100%; height: 100%; margin: 0;">
<div class="modal-content" style="height: auto;"> <div class="modal-content" style="height: auto;">
<div class="modal-header"> <div class="modal-header">
@ -146,4 +150,14 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>`;
export default class HelpDialog extends BasicWidget {
doRender() {
this.$widget = $(TPL);
}
showHelpEvent() {
utils.openDialog(this.$widget);
}
}

1
src/views/desktop.ejs
View File

@ -30,7 +30,6 @@
<%- include('dialogs/info.ejs') %> <%- include('dialogs/info.ejs') %>
<%- include('dialogs/prompt.ejs') %> <%- include('dialogs/prompt.ejs') %>
<%- include('dialogs/confirm.ejs') %> <%- include('dialogs/confirm.ejs') %>
<%- include('dialogs/help.ejs') %>
<%- include('dialogs/clone_to.ejs') %> <%- include('dialogs/clone_to.ejs') %>
<%- include('dialogs/move_to.ejs') %> <%- include('dialogs/move_to.ejs') %>
<%- include('dialogs/backend_log.ejs') %> <%- include('dialogs/backend_log.ejs') %>