1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00

Merge branch 'release-1.5' into dev

This commit is contained in:
Laurent Cozic 2021-01-08 17:27:41 +00:00
commit c3e696db5a

View File

@ -1262,6 +1262,12 @@ function renderLine(line: any) {
let hiddenLines = ['<div style="display: none;">']; let hiddenLines = ['<div style="display: none;">'];
hiddenLines = hiddenLines.concat(renderLines(line.lines)); hiddenLines = hiddenLines.concat(renderLines(line.lines));
hiddenLines.push('</div>'); hiddenLines.push('</div>');
// We need to add two new lines after the HTML block, or the Markdown
// after that will not render.
// https://github.com/markdown-it/markdown-it/issues/746
hiddenLines.push(NEWLINE);
hiddenLines.push(NEWLINE);
return hiddenLines; return hiddenLines;
} else if (typeof line === 'object') { } else if (typeof line === 'object') {
console.warn('Unhandled object type:', line); console.warn('Unhandled object type:', line);