self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

Desktop: WYSIWYG: Fixed inserting date time and other content inside header

Browse Source
This commit is contained in:
Laurent Cozic
2020-07-04 12:17:30 +01:00
parent 9c057071b5
commit 77a03599de
5 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ReactNativeClient/lib/joplin-renderer/MdToHtml.js
View File

@ -166,6 +166,14 @@ class MdToHtml {
return output;
}
removeMarkdownItWrappingParagraph_(html) {
// <p></p>\n
if (html.length < 8) return html;
if (html.substr(0, 3) !== '<p>') return html;
if (html.slice(-5) !== '</p>\n') return html;
return html.substring(3, html.length - 5);
}
// "style" here is really the theme, as returned by themeStyle()
async render(body, theme = null, options = null) {
options = Object.assign({}, {
@ -305,7 +313,12 @@ class MdToHtml {
if (options.userCss) cssStrings.push(options.userCss);
if (options.bodyOnly) {
output.html = renderedBody;
// Markdown-it wraps any content in <p></p> by default. There's a function to parse without
// adding these tags (https://github.com/markdown-it/markdown-it/issues/540#issuecomment-471123983)
// however when using it, it seems the loaded plugins are not used. In my tests, just changing
// render() to renderInline() means the checkboxes would not longer be rendered. So instead
// of using this function, we manually remove the <p></p> tags.
output.html = this.removeMarkdownItWrappingParagraph_(renderedBody);
output.cssStrings = cssStrings;
} else {
const styleHtml = `<style>${cssStrings.join('\n')}</style>`;