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 Packages Projects Releases Wiki Activity

fix display of note revision content, #3637

Browse Source
This commit is contained in:
zadam 2023-02-27 22:58:02 +01:00
parent ec8ed65feb
commit ee2953a5e1
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/becca/entities/bnote_revision.js
View File

@ -166,12 +166,14 @@ class BNoteRevision extends AbstractBeccaEntity {
utcDateLastEdited: this.utcDateLastEdited, utcDateLastEdited: this.utcDateLastEdited,
utcDateCreated: this.utcDateCreated, utcDateCreated: this.utcDateCreated,
utcDateModified: this.utcDateModified, utcDateModified: this.utcDateModified,
content: this.content, // used when retrieving full note revision to frontend
contentLength: this.contentLength contentLength: this.contentLength
}; };
} }
getPojoToSave() { getPojoToSave() {
const pojo = this.getPojo(); const pojo = this.getPojo();
delete pojo.content; // not getting persisted
delete pojo.contentLength; // not getting persisted delete pojo.contentLength; // not getting persisted
if (pojo.isProtected) { if (pojo.isProtected) {

34
src/public/app/widgets/dialogs/note_revisions.js
View File

@ -172,11 +172,16 @@ export default class NoteRevisionsDialog extends BasicWidget {
const revisionItem = this.revisionItems.find(r => r.noteRevisionId === noteRevisionId); const revisionItem = this.revisionItems.find(r => r.noteRevisionId === noteRevisionId);
this.$titleButtons.empty();
this.$content.empty();
this.$title.html(revisionItem.title); this.$title.html(revisionItem.title);
this.renderContentButtons(revisionItem);
await this.renderContent(revisionItem);
}
renderContentButtons(revisionItem) {
this.$titleButtons.empty();
const $restoreRevisionButton = $('<button class="btn btn-sm" type="button">Restore this revision</button>'); const $restoreRevisionButton = $('<button class="btn btn-sm" type="button">Restore this revision</button>');
$restoreRevisionButton.on('click', async () => { $restoreRevisionButton.on('click', async () => {
@ -222,9 +227,15 @@ export default class NoteRevisionsDialog extends BasicWidget {
if (!revisionItem.isProtected || protectedSessionHolder.isProtectedSessionAvailable()) { if (!revisionItem.isProtected || protectedSessionHolder.isProtectedSessionAvailable()) {
this.$titleButtons.append($downloadButton); this.$titleButtons.append($downloadButton);
} }
}
async renderContent(revisionItem) {
this.$content.empty();
const fullNoteRevision = await server.get(`notes/${revisionItem.noteId}/revisions/${revisionItem.noteRevisionId}`); const fullNoteRevision = await server.get(`notes/${revisionItem.noteId}/revisions/${revisionItem.noteRevisionId}`);
console.log(fullNoteRevision);
if (revisionItem.type === 'text') { if (revisionItem.type === 'text') {
this.$content.html(fullNoteRevision.content); this.$content.html(fullNoteRevision.content);
@ -233,19 +244,16 @@ export default class NoteRevisionsDialog extends BasicWidget {
renderMathInElement($content[0], {trust: true}); renderMathInElement($content[0], {trust: true});
} }
} } else if (revisionItem.type === 'code' || revisionItem.type === 'mermaid') {
else if (revisionItem.type === 'code' || revisionItem.type === 'mermaid') {
this.$content.html($("<pre>").text(fullNoteRevision.content)); this.$content.html($("<pre>").text(fullNoteRevision.content));
} } else if (revisionItem.type === 'image') {
else if (revisionItem.type === 'image') {
this.$content.html($("<img>") this.$content.html($("<img>")
// reason why we put this inline as base64 is that we do not want to let user copy this // reason why we put this inline as base64 is that we do not want to let user copy this
// as a URL to be used in a note. Instead, if they copy and paste it into a note, it will be an uploaded as a new note // as a URL to be used in a note. Instead, if they copy and paste it into a note, it will be an uploaded as a new note
.attr("src", `data:${fullNoteRevision.mime};base64,${fullNoteRevision.content}`) .attr("src", `data:${fullNoteRevision.mime};base64,${fullNoteRevision.content}`)
.css("max-width", "100%") .css("max-width", "100%")
.css("max-height", "100%")); .css("max-height", "100%"));
} } else if (revisionItem.type === 'file') {
else if (revisionItem.type === 'file') {
const $table = $("<table cellpadding='10'>") const $table = $("<table cellpadding='10'>")
.append($("<tr>").append( .append($("<tr>").append(
$("<th>").text("MIME: "), $("<th>").text("MIME: "),
@ -267,8 +275,7 @@ export default class NoteRevisionsDialog extends BasicWidget {
} }
this.$content.html($table); this.$content.html($table);
} } else if (revisionItem.type === 'canvas') {
else if (revisionItem.type === 'canvas') {
/** /**
* FIXME: We load a font called Virgil.wof2, which originates from excalidraw.com * FIXME: We load a font called Virgil.wof2, which originates from excalidraw.com
* REMOVE external dependency!!!! This is defined in the svg in defs.style * REMOVE external dependency!!!! This is defined in the svg in defs.style
@ -285,12 +292,11 @@ export default class NoteRevisionsDialog extends BasicWidget {
*/ */
const $svgHtml = $(svg).css({maxWidth: "100%", height: "auto"}); const $svgHtml = $(svg).css({maxWidth: "100%", height: "auto"});
this.$content.html($('<div>').append($svgHtml)); this.$content.html($('<div>').append($svgHtml));
} catch(err) { } catch (err) {
console.error("error parsing fullNoteRevision.content as JSON", fullNoteRevision.content, err); console.error("error parsing fullNoteRevision.content as JSON", fullNoteRevision.content, err);
this.$content.html($("<div>").text("Error parsing content. Please check console.error() for more details.")); this.$content.html($("<div>").text("Error parsing content. Please check console.error() for more details."));
} }
} } else {
else {
this.$content.text("Preview isn't available for this note type."); this.$content.text("Preview isn't available for this note type.");
} }
} }