dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 05:49:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: Mermaid parser error will not throw exception

Browse Source
This commit is contained in:
Le Tan 2017-03-27 19:49:00 +08:00
parent 3406eab29c
commit b690db3502
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/resources/hoedown.js
View File

@ -9,12 +9,16 @@ var updateHtml = function(html) {
if (code.parentElement.tagName.toLowerCase() == 'pre') {
if (VEnableMermaid && code.classList.contains('language-mermaid')) {
// Mermaid code block.
mermaidParserErr = false;
try {
var graph = mermaidAPI.render('mermaid-diagram-' + mermaidIdx++, code.innerText, function(){});
} catch (err) {
content.setLog("err: " + err);
continue;
}
if (mermaidParserErr) {
continue;
}
var graphDiv = document.createElement('div');
graphDiv.classList.add(VMermaidDivClass);
graphDiv.innerHTML = graph;
@ -29,12 +33,13 @@ var updateHtml = function(html) {
}
}
if (VEnableMathjax) {
// MathJax may be not loaded for now.
if (VEnableMathjax && (typeof MathJax != "undefined")) {
try {
MathJax.Hub.Queue(["Typeset", MathJax.Hub, placeholder]);
} catch (err) {
content.setLog("err: " + err);
}
}
}
};

2
src/resources/markdown-it.js
View File

@ -176,5 +176,5 @@ var updateText = function(text) {
content.setLog("err: " + err);
}
}
}
};

17
src/resources/markdown_template.js
View File

@ -56,7 +56,7 @@ window.onscroll = function() {
if (curHeader != null) {
content.setHeader(curHeader);
}
}
};
document.onkeydown = function(e) {
e = e || window.event;
@ -134,7 +134,14 @@ document.onkeydown = function(e) {
return;
}
e.preventDefault();
}
};
var mermaidParserErr = false;
mermaidAPI.parseError = function(err, hash) {
content.setLog("err: " + err);
mermaidParserErr = true;
};
// @className, the class name of the mermaid code block, such as 'lang-mermaid'.
var renderMermaid = function(className) {
@ -147,12 +154,16 @@ var renderMermaid = function(className) {
var code = codes[i];
if (code.classList.contains(className)) {
// Mermaid code block.
mermaidParserErr = false;
try {
var graph = mermaidAPI.render('mermaid-diagram-' + mermaidIdx++, code.innerText, function(){});
} catch (err) {
content.setLog("err: " + err);
continue;
}
if (mermaidParserErr) {
continue;
}
var graphDiv = document.createElement('div');
graphDiv.classList.add(VMermaidDivClass);
graphDiv.innerHTML = graph;
@ -163,4 +174,4 @@ var renderMermaid = function(className) {
--i;
}
}
}
};