mirror of
https://github.com/zadam/trilium.git
synced 2025-10-29 01:06:36 +01:00
Merge remote-tracking branch 'origin/master' into next60
# Conflicts: # src/public/app/services/open.js # src/public/app/widgets/buttons/note_actions.js
This commit is contained in:
@@ -54,6 +54,15 @@ export default class RootCommandExecutor extends Component {
|
||||
openService.openNoteExternally(noteId, mime);
|
||||
}
|
||||
}
|
||||
|
||||
openNoteCustomCommand() {
|
||||
const noteId = appContext.tabManager.getActiveContextNoteId();
|
||||
const mime = appContext.tabManager.getActiveContextNoteMime()
|
||||
|
||||
if (noteId) {
|
||||
openService.openNoteCustom(noteId, mime);
|
||||
}
|
||||
}
|
||||
|
||||
enterProtectedSessionCommand() {
|
||||
protectedSessionService.enterProtectedSession();
|
||||
|
||||
Reference in New Issue
Block a user