Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-16 10:15:52 +01:00
Code Issues Packages Projects Releases Activity

fix(import/markdown): unable to import code blocks with XML/HTML content if safe mode on (closes #1530)

Browse Source
This commit is contained in:
Elian Doran
2025-03-29 13:47:02 +02:00
parent fd76f8dac9
commit 9a3f765d42
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/services/import/markdown.ts
View File

@@ -20,6 +20,12 @@ class CustomMarkdownRenderer extends Renderer {
return "";
}
// Escape the HTML.
text = utils.escapeHtml(text);
// Unescape &quot
text = text.replace(/"/g, '"');
const ckEditorLanguage = getNormalizedMimeFromMarkdownLanguage(lang);
return `<pre><code class="language-${ckEditorLanguage}">${text}</code></pre>`;
}
@@ -66,6 +72,7 @@ import htmlSanitizer from "../html_sanitizer.js";
import importUtils from "./utils.js";
import { getMimeTypeFromHighlightJs, MIME_TYPE_AUTO, normalizeMimeTypeForCKEditor } from "./mime_type_definitions.js";
import { ADMONITION_TYPE_MAPPINGS } from "../export/markdown.js";
import utils from "../utils.js";
function renderToHtml(content: string, title: string) {
let html = parse(content, {
@@ -75,7 +82,7 @@ function renderToHtml(content: string, title: string) {
// h1 handling needs to come before sanitization
html = importUtils.handleH1(html, title);
html = htmlSanitizer.sanitize(html);
// html = htmlSanitizer.sanitize(html);
// Remove slash for self-closing tags to match CKEditor's approach.
html = html.replace(/<(\w+)([^>]*)\s+\/>/g, "<$1$2>");