status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: properly validate mermaid syntax and handle parse error 

Signed-off-by: Max Wu <jackymaxj@gmail.com>
This commit is contained in:
Max Wu 2020-12-21 14:56:40 +08:00
parent 064dfb7865
commit 568355acf5
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
public/js/extra.js
View File

@ -253,7 +253,12 @@ function replaceExtraTags (html) {
return html return html
} }
if (typeof window.mermaid !== 'undefined' && window.mermaid) window.mermaid.startOnLoad = false if (typeof window.mermaid !== 'undefined' && window.mermaid) {
window.mermaid.startOnLoad = false
window.mermaid.parseError = function (err, hash) {
console.warn(err)
}
}
// dynamic event or object binding here // dynamic event or object binding here
export function finishView (view) { export function finishView (view) {
@ -397,13 +402,14 @@ export function finishView (view) {
var $value = $(value) var $value = $(value)
const $ele = $(value).closest('pre') const $ele = $(value).closest('pre')
/* eslint-disable prefer-const */ const text = $value.text()
let text = $value.text() // validate the syntax first
window.mermaid.parse(text) if (window.mermaid.parse(text)) {
$ele.addClass('mermaid') $ele.addClass('mermaid')
$ele.text(text) $ele.text(text)
/* eslint-enable prefer-const */ // render the diagram
window.mermaid.init(undefined, $ele) window.mermaid.init(undefined, $ele)
}
} catch (err) { } catch (err) {
$value.unwrap() $value.unwrap()
$value.parent().append(`<div class="alert alert-warning">${escapeHTML(err.str)}</div>`) $value.parent().append(`<div class="alert alert-warning">${escapeHTML(err.str)}</div>`)