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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zadam 2022-09-22 22:53:29 +02:00
commit ce7937a3a3
6 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/services/note_content_renderer.js
View File

@ -74,7 +74,7 @@ async function getRenderedContent(note, options = {}) {
const $openButton = $('<button class="file-open btn btn-primary" type="button">Open</button>'); const $openButton = $('<button class="file-open btn btn-primary" type="button">Open</button>');
$downloadButton.on('click', () => openService.downloadFileNote(note.noteId)); $downloadButton.on('click', () => openService.downloadFileNote(note.noteId));
$openButton.on('click', () => openService.openNoteExternally(note.noteId)); $openButton.on('click', () => openService.openNoteExternally(note.noteId, note.mime));
// open doesn't work for protected notes since it works through browser which isn't in protected session // open doesn't work for protected notes since it works through browser which isn't in protected session
$openButton.toggle(!note.isProtected); $openButton.toggle(!note.isProtected);

13
src/public/app/services/open.js
View File

@ -4,6 +4,9 @@ import server from "./server.js";
function getFileUrl(noteId) { function getFileUrl(noteId) {
return getUrlForDownload("api/notes/" + noteId + "/download"); return getUrlForDownload("api/notes/" + noteId + "/download");
} }
function getOpenFileUrl(noteId) {
return getUrlForDownload("api/notes/" + noteId + "/open");
}
function download(url) { function download(url) {
if (utils.isElectron()) { if (utils.isElectron()) {
@ -21,7 +24,7 @@ function downloadFileNote(noteId) {
download(url); download(url);
} }
async function openNoteExternally(noteId) { async function openNoteExternally(noteId, mime) {
if (utils.isElectron()) { if (utils.isElectron()) {
const resp = await server.post("notes/" + noteId + "/save-to-tmp-dir"); const resp = await server.post("notes/" + noteId + "/save-to-tmp-dir");
@ -34,7 +37,13 @@ async function openNoteExternally(noteId) {
} }
} }
else { else {
window.location.href = getFileUrl(noteId); // allow browser to handle opening common file
if (mime === "application/pdf" || mime.startsWith("image") || mime.startsWith("audio") || mime.startsWith("video")){
window.open(getOpenFileUrl(noteId));
}
else {
window.location.href = getFileUrl(noteId);
}
} }
} }

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

@ -45,9 +45,10 @@ export default class RootCommandExecutor extends Component {
openNoteExternallyCommand() { openNoteExternallyCommand() {
const noteId = appContext.tabManager.getActiveContextNoteId(); const noteId = appContext.tabManager.getActiveContextNoteId();
const mime = appContext.tabManager.getActiveContextNoteMime()
if (noteId) { if (noteId) {
openService.openNoteExternally(noteId); openService.openNoteExternally(noteId, mime);
} }
} }

6
src/public/app/services/tab_manager.js
View File

@ -197,6 +197,12 @@ export default class TabManager extends Component {
return activeNote ? activeNote.type : null; return activeNote ? activeNote.type : null;
} }
/** @returns {string|null} */
getActiveContextNoteMime() {
const activeNote = this.getActiveContextNote();
return activeNote ? activeNote.mime : null;
}
async switchToNoteContext(ntxId, notePath) { async switchToNoteContext(ntxId, notePath) {
const noteContext = this.noteContexts.find(nc => nc.ntxId === ntxId) const noteContext = this.noteContexts.find(nc => nc.ntxId === ntxId)

2
src/public/app/widgets/ribbon_widgets/file_properties.js
View File

@ -90,7 +90,7 @@ export default class FilePropertiesWidget extends NoteContextAwareWidget {
this.$uploadNewRevisionInput = this.$widget.find(".file-upload-new-revision-input"); this.$uploadNewRevisionInput = this.$widget.find(".file-upload-new-revision-input");
this.$downloadButton.on('click', () => openService.downloadFileNote(this.noteId)); this.$downloadButton.on('click', () => openService.downloadFileNote(this.noteId));
this.$openButton.on('click', () => openService.openNoteExternally(this.noteId)); this.$openButton.on('click', () => openService.openNoteExternally(this.noteId, this.note.mime));
this.$uploadNewRevisionButton.on("click", () => { this.$uploadNewRevisionButton.on("click", () => {
this.$uploadNewRevisionInput.trigger("click"); this.$uploadNewRevisionInput.trigger("click");

2
src/public/app/widgets/ribbon_widgets/image_properties.js
View File

@ -69,7 +69,7 @@ export default class ImagePropertiesWidget extends NoteContextAwareWidget {
this.$fileSize = this.$widget.find(".image-filesize"); this.$fileSize = this.$widget.find(".image-filesize");
this.$openButton = this.$widget.find(".image-open"); this.$openButton = this.$widget.find(".image-open");
this.$openButton.on('click', () => openService.openNoteExternally(this.noteId)); this.$openButton.on('click', () => openService.openNoteExternally(this.noteId, this.note.mime ));
this.$imageDownloadButton = this.$widget.find(".image-download"); this.$imageDownloadButton = this.$widget.find(".image-download");
this.$imageDownloadButton.on('click', () => openService.downloadFileNote(this.noteId)); this.$imageDownloadButton.on('click', () => openService.downloadFileNote(this.noteId));