Skip to content

Commit b2701ca

Browse files
YukaiiYukaii
committed
Fix viz.js@2 api changes
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
1 parent fdbfb71 commit b2701ca

5 files changed

Lines changed: 25 additions & 15 deletions

File tree

‎public/js/extra.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-env browser, jquery */
2-
/* global moment, serverurl, plantumlServer */
2+
/* global moment, serverurl, plantumlServer, Viz */
33

44
import Prism from 'prismjs'
55
import hljs from 'highlight.js'
@@ -30,7 +30,7 @@ require('prismjs/components/prism-gherkin')
3030

3131
require('./lib/common/login')
3232
require('../vendor/md-toc')
33-
var Viz = require('viz.js')
33+
const viz = new window.Viz()
3434
const plantumlEncoder = require('plantuml-encoder')
3535

3636
const ui = getUIElements()
@@ -369,13 +369,15 @@ export function finishView (view) {
369369
try {
370370
var $value = $(value)
371371
var $ele = $(value).parent().parent()
372+
$value.unwrap()
373+
viz.renderString($value.text())
374+
.then(graphviz => {
375+
if (!graphviz) throw Error('viz.js output empty graph')
376+
$value.html(graphviz)
372377

373-
var graphviz = Viz($value.text())
374-
if (!graphviz) throw Error('viz.js output empty graph')
375-
$value.html(graphviz)
376-
377-
$ele.addClass('graphviz')
378-
$value.children().unwrap().unwrap()
378+
$ele.addClass('graphviz')
379+
$value.children().unwrap()
380+
})
379381
} catch (err) {
380382
$value.unwrap()
381383
$value.parent().append(`<div class="alert alert-warning">${escapeHTML(err)}</div>`)

‎public/views/codimd/foot.ejs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
<script src="https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.6/handlebars.min.js" integrity="sha256-1O3BtOwnPyyRzOszK6P+gqaRoXHV6JXj8HkjZmPYhCI=" crossorigin="anonymous" defer></script>
1818
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" integrity="sha256-/BfiIkHlHoVihZdc6TFuj7MmJ0TWcWsMXkeDFwhi0zw=" crossorigin="anonymous" defer></script>
1919
<script src="https://cdnjs.cloudflare.com/ajax/libs/gist-embed/2.6.0/gist-embed.min.js" integrity="sha256-KyF2D6xPIJUW5sUDSs93vWyZm+1RzIpKCexxElmxl8g=" crossorigin="anonymous" defer></script>
20-
<script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/1.7.0/viz.js" integrity="sha256-8t+rndrF+TU4JtelmOH1lDHTMe2ovhO2UbzDArp5lY8=" crossorigin="anonymous" defer></script>
20+
<script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/2.1.2/viz.js" integrity="sha256-8RHyK+AFzq9iXwbFo2unqidwPbwHU5FFWe3RwkcVtuU=" crossorigin="anonymous" defer></script>
21+
<script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/2.1.2/full.render.js" integrity="sha256-Ogqs510LFnekr9o7OLdpelaaAmNss9egQRTyzCqV2NQ=" crossorigin="anonymous" defer></script>
2122
<script src="https://cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.8/validator.min.js" integrity="sha256-LHeY7YoYJ0SSXbCx7sR14Pqna+52moaH3bhv0Mjzd/M=" crossorigin="anonymous" defer></script>
2223
<script src="https://cdnjs.cloudflare.com/ajax/libs/abcjs/3.1.1/abcjs_basic-min.js" integrity="sha256-Sq1r2XXWXQoShQKsS0Wrf5r7fRkErd9Fat9vHYeU68s=" crossorigin="anonymous" defer></script>
2324
<script src="https://cdnjs.cloudflare.com/ajax/libs/vega/5.4.0/vega.min.js" integrity="sha256-PrkRj4B3I5V9yHBLdO3jyyqNUwSKS1CXXIh3VrnFPEU=" crossorigin="anonymous" defer></script>

‎public/views/pretty.ejs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@
8787
<script src="https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.6/handlebars.min.js" integrity="sha256-1O3BtOwnPyyRzOszK6P+gqaRoXHV6JXj8HkjZmPYhCI=" crossorigin="anonymous" defer></script>
8888
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" integrity="sha256-/BfiIkHlHoVihZdc6TFuj7MmJ0TWcWsMXkeDFwhi0zw=" crossorigin="anonymous" defer></script>
8989
<script src="https://cdnjs.cloudflare.com/ajax/libs/gist-embed/2.6.0/gist-embed.min.js" integrity="sha256-KyF2D6xPIJUW5sUDSs93vWyZm+1RzIpKCexxElmxl8g=" crossorigin="anonymous" defer></script>
90-
<script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/1.7.0/viz.js" integrity="sha256-8t+rndrF+TU4JtelmOH1lDHTMe2ovhO2UbzDArp5lY8=" crossorigin="anonymous" defer></script>
90+
<script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/2.1.2/viz.js" integrity="sha256-8RHyK+AFzq9iXwbFo2unqidwPbwHU5FFWe3RwkcVtuU=" crossorigin="anonymous" defer></script>
91+
<script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/2.1.2/full.render.js" integrity="sha256-Ogqs510LFnekr9o7OLdpelaaAmNss9egQRTyzCqV2NQ=" crossorigin="anonymous" defer></script>
9192
<script src="https://cdnjs.cloudflare.com/ajax/libs/abcjs/3.1.1/abcjs_basic-min.js" integrity="sha256-Sq1r2XXWXQoShQKsS0Wrf5r7fRkErd9Fat9vHYeU68s=" crossorigin="anonymous" defer></script>
9293
<script src="https://cdnjs.cloudflare.com/ajax/libs/vega/5.4.0/vega.min.js" integrity="sha256-PrkRj4B3I5V9yHBLdO3jyyqNUwSKS1CXXIh3VrnFPEU=" crossorigin="anonymous" defer></script>
9394
<script src="https://cdnjs.cloudflare.com/ajax/libs/vega-lite/3.4.0/vega-lite.min.js" integrity="sha256-ro+FWr16NboXJ5rSwInNli1P16ObUXnWUJMgKc8KnHI=" crossorigin="anonymous" defer></script>

‎public/views/slide.ejs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@
103103
<script src="https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.1.2/handlebars.min.js" integrity="sha256-1O3BtOwnPyyRzOszK6P+gqaRoXHV6JXj8HkjZmPYhCI=" crossorigin="anonymous" defer></script>
104104
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.9/highlight.min.js" integrity="sha256-/BfiIkHlHoVihZdc6TFuj7MmJ0TWcWsMXkeDFwhi0zw=" crossorigin="anonymous" defer></script>
105105
<script src="https://cdnjs.cloudflare.com/ajax/libs/gist-embed/2.6.0/gist-embed.min.js" integrity="sha256-KyF2D6xPIJUW5sUDSs93vWyZm+1RzIpKCexxElmxl8g=" crossorigin="anonymous" defer></script>
106-
<script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/2.1.2/viz.js" integrity="sha256-8t+rndrF+TU4JtelmOH1lDHTMe2ovhO2UbzDArp5lY8=" crossorigin="anonymous" defer></script>
106+
<script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/2.1.2/viz.js" integrity="sha256-8RHyK+AFzq9iXwbFo2unqidwPbwHU5FFWe3RwkcVtuU=" crossorigin="anonymous" defer></script>
107+
<script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/2.1.2/full.render.js" integrity="sha256-Ogqs510LFnekr9o7OLdpelaaAmNss9egQRTyzCqV2NQ=" crossorigin="anonymous" defer></script>
107108
<script src="https://cdnjs.cloudflare.com/ajax/libs/abcjs/3.1.1/abcjs_basic-min.js" integrity="sha256-Sq1r2XXWXQoShQKsS0Wrf5r7fRkErd9Fat9vHYeU68s=" crossorigin="anonymous" defer></script>
108109
<script src="https://cdnjs.cloudflare.com/ajax/libs/vega/5.4.0/vega.min.js" integrity="sha256-PrkRj4B3I5V9yHBLdO3jyyqNUwSKS1CXXIh3VrnFPEU=" crossorigin="anonymous" defer></script>
109110
<script src="https://cdnjs.cloudflare.com/ajax/libs/vega-lite/3.4.0/vega-lite.min.js" integrity="sha256-ro+FWr16NboXJ5rSwInNli1P16ObUXnWUJMgKc8KnHI=" crossorigin="anonymous" defer></script>

‎webpack.common.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,8 @@ module.exports = {
259259
'script-loader!ot',
260260
'flowchart.js',
261261
'imports-loader?Raphael=raphael!js-sequence-diagrams',
262-
'expose-loader?Viz!viz.js',
262+
'script-loader!viz.js',
263+
'script-loader!viz.render.js',
263264
'script-loader!abcjs',
264265
'script-loader!vega',
265266
'script-loader!vega-lite',
@@ -297,7 +298,8 @@ module.exports = {
297298
'script-loader!gist-embed',
298299
'flowchart.js',
299300
'imports-loader?Raphael=raphael!js-sequence-diagrams',
300-
'expose-loader?Viz!viz.js',
301+
'script-loader!viz.js',
302+
'script-loader!viz.render.js',
301303
'script-loader!abcjs',
302304
'script-loader!vega',
303305
'script-loader!vega-lite',
@@ -338,7 +340,8 @@ module.exports = {
338340
'script-loader!gist-embed',
339341
'flowchart.js',
340342
'imports-loader?Raphael=raphael!js-sequence-diagrams',
341-
'expose-loader?Viz!viz.js',
343+
'script-loader!viz.js',
344+
'script-loader!viz.render.js',
342345
'script-loader!abcjs',
343346
'script-loader!vega',
344347
'script-loader!vega-lite',
@@ -380,7 +383,9 @@ module.exports = {
380383
'vega-lite': path.join(__dirname, 'node_modules/vega-lite/build/vega-lite.min.js'),
381384
'vega-embed': path.join(__dirname, 'node_modules/vega-embed/build/vega-embed.min.js'),
382385
'emojify.js': path.join(__dirname, 'node_modules/@hackmd/emojify.js/dist/js/emojify-browser.min.js'),
383-
'markdown-it': path.join(__dirname, 'node_modules/markdown-it/dist/markdown-it.js')
386+
'markdown-it': path.join(__dirname, 'node_modules/markdown-it/dist/markdown-it.js'),
387+
'viz.js': path.join(__dirname, 'node_modules/viz.js/viz.js'),
388+
'viz.render.js': path.join(__dirname, 'node_modules/viz.js/full.render.js')
384389
}
385390
},
386391

0 commit comments

Comments
 (0)