From 08b04e9528cc12f1fe7dcedaab8ce10ab8f6c97f Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Wed, 4 Jan 2017 23:59:12 +0800 Subject: [PATCH] Workaround that graphviz might not recover from error --- public/js/extra.js | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/public/js/extra.js b/public/js/extra.js index ba61a669c..1f45606a0 100644 --- a/public/js/extra.js +++ b/public/js/extra.js @@ -11,6 +11,7 @@ var PDFObject = require('pdfobject'); var S = require('string'); var saveAs = require('file-saver').saveAs; require('../vendor/md-toc'); +var Viz = require("viz.js"); //auto update last change window.createtime = null; @@ -335,22 +336,31 @@ function finishView(view) { } }); //graphviz - var Viz = require("viz.js"); var graphvizs = view.find("div.graphviz.raw").removeClass("raw"); + function parseGraphviz(key, value) { + var $value = $(value); + var $ele = $(value).parent().parent(); + + var graphviz = Viz($value.text()); + if (!graphviz) throw Error('viz.js output empty graph'); + $value.html(graphviz); + + $ele.addClass('graphviz'); + $value.children().unwrap().unwrap(); + } graphvizs.each(function (key, value) { try { - var $value = $(value); - var $ele = $(value).parent().parent(); - - var graphviz = Viz($value.text()); - if (!graphviz) throw Error('viz.js output empty graph'); - $value.html(graphviz); - - $ele.addClass('graphviz'); - $value.children().unwrap().unwrap(); + parseGraphviz(key, value); } catch (err) { - $value.unwrap(); - console.warn(err); + // workaround for graphviz not recover from error + try { + parseGraphviz(key, value); + } catch (err) { + var $value = $(value); + $value.unwrap(); + $value.parent().append('
' + err + '
'); + console.warn(err); + } } }); //mermaid