From 1f4be7766224efdd574bcdec9c9f8bd9c848ae02 Mon Sep 17 00:00:00 2001
From: Marc Faber <faber@genodata.de>
Date: Tue, 10 Dec 2019 03:48:12 +0100
Subject: [PATCH] Revert "#910 set correct position and style for edge labels
 when using linkStyle, #1088 handle multiline texts in edge labels when using
 linkStyle" - Sorry, forgot to push to a new branch.

This reverts commit 0deae4abf9674be4831dd4cbf18468c704999f12.
---
 dist/index.html                             | 12 ---------
 src/diagrams/flowchart/flowRenderer.js      | 20 +++++++-------
 src/diagrams/flowchart/flowRenderer.spec.js | 30 +--------------------
 3 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/dist/index.html b/dist/index.html
index 615c9a537..eb27c6593 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -313,18 +313,6 @@ class A someclass;
     classDef someclass fill:#f96;
     class A someclass;
   </div>
-  <div class="mermaid">
-    graph LR
-    A1[Multi<br>Line] -->|Multi<br>Line| B1(Multi<br>Line)
-    C1[Multi<br/>Line] -->|Multi<br/>Line| D1(Multi<br/>Line)
-    E1[Multi<br />Line] -->|Multi<br />Line| F1(Multi<br />Line)
-    A2[Multi<br>Line] -->|Multi<br>Line| B2(Multi<br>Line)
-    C2[Multi<br/>Line] -->|Multi<br/>Line| D2(Multi<br/>Line)
-    E2[Multi<br />Line] -->|Multi<br />Line| F2(Multi<br />Line)
-    linkStyle 0 stroke:DarkGray,stroke-width:2px
-    linkStyle 1 stroke:DarkGray,stroke-width:2px
-    linkStyle 2 stroke:DarkGray,stroke-width:2px
-  </div>
 
   <hr/>
 
diff --git a/src/diagrams/flowchart/flowRenderer.js b/src/diagrams/flowchart/flowRenderer.js
index 524742b39..ee680532f 100644
--- a/src/diagrams/flowchart/flowRenderer.js
+++ b/src/diagrams/flowchart/flowRenderer.js
@@ -239,18 +239,18 @@ export const addEdges = function(edges, g) {
       }
     } else {
       edgeData.arrowheadStyle = 'fill: #333';
-      edgeData.labelpos = 'c';
-
-      if (getConfig().flowchart.htmlLabels) {
-        edgeData.labelType = 'html';
-        edgeData.label = '<span class="edgeLabel">' + edge.text + '</span>';
-      } else {
-        edgeData.labelType = 'text';
-        edgeData.label = edge.text.replace(/<br ?\/?>/g, '\n');
-
-        if (typeof edge.style === 'undefined') {
+      if (typeof edge.style === 'undefined') {
+        edgeData.labelpos = 'c';
+        if (getConfig().flowchart.htmlLabels) {
+          edgeData.labelType = 'html';
+          edgeData.label = '<span class="edgeLabel">' + edge.text + '</span>';
+        } else {
+          edgeData.labelType = 'text';
           edgeData.style = edgeData.style || 'stroke: #333; stroke-width: 1.5px;fill:none';
+          edgeData.label = edge.text.replace(/<br>/g, '\n');
         }
+      } else {
+        edgeData.label = edge.text.replace(/<br>/g, '\n');
       }
     }
     // Add the edge to the graph
diff --git a/src/diagrams/flowchart/flowRenderer.spec.js b/src/diagrams/flowchart/flowRenderer.spec.js
index fe31292cc..0e49dbf71 100644
--- a/src/diagrams/flowchart/flowRenderer.spec.js
+++ b/src/diagrams/flowchart/flowRenderer.spec.js
@@ -1,4 +1,4 @@
-import { addVertices, addEdges } from './flowRenderer';
+import { addVertices } from './flowRenderer';
 import { setConfig } from '../../config';
 
 setConfig({
@@ -94,32 +94,4 @@ describe('the flowchart renderer', function() {
       expect(addedNodes[0][1]).toHaveProperty('labelStyle', expectedLabelStyle);
     });
   });
-
-  describe('when adding edges to a graph', function() {
-    it('should handle multiline texts and set centered label position', function() {
-      const addedEdges = [];
-      const mockG = {
-        setEdge: function(s, e, data, c) {
-          addedEdges.push(data);
-        }
-      };
-      addEdges(
-        [
-          { text: 'Multi<br>Line' },
-          { text: 'Multi<br/>Line' },
-          { text: 'Multi<br />Line' },
-          { style: ['stroke:DarkGray', 'stroke-width:2px'], text: 'Multi<br>Line' },
-          { style: ['stroke:DarkGray', 'stroke-width:2px'], text: 'Multi<br/>Line' },
-          { style: ['stroke:DarkGray', 'stroke-width:2px'], text: 'Multi<br />Line' }
-        ],
-        mockG,
-        'svg-id'
-      );
-
-      addedEdges.forEach(function(edge) {
-        expect(edge).toHaveProperty('label', 'Multi\nLine');
-        expect(edge).toHaveProperty('labelpos', 'c');
-      });
-    });
-  });
 });