Fix for startOnLoad issues

mermaid-js · Jul 15, 2015 · ed712fa · ed712fa
1 parent fcb2af7
commit ed712fa
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 34 deletions.
diff --git a/dist/mermaid.js b/dist/mermaid.js
@@ -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);
 };

diff --git a/dist/mermaid.min.js b/dist/mermaid.min.js
diff --git a/dist/mermaid.slim.js b/dist/mermaid.slim.js
@@ -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);
 };

diff --git a/dist/mermaid.slim.min.js b/dist/mermaid.slim.min.js
diff --git a/dist/mermaidAPI.slim.js b/dist/mermaidAPI.slim.js
diff --git a/src/mermaid.js b/src/mermaid.js
@@ -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);
 };

diff --git a/test/web.html b/test/web.html
@@ -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>