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 branch 'stable'

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/javascripts/services/note_detail_file.js
#	src/services/build.js
This commit is contained in:
zadam 2019-04-22 16:29:16 +02:00
commit a88a00b60e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/public/javascripts/services/note_detail_file.js
View File

@ -34,6 +34,9 @@ async function show() {
else { else {
$previewRow.hide(); $previewRow.hide();
} }
// open doesn't work for protected notes since it works through browser which isn't in protected session
$openButton.toggle(!currentNote.isProtected);
} }
$downloadButton.click(() => utils.download(getFileUrl())); $downloadButton.click(() => utils.download(getFileUrl()));
@ -51,7 +54,7 @@ $openButton.click(() => {
function getFileUrl() { function getFileUrl() {
// electron needs absolute URL so we extract current host, port, protocol // electron needs absolute URL so we extract current host, port, protocol
return utils.getHost() + "/api/notes/" + noteDetailService.getActiveNoteId(); return utils.getHost() + "/api/notes/" + noteDetailService.getActiveNoteId() + "/download";
} }
export default { export default {