gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

code buttons into the floating buttons (WIP)

Browse Source
This commit is contained in:
zadam 2022-12-20 23:20:59 +01:00
parent 50faa40bad
commit 7a46159539
6 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ import RelationMapButtons from "../widgets/floating_buttons/relation_map_buttons
import MermaidExportButton from "../widgets/floating_buttons/mermaid_export_button.js"; import MermaidExportButton from "../widgets/floating_buttons/mermaid_export_button.js";
import LauncherContainer from "../widgets/containers/launcher_container.js"; import LauncherContainer from "../widgets/containers/launcher_container.js";
import NoteRevisionsButton from "../widgets/buttons/note_revisions_button.js"; import NoteRevisionsButton from "../widgets/buttons/note_revisions_button.js";
import EditableCodeButtonsWidget from "../widgets/type_widgets/editable_code_buttons.js"; import CodeButtonsWidget from "../widgets/floating_buttons/code_buttons.js";
import ApiLogWidget from "../widgets/api_log.js"; import ApiLogWidget from "../widgets/api_log.js";
import HideFloatingButtonsButton from "../widgets/floating_buttons/hide_floating_buttons_button.js"; import HideFloatingButtonsButton from "../widgets/floating_buttons/hide_floating_buttons_button.js";
@ -150,6 +150,7 @@ export default class DesktopLayout {
.child(new NoteUpdateStatusWidget()) .child(new NoteUpdateStatusWidget())
.child(new FloatingButtons() .child(new FloatingButtons()
.child(new EditButton()) .child(new EditButton())
.child(new CodeButtonsWidget())
.child(new RelationMapButtons()) .child(new RelationMapButtons())
.child(new MermaidExportButton()) .child(new MermaidExportButton())
.child(new BacklinksWidget()) .child(new BacklinksWidget())
@ -165,7 +166,6 @@ export default class DesktopLayout {
.child(new SearchResultWidget()) .child(new SearchResultWidget())
.child(new SqlResultWidget()) .child(new SqlResultWidget())
) )
.child(new EditableCodeButtonsWidget())
.child(new ApiLogWidget()) .child(new ApiLogWidget())
.child(new FindWidget()) .child(new FindWidget())
.child( .child(

34
src/public/app/widgets/type_widgets/editable_code_buttons.js → src/public/app/widgets/floating_buttons/code_buttons.js
View File

@ -7,37 +7,28 @@ import NoteContextAwareWidget from "../note_context_aware_widget.js";
import keyboardActionService from "../../services/keyboard_actions.js"; import keyboardActionService from "../../services/keyboard_actions.js";
const TPL = ` const TPL = `
<div class="editable-code-buttons-widget"> <div class="code-buttons-widget">
<style> <style>
.editable-code-buttons-widget { .code-buttons-widget {
display: flex; display: flex;
justify-content: space-evenly; gap: 10px;
padding: 5px; }
height: 45px;
}
</style> </style>
<button data-trigger-command="runActiveNote" <button data-trigger-command="runActiveNote" class="execute-button floating-button btn" title="Execute script">
class="no-print execute-button btn btn-sm">
<span class="bx bx-run"></span> <span class="bx bx-run"></span>
Execute <kbd data-command="runActiveNote"></kbd>
</button> </button>
<button class="no-print trilium-api-docs-button btn btn-sm" <button class="trilium-api-docs-button floating-button btn" title="Open Trilium API docs">
title="Open Trilium API docs">
<span class="bx bx-help-circle"></span> <span class="bx bx-help-circle"></span>
API docs
</button> </button>
<button class="no-print save-to-note-button btn btn-sm"> <button class="save-to-note-button floating-button btn">
<span class="bx bx-save"></span> <span class="bx bx-save"></span>
Save to note</kbd>
</button> </button>
</div>`; </div>`;
export default class EditableCodeButtonsWidget extends NoteContextAwareWidget { export default class CodeButtonsWidget extends NoteContextAwareWidget {
isEnabled() { isEnabled() {
return super.isEnabled() return super.isEnabled()
&& this.note && this.note
@ -48,6 +39,8 @@ export default class EditableCodeButtonsWidget extends NoteContextAwareWidget {
this.$widget = $(TPL); this.$widget = $(TPL);
this.$openTriliumApiDocsButton = this.$widget.find(".trilium-api-docs-button"); this.$openTriliumApiDocsButton = this.$widget.find(".trilium-api-docs-button");
this.$openTriliumApiDocsButton.on("click", () => { this.$openTriliumApiDocsButton.on("click", () => {
toastService.showMessage("Opening API docs...");
if (this.note.mime.endsWith("frontend")) { if (this.note.mime.endsWith("frontend")) {
window.open("https://zadam.github.io/trilium/frontend_api/FrontendScriptApi.html", "_blank"); window.open("https://zadam.github.io/trilium/frontend_api/FrontendScriptApi.html", "_blank");
} }
@ -68,9 +61,10 @@ export default class EditableCodeButtonsWidget extends NoteContextAwareWidget {
toastService.showMessage("SQL Console note has been saved into " + await treeService.getNotePathTitle(notePath)); toastService.showMessage("SQL Console note has been saved into " + await treeService.getNotePathTitle(notePath));
}); });
keyboardActionService.setupActionsForElement('code-detail', this.$widget, this);
keyboardActionService.updateDisplayedShortcuts(this.$widget); keyboardActionService.updateDisplayedShortcuts(this.$widget);
this.contentSized();
super.doRender(); super.doRender();
} }

2
src/public/app/widgets/floating_buttons/floating_buttons.js
View File

@ -1,7 +1,7 @@
import NoteContextAwareWidget from "../note_context_aware_widget.js"; import NoteContextAwareWidget from "../note_context_aware_widget.js";
const TPL = ` const TPL = `
<div class="floating-buttons"> <div class="floating-buttons no-print">
<style> <style>
.floating-buttons { .floating-buttons {
position: relative; position: relative;

2
src/public/app/widgets/floating_buttons/hide_floating_buttons_button.js
View File

@ -26,7 +26,7 @@ const TPL = `
</style> </style>
<button type="button" <button type="button"
class="close-floating-buttons-button btn bx bx-x no-print" class="close-floating-buttons-button btn bx bx-x"
title="Hide buttons"></button> title="Hide buttons"></button>
</div> </div>
`; `;

2
src/public/app/widgets/floating_buttons/mermaid_export_button.js
View File

@ -2,7 +2,7 @@ import NoteContextAwareWidget from "../note_context_aware_widget.js";
const TPL = ` const TPL = `
<button type="button" <button type="button"
class="export-mermaid-button no-print" class="export-mermaid-button"
title="Export Mermaid diagram as SVG"> title="Export Mermaid diagram as SVG">
<span class="bx bx-export"></span> <span class="bx bx-export"></span>
</button> </button>

6
src/public/app/widgets/floating_buttons/relation_map_buttons.js
View File

@ -9,14 +9,14 @@ const TPL = `
</style> </style>
<button type="button" <button type="button"
class="relation-map-create-child-note floating-button btn bx bx-folder-plus no-print" class="relation-map-create-child-note floating-button btn bx bx-folder-plus"
title="Create new child note and add it into this relation map"></button> title="Create new child note and add it into this relation map"></button>
<button type="button" <button type="button"
class="relation-map-reset-pan-zoom floating-button btn bx bx-crop no-print" class="relation-map-reset-pan-zoom floating-button btn bx bx-crop"
title="Reset pan & zoom to initial coordinates and magnification"></button> title="Reset pan & zoom to initial coordinates and magnification"></button>
<div class="btn-group no-print"> <div class="btn-group">
<button type="button" <button type="button"
class="relation-map-zoom-in floating-button btn bx bx-zoom-in" class="relation-map-zoom-in floating-button btn bx bx-zoom-in"
title="Zoom In"></button> title="Zoom In"></button>