Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-17 02:30:42 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'beta'

Browse Source 
# Conflicts:
#	src/public/app/layouts/desktop_layout.js
This commit is contained in:
zadam
2023-10-24 00:09:37 +02:00
parent 4773f9392b 1cd391a132
commit 494b240015
21 changed files with 511 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/share/content_renderer.js
View File

@@ -24,7 +24,7 @@ function getContent(note) {
} else if (note.type === 'code') {
renderCode(result);
} else if (note.type === 'mermaid') {
renderMermaid(result);
renderMermaid(result, note);
} else if (note.type === 'image' || note.type === 'canvas') {
renderImage(result, note);
} else if (note.type === 'file') {
@@ -135,15 +135,14 @@ function renderCode(result) {
}
}
function renderMermaid(result) {
function renderMermaid(result, note) {
result.content = `
<div class="mermaid">${escapeHtml(result.content)}</div>
<img src="api/images/${note.noteId}/${note.escapedTitle}?${note.utcDateModified}">
<hr>
<details>
<summary>Chart source</summary>
<pre>${escapeHtml(result.content)}</pre>
</details>`
result.header += `<script src="../../${assetPath}/libraries/mermaid.min.js"></script>`;
}
function renderImage(result, note) {