gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

make file attachments accessible in revisions dialog

Browse Source
This commit is contained in:
zadam 2023-07-10 20:30:04 +02:00
parent ac9a4b3afc
commit a748710b01
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/becca/entities/bnote.js
View File

@ -1594,7 +1594,11 @@ class BNote extends AbstractBeccaEntity {
revisionAttachment.setContent(noteAttachment.getContent(), {forceSave: true}); revisionAttachment.setContent(noteAttachment.getContent(), {forceSave: true});
// content is rewritten to point to the revision attachments // content is rewritten to point to the revision attachments
noteContent = noteContent.replaceAll(`attachments/${noteAttachment.attachmentId}`, `attachments/${revisionAttachment.attachmentId}`); noteContent = noteContent.replaceAll(`attachments/${noteAttachment.attachmentId}`,
`attachments/${revisionAttachment.attachmentId}`);
noteContent = noteContent.replaceAll(new RegExp(`href="[^"]*attachmentId=${noteAttachment.attachmentId}[^"]*"`, 'gi'),
`href="api/attachments/${revisionAttachment.attachmentId}/download"`);
} }
revision.setContent(noteContent, {forceSave: true}); revision.setContent(noteContent, {forceSave: true});

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

@ -328,7 +328,7 @@ class Froca {
} }
catch (e) { catch (e) {
if (silentNotFoundError) { if (silentNotFoundError) {
logInfo(`Attachment '${attachmentId} not found, but silentNotFoundError is enabled: ` + e.message); logInfo(`Attachment '${attachmentId}' not found, but silentNotFoundError is enabled: ` + e.message);
return null; return null;
} else { } else {
throw e; throw e;

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

@ -228,7 +228,7 @@ function goToLink(evt) {
|| (withinEditLink && (leftClick || middleClick)) || (withinEditLink && (leftClick || middleClick))
|| (outsideOfCKEditor && (leftClick || middleClick)) || (outsideOfCKEditor && (leftClick || middleClick))
) { ) {
if (hrefLink.toLowerCase().startsWith('http')) { if (hrefLink.toLowerCase().startsWith('http') || hrefLink.startsWith("api/")) {
window.open(hrefLink, '_blank'); window.open(hrefLink, '_blank');
} }
else if (hrefLink.toLowerCase().startsWith('file:') && utils.isElectron()) { else if (hrefLink.toLowerCase().startsWith('file:') && utils.isElectron()) {