Setting default config

mermaid-js · Jun 14, 2020 · 2150933 · 2150933
1 parent d145310
commit 2150933
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 7 deletions.
diff --git a/cypress/integration/rendering/sequencediagram.spec.js b/cypress/integration/rendering/sequencediagram.spec.js
@@ -328,4 +328,18 @@ context('Sequence diagram', () => {
       );
     });
   });
+  context('directives', () => {
+      it('should overide config with directive settings', () => {
+      imgSnapshotTest(
+        `
+        sequenceDiagram
+        %%{config: { "mirrorActors": true} }%%
+        Alice->>Bob: I'm short
+        note left of Alice: config set to mirrorActors: false<br/>directive set to mirrorActors: true
+        Bob->>Alice: Short as well
+      `,
+        { logLevel:0,  sequence: { mirrorActors: false, noteFontSize: 18, noteFontFamily: 'Arial' } }
+      );
+    });
+  });
 });
diff --git a/dist/mermaid.core.js b/dist/mermaid.core.js
@@ -20400,6 +20400,8 @@ var init = function init() {
 };
 
 var initialize = function initialize(config) {
+  console.log('Ininitializeze ', config);
+
   if (typeof config.mermaid !== 'undefined') {
     if (typeof config.mermaid.startOnLoad !== 'undefined') {
       mermaid.startOnLoad = config.mermaid.startOnLoad;
@@ -21516,7 +21518,12 @@ function reinitialize(options) {
 }
 
 function initialize(options) {
-  var _config = config;
+  var _config = config; // Set default options
+
+  if (_typeof(options) === 'object') {
+    setConf(_config);
+  }
+
   _logger__WEBPACK_IMPORTED_MODULE_4__["logger"].debug('Initializing mermaidAPI ', {
     version: _package_json__WEBPACK_IMPORTED_MODULE_2__.version,
     options: options,

diff --git a/dist/mermaid.core.js.map b/dist/mermaid.core.js.map
diff --git a/dist/mermaid.js b/dist/mermaid.js
@@ -66159,6 +66159,8 @@ var init = function init() {
 };
 
 var initialize = function initialize(config) {
+  console.log('Ininitializeze ', config);
+
   if (typeof config.mermaid !== 'undefined') {
     if (typeof config.mermaid.startOnLoad !== 'undefined') {
       mermaid.startOnLoad = config.mermaid.startOnLoad;
@@ -67274,7 +67276,12 @@ function reinitialize(options) {
 }
 
 function initialize(options) {
-  var _config = config;
+  var _config = config; // Set default options
+
+  if (_typeof(options) === 'object') {
+    setConf(_config);
+  }
+
   _logger__WEBPACK_IMPORTED_MODULE_4__["logger"].debug('Initializing mermaidAPI ', {
     version: _package_json__WEBPACK_IMPORTED_MODULE_2__.version,
     options: options,

diff --git a/dist/mermaid.js.map b/dist/mermaid.js.map
diff --git a/dist/mermaid.min.js b/dist/mermaid.min.js
diff --git a/dist/mermaid.min.js.map b/dist/mermaid.min.js.map
diff --git a/src/mermaidAPI.js b/src/mermaidAPI.js
@@ -964,6 +964,10 @@ function reinitialize(options) {
 
 function initialize(options) {
   let _config = config;
+  // Set default options
+  if (typeof options === 'object') {
+    setConf(_config);
+  }
   logger.debug('Initializing mermaidAPI ', { version: pkg.version, options, _config });
   // Update default config with options supplied at initialization
   if (typeof options === 'object') {