From eaf9218f612f9aa23414decb676d87c812e70f66 Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Wed, 4 Jan 2017 23:59:28 +0800 Subject: [PATCH] Update to show yaml-metadata and diagram parsing error in the view --- public/js/extra.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/public/js/extra.js b/public/js/extra.js index 1f45606..4a9cc76 100644 --- a/public/js/extra.js +++ b/public/js/extra.js @@ -309,6 +309,7 @@ function finishView(view) { svg[0].setAttribute('preserveAspectRatio', 'xMidYMid meet'); } catch (err) { $value.unwrap(); + $value.parent().append('
' + err + '
'); console.warn(err); } }); @@ -332,6 +333,7 @@ function finishView(view) { $value.children().unwrap().unwrap(); } catch (err) { $value.unwrap(); + $value.parent().append('
' + err + '
'); console.warn(err); } }); @@ -380,11 +382,11 @@ function finishView(view) { $ele.html($value.text()); mermaid.init(undefined, $ele); } else { - $value.unwrap(); - console.warn(mermaidError); + throw new Error(mermaidError); } } catch (err) { $value.unwrap(); + $value.parent().append('
' + err + '
'); console.warn(err); } }); @@ -543,6 +545,16 @@ function postProcess(code) { }); } } + // show yaml meta paring error + if (md.metaError) { + var warning = result.find('div#meta-error'); + if (warning && warning.length > 0) { + warning.text(md.metaError) + } else { + warning = $('
' + md.metaError + '
') + result.prepend(warning); + } + } return result; } window.postProcess = postProcess; @@ -1122,7 +1134,9 @@ function meta(state, start, end, silent) { try { md.meta = jsyaml.safeLoad(data.join('\n')) || {}; + delete md.metaError; } catch(err) { + md.metaError = err; console.warn(err); return false; }