marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-02 15:16:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

#§473 Font update for e2e tests

Browse Source
This commit is contained in:
Knut Sveidqvist
2020-06-15 22:42:33 +02:00
parent b5d457daa9
commit a251029546
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cypress/platform/e2e.html
View File

@@ -27,7 +27,7 @@
<script> <script>
// Notice startOnLoad=false // Notice startOnLoad=false
// This prevents default handling in mermaid from render before the e2e logic is applied // This prevents default handling in mermaid from render before the e2e logic is applied
mermaid.initialize({ window.mermaidDefault = {
startOnLoad: false, startOnLoad: false,
useMaxWidth: true, useMaxWidth: true,
// "themeCSS": ":root { --mermaid-font-family: \"trebuchet ms\", verdana, arial;}", // "themeCSS": ":root { --mermaid-font-family: \"trebuchet ms\", verdana, arial;}",
@@ -35,7 +35,8 @@
// fontFamily: '"Comic Sans MS", "Comic Sans", cursive' // fontFamily: '"Comic Sans MS", "Comic Sans", cursive'
// fontFamily: '"Mansalva", cursive', // fontFamily: '"Mansalva", cursive',
fontFamily: '"Noto Sans SC", sans-serif' fontFamily: '"Noto Sans SC", sans-serif'
}); };
mermaid.initialize(window.mermaidDefault);
</script> </script>
</body> </body>
</html> </html>

5
cypress/platform/viewer.js
View File

@@ -30,6 +30,11 @@ const contentLoaded = function() {
div.innerHTML = graphObj.code; div.innerHTML = graphObj.code;
document.getElementsByTagName('body')[0].appendChild(div); document.getElementsByTagName('body')[0].appendChild(div);
} }
if (window.mermaidDefault.fontFamily) {
graphObj.mermaid.fontFamily = window.mermaidDefault.fontFamily;
}
global.mermaid.initialize(graphObj.mermaid); global.mermaid.initialize(graphObj.mermaid);
global.mermaid.init(); global.mermaid.init();
} }

2
src/mermaid.js
View File

@@ -124,7 +124,7 @@ const init = function() {
const initialize = function(config) { const initialize = function(config) {
mermaidAPI.reset(); mermaidAPI.reset();
// console.log('Initializing mermaid 1', config); // console.log('mermaid.initialize1', config);
if (typeof config.mermaid !== 'undefined') { if (typeof config.mermaid !== 'undefined') {
if (typeof config.mermaid.startOnLoad !== 'undefined') { if (typeof config.mermaid.startOnLoad !== 'undefined') {
mermaid.startOnLoad = config.mermaid.startOnLoad; mermaid.startOnLoad = config.mermaid.startOnLoad;