mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for startOnLoad issues

This commit is contained in:
knsv 2015-07-15 11:59:01 +02:00
parent fcb2af780d
commit ed712fa673
7 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dist/mermaid.js vendored
View File

@ -31616,11 +31616,14 @@ var init = function () {
callback = arguments[arguments.length-1];
log.debug('Callback function found');
}else{
if(typeof mermaidAPI.getConfig().mermaid.callback === 'function'){
callback = mermaidAPI.getConfig().mermaid.callback;
log.debug('Callback function found');
}else{
log.debug('No Callback function found');
var conf= mermaidAPI.getConfig();
if(typeof conf.mermaid !== 'undefined'){
if(typeof conf.mermaid.callback === 'function'){
callback = conf.mermaid.callback;
log.debug('Callback function found');
}else{
log.debug('No Callback function found');
}
}
}
nodes = nodes === undefined ? document.querySelectorAll('.mermaid')
@ -31695,11 +31698,13 @@ exports.version = function(){
*/
exports.initialize = function(config){
log.debug('Initializing mermaid');
if(typeof config.mermaid.startOnLoad !== 'undefined'){
global.mermaid.startOnLoad = config.mermaid.startOnLoad;
}
if(typeof config.mermaid.htmlLabels !== 'undefined'){
global.mermaid.htmlLabels = config.mermaid.htmlLabels;
if(typeof config.mermaid !== 'undefined') {
if (typeof config.mermaid.startOnLoad !== 'undefined') {
global.mermaid.startOnLoad = config.mermaid.startOnLoad;
}
if (typeof config.mermaid.htmlLabels !== 'undefined') {
global.mermaid.htmlLabels = config.mermaid.htmlLabels;
}
}
mermaidAPI.initialize(config);
};

2
dist/mermaid.min.js vendored
View File

File diff suppressed because one or more lines are too long

25
dist/mermaid.slim.js vendored
View File

@ -22400,11 +22400,14 @@ var init = function () {
callback = arguments[arguments.length-1];
log.debug('Callback function found');
}else{
if(typeof mermaidAPI.getConfig().mermaid.callback === 'function'){
callback = mermaidAPI.getConfig().mermaid.callback;
log.debug('Callback function found');
}else{
log.debug('No Callback function found');
var conf= mermaidAPI.getConfig();
if(typeof conf.mermaid !== 'undefined'){
if(typeof conf.mermaid.callback === 'function'){
callback = conf.mermaid.callback;
log.debug('Callback function found');
}else{
log.debug('No Callback function found');
}
}
}
nodes = nodes === undefined ? document.querySelectorAll('.mermaid')
@ -22479,11 +22482,13 @@ exports.version = function(){
*/
exports.initialize = function(config){
log.debug('Initializing mermaid');
if(typeof config.mermaid.startOnLoad !== 'undefined'){
global.mermaid.startOnLoad = config.mermaid.startOnLoad;
}
if(typeof config.mermaid.htmlLabels !== 'undefined'){
global.mermaid.htmlLabels = config.mermaid.htmlLabels;
if(typeof config.mermaid !== 'undefined') {
if (typeof config.mermaid.startOnLoad !== 'undefined') {
global.mermaid.startOnLoad = config.mermaid.startOnLoad;
}
if (typeof config.mermaid.htmlLabels !== 'undefined') {
global.mermaid.htmlLabels = config.mermaid.htmlLabels;
}
}
mermaidAPI.initialize(config);
};

2
dist/mermaid.slim.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/mermaidAPI.slim.js vendored
View File

File diff suppressed because one or more lines are too long

25
src/mermaid.js
View File

@ -50,11 +50,14 @@ var init = function () {
callback = arguments[arguments.length-1];
log.debug('Callback function found');
}else{
if(typeof mermaidAPI.getConfig().mermaid.callback === 'function'){
callback = mermaidAPI.getConfig().mermaid.callback;
log.debug('Callback function found');
}else{
log.debug('No Callback function found');
var conf= mermaidAPI.getConfig();
if(typeof conf.mermaid !== 'undefined'){
if(typeof conf.mermaid.callback === 'function'){
callback = conf.mermaid.callback;
log.debug('Callback function found');
}else{
log.debug('No Callback function found');
}
}
}
nodes = nodes === undefined ? document.querySelectorAll('.mermaid')
@ -129,11 +132,13 @@ exports.version = function(){
*/
exports.initialize = function(config){
log.debug('Initializing mermaid');
if(typeof config.mermaid.startOnLoad !== 'undefined'){
global.mermaid.startOnLoad = config.mermaid.startOnLoad;
}
if(typeof config.mermaid.htmlLabels !== 'undefined'){
global.mermaid.htmlLabels = config.mermaid.htmlLabels;
if(typeof config.mermaid !== 'undefined') {
if (typeof config.mermaid.startOnLoad !== 'undefined') {
global.mermaid.startOnLoad = config.mermaid.startOnLoad;
}
if (typeof config.mermaid.htmlLabels !== 'undefined') {
global.mermaid.htmlLabels = config.mermaid.htmlLabels;
}
}
mermaidAPI.initialize(config);
};

2
test/web.html
View File

@ -19,7 +19,7 @@
</script>
<script>
function coolAction(){
console.log('Got callback in user defiend function');
console.log('Got callback in user defined function');
}
</script>
<style>