Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-08 14:25:51 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/widgets/dialogs/note_revisions.js
#	src/services/handlers.js
#	src/services/hidden_subtree.js
#	src/services/search/services/parse.js
This commit is contained in:
zadam
2023-01-17 22:20:10 +01:00
parent 2fa1d812f6 ef825371cf
commit 6a6ae359b6
30 changed files with 167 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/share/content_renderer.js
View File

@@ -2,6 +2,7 @@ const {JSDOM} = require("jsdom");
const shaca = require("./shaca/shaca");
const assetPath = require("../services/asset_path");
const shareRoot = require('./share_root');
const escapeHtml = require('escape-html');
function getContent(note) {
if (note.isProtected) {
@@ -112,17 +113,17 @@ function renderCode(result) {
function renderMermaid(result) {
result.content = `
<div class="mermaid">${result.content}</div>
<div class="mermaid">${escapeHtml(result.content)}</div>
<hr>
<details>
<summary>Chart source</summary>
<pre>${result.content}</pre>
<pre>${escapeHtml(result.content)}</pre>
</details>`
result.header += `<script src="../../${assetPath}/libraries/mermaid.min.js"></script>`;
}
function renderImage(result, note) {
result.content = `<img src="api/images/${note.noteId}/${note.title}?${note.utcDateModified}">`;
result.content = `<img src="api/images/${note.noteId}/${note.escapedTitle}?${note.utcDateModified}">`;
}
function renderFile(note, result) {