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

Resolved some merge conflicts

Browse Source
This commit is contained in:
Knut Sveidqvist
2019-06-11 08:20:12 -07:00
parent 836d02d0b9 fa9cf2b345
commit 0816591cf9
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.vscode/settings.json vendored Normal file
View File

@@ -0,0 +1,7 @@
{
"typescript.format.enable": false,
"typescript.reportStyleChecksAsWarnings": false,
"typescript.validate.enable": false,
"javascript.validate.enable": false,
"editor.formatOnSave": false
}

3
src/diagrams/flowchart/flowRenderer.js
View File

@@ -71,7 +71,7 @@ export const addVertices = function (vert, g, svgId) {
} else { } else {
const svgLabel = document.createElementNS('http://www.w3.org/2000/svg', 'text') const svgLabel = document.createElementNS('http://www.w3.org/2000/svg', 'text')
const rows = vertexText.split(/<br>/) const rows = verticeText.split(/<br[/]{0,1}>/)
for (let j = 0; j < rows.length; j++) { for (let j = 0; j < rows.length; j++) {
const tspan = document.createElementNS('http://www.w3.org/2000/svg', 'tspan') const tspan = document.createElementNS('http://www.w3.org/2000/svg', 'tspan')
@@ -198,6 +198,7 @@ export const addEdges = function (edges, g) {
edgeData.label = '<span class="edgeLabel">' + edge.text + '</span>' edgeData.label = '<span class="edgeLabel">' + edge.text + '</span>'
} else { } else {
edgeData.labelType = 'text' edgeData.labelType = 'text'
edgeData.style = edgeData.style || 'stroke: #333; stroke-width: 1.5px;fill:none'
edgeData.label = edge.text.replace(/<br>/g, '\n') edgeData.label = edge.text.replace(/<br>/g, '\n')
} }
} else { } else {