minor fix

This commit is contained in:
Xuan Sang LE 2018-03-17 23:15:52 +01:00
parent 5c5517e685
commit a111162e7b
2 changed files with 15 additions and 9 deletions

View File

@ -77,9 +77,9 @@ class BaseModel
@dialog.title = title @dialog.title = title
@dialog.init() @dialog.init()
publish: (t, m) -> publish: (t, m, e) ->
mt = @meta() mt = @meta()
_courrier.trigger t, { id: @pid, name: @name, data: { m: m, icon: mt.icon, iconclass: mt.iconclass } } _courrier.trigger t, { id: @pid, name: @name, data: { m: m, icon: mt.icon, iconclass: mt.iconclass }, error: e }
notify: (m) -> notify: (m) ->
@publish "notification", m @publish "notification", m
@ -88,7 +88,7 @@ class BaseModel
@publish "warning", m @publish "warning", m
error: (m) -> error: (m) ->
@publish "error", m + (@_api.throwe @name) @publish "error", m, (@_api.throwe @name)
fail: (m) -> fail: (m) ->
@publish "fail", m @publish "fail", m

View File

@ -178,12 +178,18 @@ class GraphEditor extends this.OS.GUI.BaseApplication
renderSVG: (silent) -> renderSVG: (silent) ->
me = @ me = @
id = Math.floor(Math.random() * 100000) + 1 id = Math.floor(Math.random() * 100000) + 1
if silent #if silent
mermaid.parseError = (e, h) -> # mermaid.parseError = (e, h) ->
else #else
mermaid.parseError = (e, h) -> # mermaid.parseError = (e, h) ->
me.error e # me.error e
mermaid.render "c#{id}", @editor.getValue(), (text, f) -> text = @editor.getValue()
try
mermaid.parse text
catch e
me.error __("Syntax error: {0}", e.str) if not silent
return
mermaid.render "c#{id}", text, (text, f) ->
me.preview.innerHTML = text me.preview.innerHTML = text
$(me.preview).append me.btctn $(me.preview).append me.btctn
me.calibrate() me.calibrate()