Skip to content

Commit

Permalink
Fix for issue #259
Browse files Browse the repository at this point in the history
  • Loading branch information
knsv committed Nov 22, 2015
1 parent a9f4f8e commit 425a83c
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 47 deletions.
28 changes: 16 additions & 12 deletions dist/mermaid.js
Original file line number Diff line number Diff line change
Expand Up @@ -39909,7 +39909,8 @@ var config = {
return d.getMonth();
}]]
},
classDiagram: {}
classDiagram: {},
info: {}
};

Logger.setLogLevel(config.logLevel);
Expand Down Expand Up @@ -40134,18 +40135,21 @@ var render = function render(id, txt, cb, container) {
};

exports.render = function (id, text, cb, containerElement) {
log.info('APA');
if (arguments.length === 1) {
text = id;
id = 'mermaidId0';
}

if (typeof document === 'undefined') {
// Todo handle rendering serverside using phantomjs
} else {
// In browser
return render(id, text, cb, containerElement);
try {
if (arguments.length === 1) {
text = id;
id = 'mermaidId0';
}

if (typeof document === 'undefined') {
// Todo handle rendering serverside using phantomjs
} else {
// In browser
return render(id, text, cb, containerElement);
}
} catch (e) {
log.warn(e);
}
};

var setConf = function setConf(cnf) {
Expand Down
4 changes: 2 additions & 2 deletions dist/mermaid.min.js

Large diffs are not rendered by default.

28 changes: 16 additions & 12 deletions dist/mermaid.slim.js
Original file line number Diff line number Diff line change
Expand Up @@ -30404,7 +30404,8 @@ var config = {
return d.getMonth();
}]]
},
classDiagram: {}
classDiagram: {},
info: {}
};

Logger.setLogLevel(config.logLevel);
Expand Down Expand Up @@ -30629,18 +30630,21 @@ var render = function render(id, txt, cb, container) {
};

exports.render = function (id, text, cb, containerElement) {
log.info('APA');
if (arguments.length === 1) {
text = id;
id = 'mermaidId0';
}

if (typeof document === 'undefined') {
// Todo handle rendering serverside using phantomjs
} else {
// In browser
return render(id, text, cb, containerElement);
try {
if (arguments.length === 1) {
text = id;
id = 'mermaidId0';
}

if (typeof document === 'undefined') {
// Todo handle rendering serverside using phantomjs
} else {
// In browser
return render(id, text, cb, containerElement);
}
} catch (e) {
log.warn(e);
}
};

var setConf = function setConf(cnf) {
Expand Down
2 changes: 1 addition & 1 deletion dist/mermaid.slim.min.js

Large diffs are not rendered by default.

28 changes: 16 additions & 12 deletions dist/mermaidAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -39303,7 +39303,8 @@ var config = {
return d.getMonth();
}]]
},
classDiagram: {}
classDiagram: {},
info: {}
};

Logger.setLogLevel(config.logLevel);
Expand Down Expand Up @@ -39528,18 +39529,21 @@ var render = function render(id, txt, cb, container) {
};

exports.render = function (id, text, cb, containerElement) {
log.info('APA');
if (arguments.length === 1) {
text = id;
id = 'mermaidId0';
}

if (typeof document === 'undefined') {
// Todo handle rendering serverside using phantomjs
} else {
// In browser
return render(id, text, cb, containerElement);
try {
if (arguments.length === 1) {
text = id;
id = 'mermaidId0';
}

if (typeof document === 'undefined') {
// Todo handle rendering serverside using phantomjs
} else {
// In browser
return render(id, text, cb, containerElement);
}
} catch (e) {
log.warn(e);
}
};

var setConf = function setConf(cnf) {
Expand Down
2 changes: 1 addition & 1 deletion dist/mermaidAPI.min.js

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions dist/mermaidAPI.slim.min.js

Large diffs are not rendered by default.

0 comments on commit 425a83c

Please sign in to comment.