Merge branch '1592-IncorrectSVGytntax' of git://github.com/jgreywolf/…

…mermaid into jgreywolf-1592-IncorrectSVGytntax
mermaid-js · Aug 13, 2020 · 62260aa · 62260aa
2 parents 9223173 + 5e72416
commit 62260aa
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 5 deletions.
diff --git a/dist/mermaid.core.js b/dist/mermaid.core.js
diff --git a/dist/mermaid.core.js.map b/dist/mermaid.core.js.map
diff --git a/dist/mermaid.js b/dist/mermaid.js
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/docs/Setup.md b/docs/Setup.md
@@ -109,7 +109,7 @@ Note: modifies options in-place
 
 ### Parameters
 
--   `conf`  the base currentConfig to reset to (default: current siteConfig ) (optional, default `getSiteConfig()`)
+-   `conf`  the base currentConfig to reset to (default: current siteConfig )
 
 ## render
 

diff --git a/src/diagrams/class/classRenderer-v2.js b/src/diagrams/class/classRenderer-v2.js
@@ -408,6 +408,7 @@ export const draw = function(text, id) {
 
   // Set up an SVG group so that we can translate the final graph.
   const svg = select(`[id="${id}"]`);
+  svg.attr('xmlns:xlink', 'http://www.w3.org/1999/xlink');
 
   // Run the renderer. This is what draws the final graph.
   const element = select('#' + id + ' g');

diff --git a/src/diagrams/class/classRenderer.js b/src/diagrams/class/classRenderer.js
@@ -157,6 +157,7 @@ export const draw = function(text, id) {
 
   // Fetch the default direction, use TD if none was found
   const diagram = select(`[id='${id}']`);
+  diagram.attr('xmlns:xlink', 'http://www.w3.org/1999/xlink');
   insertMarkers(diagram);
 
   // Layout graph, Create a new directed graph
@@ -176,6 +177,7 @@ export const draw = function(text, id) {
 
   const classes = classDb.getClasses();
   const keys = Object.keys(classes);
+
   for (let i = 0; i < keys.length; i++) {
     const classDef = classes[keys[i]];
     const node = svgDraw.drawClass(diagram, classDef, conf);

diff --git a/src/diagrams/flowchart/flowRenderer-v2.js b/src/diagrams/flowchart/flowRenderer-v2.js
@@ -397,6 +397,7 @@ export const draw = function(text, id) {
 
   // Set up an SVG group so that we can translate the final graph.
   const svg = select(`[id="${id}"]`);
+  svg.attr('xmlns:xlink', 'http://www.w3.org/1999/xlink');
 
   // Run the renderer. This is what draws the final graph.
   const element = select('#' + id + ' g');

diff --git a/src/diagrams/flowchart/flowRenderer.js b/src/diagrams/flowchart/flowRenderer.js
@@ -385,6 +385,7 @@ export const draw = function(text, id) {
 
   // Set up an SVG group so that we can translate the final graph.
   const svg = select(`[id="${id}"]`);
+  svg.attr('xmlns:xlink', 'http://www.w3.org/1999/xlink');
 
   // Run the renderer. This is what draws the final graph.
   const element = select('#' + id + ' g');