Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better error handling for Katex and handling of code blocks and inline

pull/219/head
Laurent Cozic 2018-02-05 17:55:35 +00:00
parent 9a06815db9
commit 8ad8b73585
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ReactNativeClient/lib/MdToHtml.js
View File

@ -251,7 +251,11 @@ class MdToHtml {
} }
} }
if (codeBlockHandler) codeBlockHandler.loadAssets(); if (codeBlockHandler) {
codeBlockHandler.loadAssets().catch((error) => {
console.warn('MdToHtml: Error loading assets for ' + codeBlockHandler.name() + ': ', error.message);
});
}
if (t.type === 'image') { if (t.type === 'image') {
if (tokenContent) attrs.push(['title', tokenContent]); if (tokenContent) attrs.push(['title', tokenContent]);
@ -267,7 +271,7 @@ class MdToHtml {
} else { } else {
if (tokenContent) { if (tokenContent) {
if ((isCodeBlock || isInlineCode) && codeBlockHandler) { if ((isCodeBlock || isInlineCode) && codeBlockHandler) {
output = codeBlockHandler.processContent(output, tokenContent); output = codeBlockHandler.processContent(output, tokenContent, isCodeBlock ? 'block' : 'inline');
} else { } else {
output.push(htmlentities(tokenContent)); output.push(htmlentities(tokenContent));
} }

8
ReactNativeClient/lib/MdToHtml_Katex.js
View File

@ -9,9 +9,12 @@ class MdToHtml_Katex {
return 'katex'; return 'katex';
} }
processContent(renderedTokens, content) { processContent(renderedTokens, content, tagType) {
try { try {
const renderered = katex.renderToString(content); let renderered = katex.renderToString(content);
if (tagType === 'block') renderered = '<p>' + renderered + '</p>';
renderedTokens.push(renderered); renderedTokens.push(renderered);
} catch (error) { } catch (error) {
renderedTokens.push('Cannot render Katex content: ' + error.message); renderedTokens.push('Cannot render Katex content: ' + error.message);
@ -33,6 +36,7 @@ class MdToHtml_Katex {
// Fonts must go under the resourceDir directory because this is the baseUrl of NoteBodyViewer // Fonts must go under the resourceDir directory because this is the baseUrl of NoteBodyViewer
const baseDir = Setting.value('resourceDir'); const baseDir = Setting.value('resourceDir');
await shim.fsDriver().mkdir(baseDir + '/fonts'); await shim.fsDriver().mkdir(baseDir + '/fonts');
await shim.fetchBlob('https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.9.0-beta1/fonts/KaTeX_Main-Regular.woff2', { overwrite: false, path: baseDir + '/fonts/KaTeX_Main-Regular.woff2' }); await shim.fetchBlob('https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.9.0-beta1/fonts/KaTeX_Main-Regular.woff2', { overwrite: false, path: baseDir + '/fonts/KaTeX_Main-Regular.woff2' });
await shim.fetchBlob('https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.9.0-beta1/fonts/KaTeX_Math-Italic.woff2', { overwrite: false, path: baseDir + '/fonts/KaTeX_Math-Italic.woff2' }); await shim.fetchBlob('https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.9.0-beta1/fonts/KaTeX_Math-Italic.woff2', { overwrite: false, path: baseDir + '/fonts/KaTeX_Math-Italic.woff2' });
await shim.fetchBlob('https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.9.0-beta1/fonts/KaTeX_Size1-Regular.woff2', { overwrite: false, path: baseDir + '/fonts/KaTeX_Size1-Regular.woff2' }); await shim.fetchBlob('https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.9.0-beta1/fonts/KaTeX_Size1-Regular.woff2', { overwrite: false, path: baseDir + '/fonts/KaTeX_Size1-Regular.woff2' });