From a2510295462cc11cfab43c1b86b36f38cd5743db Mon Sep 17 00:00:00 2001
From: Knut Sveidqvist <knut.sveidqvist@ipiccolo.com>
Date: Mon, 15 Jun 2020 22:42:33 +0200
Subject: [PATCH] =?UTF-8?q?#=C2=A7473=20Font=20update=20for=20e2e=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cypress/platform/e2e.html  | 5 +++--
 cypress/platform/viewer.js | 5 +++++
 src/mermaid.js             | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cypress/platform/e2e.html b/cypress/platform/e2e.html
index 2172a0916..a279c4071 100644
--- a/cypress/platform/e2e.html
+++ b/cypress/platform/e2e.html
@@ -27,7 +27,7 @@
     <script>
       // Notice startOnLoad=false
       // This prevents default handling in mermaid from render before the e2e logic is applied
-      mermaid.initialize({
+      window.mermaidDefault = {
         startOnLoad: false,
         useMaxWidth: true,
         // "themeCSS": ":root { --mermaid-font-family: \"trebuchet ms\", verdana, arial;}",
@@ -35,7 +35,8 @@
         // fontFamily: '"Comic Sans MS", "Comic Sans", cursive'
         // fontFamily: '"Mansalva", cursive',
         fontFamily: '"Noto Sans SC", sans-serif'
-      });
+      };
+      mermaid.initialize(window.mermaidDefault);
     </script>
   </body>
 </html>
diff --git a/cypress/platform/viewer.js b/cypress/platform/viewer.js
index 1d8a8034d..282290507 100644
--- a/cypress/platform/viewer.js
+++ b/cypress/platform/viewer.js
@@ -30,6 +30,11 @@ const contentLoaded = function() {
       div.innerHTML = graphObj.code;
       document.getElementsByTagName('body')[0].appendChild(div);
     }
+
+    if (window.mermaidDefault.fontFamily) {
+      graphObj.mermaid.fontFamily = window.mermaidDefault.fontFamily;
+    }
+
     global.mermaid.initialize(graphObj.mermaid);
     global.mermaid.init();
   }
diff --git a/src/mermaid.js b/src/mermaid.js
index 14d928a07..10b25aa7d 100644
--- a/src/mermaid.js
+++ b/src/mermaid.js
@@ -124,7 +124,7 @@ const init = function() {
 const initialize = function(config) {
   mermaidAPI.reset();
 
-  // console.log('Initializing mermaid 1', config);
+  // console.log('mermaid.initialize1', config);
   if (typeof config.mermaid !== 'undefined') {
     if (typeof config.mermaid.startOnLoad !== 'undefined') {
       mermaid.startOnLoad = config.mermaid.startOnLoad;