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:
zadam
2023-05-17 23:10:02 +02:00
7 changed files with 73 additions and 4 deletions

View File

@@ -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();