Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-07 05:46:10 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/master' into next60

Browse Source 
# Conflicts:
#	src/public/app/services/open.js
#	src/public/app/widgets/buttons/note_actions.js
This commit is contained in:
zadam
2023-05-17 23:10:02 +02:00
parent 76196ed42c da348075e8
commit af95d387b9
7 changed files with 73 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/public/app/widgets/buttons/note_actions.js
View File

@@ -40,6 +40,7 @@ const TPL = `
<kbd data-command="openNoteExternally"></kbd>
Open note externally
</a>
<a data-trigger-command="openNoteCustom" class="dropdown-item open-note-custom-button"><kbd data-command="openNoteCustom"></kbd> Open note custom (beta)</a>
<a class="dropdown-item import-files-button">Import files</a>
<a class="dropdown-item export-note-button">Export note</a>
<a class="dropdown-item delete-note-button">Delete note</a>
@@ -79,6 +80,7 @@ export default class NoteActionsWidget extends NoteContextAwareWidget {
this.$widget.on('click', '.dropdown-item', () => this.$widget.find("[data-toggle='dropdown']").dropdown('toggle'));
this.$openNoteExternallyButton = this.$widget.find(".open-note-externally-button");
this.$openNoteCustomButton = this.$widget.find(".open-note-custom-button");
this.$deleteNoteButton = this.$widget.find(".delete-note-button");
this.$deleteNoteButton.on("click", () => {
@@ -102,6 +104,7 @@ export default class NoteActionsWidget extends NoteContextAwareWidget {
this.$renderNoteButton.toggle(note.type === 'render');
this.$openNoteExternallyButton.toggle(utils.isElectron());
this.$openNoteCustomButton.toggle(utils.isElectron());
}
async convertNoteIntoAttachmentCommand() {