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

bugfix: clean up after Mermaid render failure

Browse Source
This commit is contained in:
Le Tan 2017-03-29 21:39:37 +08:00
parent 97dd8c43cc
commit 6949de8723
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/resources/hoedown.js
View File

@ -3,20 +3,22 @@ var placeholder = document.getElementById('placeholder');
var updateHtml = function(html) { var updateHtml = function(html) {
placeholder.innerHTML = html; placeholder.innerHTML = html;
var codes = document.getElementsByTagName('code'); var codes = document.getElementsByTagName('code');
var mermaidIdx = 0; mermaidIdx = 0;
for (var i = 0; i < codes.length; ++i) { for (var i = 0; i < codes.length; ++i) {
var code = codes[i]; var code = codes[i];
if (code.parentElement.tagName.toLowerCase() == 'pre') { if (code.parentElement.tagName.toLowerCase() == 'pre') {
if (VEnableMermaid && code.classList.contains('language-mermaid')) { if (VEnableMermaid && code.classList.contains('language-mermaid')) {
// Mermaid code block. // Mermaid code block.
mermaidParserErr = false; mermaidParserErr = false;
mermaidIdx++;
try { try {
var graph = mermaidAPI.render('mermaid-diagram-' + mermaidIdx++, code.innerText, function(){}); // Do not increment mermaidIdx here.
var graph = mermaidAPI.render('mermaid-diagram-' + mermaidIdx, code.innerText, function(){});
} catch (err) { } catch (err) {
content.setLog("err: " + err); content.setLog("err: " + err);
continue; continue;
} }
if (mermaidParserErr) { if (mermaidParserErr || typeof graph == "undefined") {
continue; continue;
} }
var graphDiv = document.createElement('div'); var graphDiv = document.createElement('div');

16
src/resources/markdown_template.js
View File

@ -137,10 +137,18 @@ document.onkeydown = function(e) {
}; };
var mermaidParserErr = false; var mermaidParserErr = false;
var mermaidIdx = 0;
mermaidAPI.parseError = function(err, hash) { mermaidAPI.parseError = function(err, hash) {
content.setLog("err: " + err); content.setLog("err: " + err);
mermaidParserErr = true; mermaidParserErr = true;
// Clean the container element, or mermaidAPI won't render the graph with
// the same id.
var errGraph = document.getElementById('mermaid-diagram-' + mermaidIdx);
var parentNode = errGraph.parentElement;
parentNode.outerHTML = '';
delete parentNode;
}; };
// @className, the class name of the mermaid code block, such as 'lang-mermaid'. // @className, the class name of the mermaid code block, such as 'lang-mermaid'.
@ -149,19 +157,21 @@ var renderMermaid = function(className) {
return; return;
} }
var codes = document.getElementsByTagName('code'); var codes = document.getElementsByTagName('code');
var mermaidIdx = 0; mermaidIdx = 0;
for (var i = 0; i < codes.length; ++i) { for (var i = 0; i < codes.length; ++i) {
var code = codes[i]; var code = codes[i];
if (code.classList.contains(className)) { if (code.classList.contains(className)) {
// Mermaid code block. // Mermaid code block.
mermaidParserErr = false; mermaidParserErr = false;
mermaidIdx++;
try { try {
var graph = mermaidAPI.render('mermaid-diagram-' + mermaidIdx++, code.innerText, function(){}); // Do not increment mermaidIdx here.
var graph = mermaidAPI.render('mermaid-diagram-' + mermaidIdx, code.innerText, function(){});
} catch (err) { } catch (err) {
content.setLog("err: " + err); content.setLog("err: " + err);
continue; continue;
} }
if (mermaidParserErr) { if (mermaidParserErr || typeof graph == "undefined") {
continue; continue;
} }
var graphDiv = document.createElement('div'); var graphDiv = document.createElement('div');