From b1bb2dce168ce2d219c211e200b0fe20a1f29db8 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sun, 6 Dec 2020 14:44:40 +0100 Subject: [PATCH] config factorization --- src/diagrams/class/classDb.js | 5 ++--- src/diagrams/flowchart/flowDb.js | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/diagrams/class/classDb.js b/src/diagrams/class/classDb.js index f74aa5720..580f5273b 100644 --- a/src/diagrams/class/classDb.js +++ b/src/diagrams/class/classDb.js @@ -7,6 +7,7 @@ import mermaidAPI from '../../mermaidAPI'; const MERMAID_DOM_ID_PREFIX = 'classid-'; +let config = configApi.getConfig(); let relations = []; let classes = {}; let classCounter = 0; @@ -173,7 +174,6 @@ export const setCssClass = function(ids, className) { * @param linkStr URL to create a link for */ export const setLink = function(ids, linkStr) { - const config = configApi.getConfig(); ids.split(',').forEach(function(_id) { let id = _id; if (_id[0].match(/\d/)) id = MERMAID_DOM_ID_PREFIX + id; @@ -210,7 +210,6 @@ export const setTooltip = function(ids, tooltip) { }; const setClickFunc = function(domId, functionName) { - const config = configApi.getConfig(); let id = domId; let elemId = lookUpDomId(id); @@ -299,7 +298,7 @@ funs.push(setupToolTips); export default { parseDirective, - getConfig: () => configApi.getConfig().class, + getConfig: () => config.class, addClass, bindFunctions, clear, diff --git a/src/diagrams/flowchart/flowDb.js b/src/diagrams/flowchart/flowDb.js index efb202bb6..34e1fbb82 100644 --- a/src/diagrams/flowchart/flowDb.js +++ b/src/diagrams/flowchart/flowDb.js @@ -72,7 +72,6 @@ export const addVertex = function(_id, text, type, style, classes) { } vertexCounter++; if (typeof text !== 'undefined') { - config = configApi.getConfig(); txt = common.sanitizeText(text.trim(), config); // strip quotes if string starts and ends with a quote @@ -250,7 +249,7 @@ const setTooltip = function(ids, tooltip) { const setClickFun = function(id, functionName, functionArgs) { let domId = lookUpDomId(id); // if (_id[0].match(/\d/)) id = MERMAID_DOM_ID_PREFIX + id; - if (configApi.getConfig().securityLevel !== 'loose') { + if (config.securityLevel !== 'loose') { return; } if (typeof functionName === 'undefined') {