marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-11-14 09:44:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into 1252_gitgraph_reinvented

Browse Source
This commit is contained in:
ashishj
2022-03-24 17:29:36 +01:00
parent a9194d4eaa 2f9a7e8590
commit a29e2e6baa
6 changed files with 121 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.js
View File

@@ -52,7 +52,7 @@ export const updateCurrentConfig = (siteCfg, _directives) => {
* **Notes:** Sets the siteConfig. The siteConfig is a protected configuration for repeat use. Calls
* to reset() will reset the currentConfig to siteConfig. Calls to reset(configApi.defaultConfig)
* will reset siteConfig and currentConfig to the defaultConfig Note: currentConfig is set in this
* function *Default value: At default, will mirror Global Config**
* function _Default value: At default, will mirror Global Config_
*
* @param conf - The base currentConfig to use as siteConfig
* @returns {object} - The siteConfig

2
src/defaultConfig.js
View File

@@ -100,7 +100,7 @@ const config = {
arrowMarkerAbsolute: false,
/**
* This option controls which currentConfig keys are considered *secure* and can only be changed
* This option controls which currentConfig keys are considered _secure_ and can only be changed
* via call to mermaidAPI.initialize. Calls to mermaidAPI.reinitialize cannot make changes to the
* `secure` keys in the current currentConfig. This prevents malicious graph directives from
* overriding a site's default security.