From 367d620a820b3ea0bea63b51568bae7df683cfc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Westr=C3=B6m?= <bjowes@gmail.com>
Date: Sun, 11 Jan 2015 16:15:38 +0100
Subject: [PATCH] Break out dagre-d3, new label styling

---
 src/diagrams/flowchart/flowRenderer.js | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/diagrams/flowchart/flowRenderer.js b/src/diagrams/flowchart/flowRenderer.js
index d831d3af8..fb8c29c91 100644
--- a/src/diagrams/flowchart/flowRenderer.js
+++ b/src/diagrams/flowchart/flowRenderer.js
@@ -4,7 +4,7 @@
 var graph = require('./graphDb');
 var flow = require('./parser/flow');
 var dot = require('./parser/dot');
-var dagreD3 = require('dagre-d3');
+var dagreD3 = require('./dagre-d3');
 /**
  * Function that adds the vertices found in the graph definition to the graph to be rendered.
  * @param vert Object containing the vertices.
@@ -58,6 +58,14 @@ exports.addVertices = function (vert, g) {
             verticeText = vertice.text;
         }
 
+        var labelTypeStr = '';
+        if(equals('html',mermaid_config.labelType)) {
+            labelTypeStr = 'html';
+        } else {
+            verticeText = verticeText.replace(/<br>/g, "\n");
+            labelTypeStr = 'text';
+        }
+
         var radious = 0;
         var _shape = '';
 
@@ -83,7 +91,7 @@ exports.addVertices = function (vert, g) {
                 _shape = 'rect';
         }
         // Add the node
-        g.setNode(vertice.id, {labelType: "html",shape:_shape, label: verticeText, rx: radious, ry: radious, class: classStr, style: style, id:vertice.id});
+        g.setNode(vertice.id, {labelType: labelTypeStr, shape:_shape, label: verticeText, rx: radious, ry: radious, class: classStr, style: style, id:vertice.id});
     });
 };
 
@@ -125,12 +133,12 @@ exports.addEdges = function (edges, g) {
         }
         // Edge with text
         else {
-
+            var edgeText = edge.text.replace(/<br>/g, "\n");
             if(typeof edge.style === 'undefined'){
-                g.setEdge(edge.start, edge.end,{labelType: "html",style: "stroke: #333; stroke-width: 1.5px;fill:none", labelpos:'c', label: '<span style="background:#e8e8e8">'+edge.text+'</span>', arrowheadStyle: "fill: #333", arrowhead: aHead},cnt);
+                g.setEdge(edge.start, edge.end,{labelType: "text", style: "stroke: #333; stroke-width: 1.5px;fill:none", labelpos:'c', label: edgeText, arrowheadStyle: "fill: #333", arrowhead: aHead},cnt);
             }else{
                 g.setEdge(edge.start, edge.end, {
-                    labelType: "html",style: style, arrowheadStyle: "fill: #333", label: edge.text, arrowhead: aHead
+                    labelType: "text",style: style, arrowheadStyle: "fill: #333", label: edgeText, arrowhead: aHead
                 },cnt);
             }
         }
@@ -161,10 +169,12 @@ exports.getClasses = function (text, isDot) {
     var classes = graph.getClasses();
 
     // Add default class if undefined
-    if(typeof classes.default === 'undefined') {
+    if(typeof(classes.default) === 'undefined') {
         classes.default = {id:'default'};
         classes.default.styles = ['fill:#eaeaea','stroke:#666','stroke-width:1.5px'];
-    } 
+        classes.default.nodeLabelStyles = ['fill:#000','stroke:none','font-weight:300','font-family:"Helvetica Neue",Helvetica,Arial,sans-serf','font-size:14px'];
+        classes.default.edgeLabelStyles = ['fill:#000','stroke:none','font-weight:300','font-family:"Helvetica Neue",Helvetica,Arial,sans-serf','font-size:14px'];
+    }
     return classes;
 };