diff --git a/src/resources/hoedown.js b/src/resources/hoedown.js index f9995efa..79b608ff 100644 --- a/src/resources/hoedown.js +++ b/src/resources/hoedown.js @@ -9,7 +9,12 @@ var updateHtml = function(html) { if (code.parentElement.tagName.toLowerCase() == 'pre') { if (VEnableMermaid && code.classList.contains('language-mermaid')) { // Mermaid code block. - var graph = mermaidAPI.render('mermaid-diagram-' + mermaidIdx++, code.innerText, function(){}); + try { + var graph = mermaidAPI.render('mermaid-diagram-' + mermaidIdx++, code.innerText, function(){}); + } catch (err) { + content.setLog("err: " + err); + continue; + } var graphDiv = document.createElement('div'); graphDiv.classList.add(VMermaidDivClass); graphDiv.innerHTML = graph; @@ -24,8 +29,12 @@ var updateHtml = function(html) { } } - if (VEnableMathjax && (typeof MathJax != 'undefined')) { - MathJax.Hub.Queue(["Typeset", MathJax.Hub, placeholder]); + if (VEnableMathjax) { + try { + MathJax.Hub.Queue(["Typeset", MathJax.Hub, placeholder]); + } catch (err) { + content.setLog("err: " + err); + } } } diff --git a/src/resources/markdown-it.js b/src/resources/markdown-it.js index bfd7fc30..583b9eab 100644 --- a/src/resources/markdown-it.js +++ b/src/resources/markdown-it.js @@ -170,7 +170,11 @@ var updateText = function(text) { handleToc(needToc); renderMermaid('lang-mermaid'); if (VEnableMathjax) { - MathJax.Hub.Queue(["Typeset", MathJax.Hub, placeholder]); + try { + MathJax.Hub.Queue(["Typeset", MathJax.Hub, placeholder]); + } catch (err) { + content.setLog("err: " + err); + } } } diff --git a/src/resources/markdown_template.js b/src/resources/markdown_template.js index bc7ef3c6..d9cbc9c8 100644 --- a/src/resources/markdown_template.js +++ b/src/resources/markdown_template.js @@ -147,7 +147,12 @@ var renderMermaid = function(className) { var code = codes[i]; if (code.classList.contains(className)) { // Mermaid code block. - var graph = mermaidAPI.render('mermaid-diagram-' + mermaidIdx++, code.innerText, function(){}); + try { + var graph = mermaidAPI.render('mermaid-diagram-' + mermaidIdx++, code.innerText, function(){}); + } catch (err) { + content.setLog("err: " + err); + continue; + } var graphDiv = document.createElement('div'); graphDiv.classList.add(VMermaidDivClass); graphDiv.innerHTML = graph; diff --git a/src/resources/marked.js b/src/resources/marked.js index 42450c7b..ca9913a4 100644 --- a/src/resources/marked.js +++ b/src/resources/marked.js @@ -123,7 +123,11 @@ var updateText = function(text) { handleToc(needToc); renderMermaid('lang-mermaid'); if (VEnableMathjax) { - MathJax.Hub.Queue(["Typeset", MathJax.Hub, placeholder]); + try { + MathJax.Hub.Queue(["Typeset", MathJax.Hub, placeholder]); + } catch (err) { + content.setLog("err: " + err); + } } }; diff --git a/src/resources/vnote.ini b/src/resources/vnote.ini index 3f0bede5..3590d42d 100644 --- a/src/resources/vnote.ini +++ b/src/resources/vnote.ini @@ -13,8 +13,8 @@ language=System editor_font_size=12 ; 0 - Hoedown, 1 - Marked, 2 - Markdown-it markdown_converter=2 -enable_mermaid=true -enable_mathjax=true +enable_mermaid=false +enable_mathjax=false [session] tools_dock_checked=true