Refactor code

2025-09-11 19:39:43 +02:00 · 2017-04-16 23:48:36 +08:00
parent 87c7f73245
commit 5624453c87
17 changed files with 632 additions and 923 deletions
--- a/src/diagrams/classDiagram/classDb.js
+++ b/src/diagrams/classDiagram/classDb.js
@@ -4,12 +4,9 @@ var log = Logger.Log
 var relations = []

 var classes
-// var idCache
 classes = {
 }

-// Functions to be run after graph rendering
-// var funs = []
 /**
 * Function called by parser when a node definition has been found.
 * @param id
--- a/src/diagrams/classDiagram/classRenderer.js
+++ b/src/diagrams/classDiagram/classRenderer.js
@@ -149,7 +149,6 @@ var drawEdge = function (elem, path, relation) {
    .y(function (d) {
      return d.y
    })
-        // .interpolate('cardinal');
    .interpolate('basis')

  var svgPath = elem.append('path')
@@ -163,7 +162,6 @@ var drawEdge = function (elem, path, relation) {
    url = url.replace(/\)/g, '\\)')
  }

-    // console.log(relation.relation.type1);
  if (relation.relation.type1 !== 'none') {
    svgPath.attr('marker-start', 'url(' + url + '#' + getRelationType(relation.relation.type1) + 'Start' + ')')
  }
@@ -171,9 +169,6 @@ var drawEdge = function (elem, path, relation) {
    svgPath.attr('marker-end', 'url(' + url + '#' + getRelationType(relation.relation.type2) + 'End' + ')')
  }

-    // var bbox = svgPath[0][0].getBBox();
-    // var x = Math.floor(bbox.x + bbox.width/2.0);
-    // var y = Math.floor(bbox.y + bbox.height/2.0);
  var x, y
  var l = path.points.length
  if ((l % 2) !== 0) {
@@ -207,10 +202,6 @@ var drawEdge = function (elem, path, relation) {
      .attr('y', bounds.y - conf.padding / 2)
      .attr('width', bounds.width + 2 * conf.padding / 2)
      .attr('height', bounds.height + 2 * conf.padding / 2)
-        // .append('textpath')
-        // .attr('xlink:href','#edge'+edgeCount)
-        // .attr('text-anchor','middle')
-        // .attr('startOffset','50%')
  }

  edgeCount++
@@ -263,10 +254,6 @@ var drawClass = function (elem, classDef) {
    addTspan(members, member, isFirst)
    isFirst = false
  })
-    // for (var member of classDef.members) {
-    //    addTspan(members, member, isFirst);
-    //    isFirst = false;
-    // }

  var membersBox = members.node().getBBox()

@@ -287,10 +274,6 @@ var drawClass = function (elem, classDef) {
    addTspan(methods, method, isFirst)
    isFirst = false
  })
-    // for (var method of classDef.methods) {
-    //    addTspan(methods, method, isFirst);
-    //    isFirst = false;
-    // }

  var classBox = g.node().getBBox()
  g.insert('rect', ':first-child')
@@ -331,7 +314,6 @@ module.exports.draw = function (text, id) {
  /// / Fetch the default direction, use TD if none was found
  var diagram = d3.select('#' + id)
  insertMarkers(diagram)
-    // var svg = diagram.append('svg');

  // Layout graph, Create a new directed graph
  var g = new dagre.graphlib.Graph({
@@ -359,32 +341,18 @@ module.exports.draw = function (text, id) {
    // our nodes.
    g.setNode(node.id, node)
    log.info('Org height: ' + node.height)
-        // g.setNode("swilliams",  { label: "Saul Williams", width: 160, height: 100 });
-        // g.setNode("bpitt",      { label: "Brad Pitt",     width: 108, height: 100 });
-        // g.setNode("hford",      { label: "Harrison Ford", width: 168, height: 100 });
-        // g.setNode("lwilson",    { label: "Luke Wilson",   width: 144, height: 100 });
-        // g.setNode("kbacon",     { label: "Kevin Bacon",   width: 121, height: 100 });
  }

  var relations = cDDb.getRelations()
-  // var i = 0
  relations.forEach(function (relation) {
-    // i = i + 1
    log.info('tjoho' + getGraphId(relation.id1) + getGraphId(relation.id2) + JSON.stringify(relation))
    g.setEdge(getGraphId(relation.id1), getGraphId(relation.id2), { relation: relation })
  })
-    // for (var relation of relations) {
-    //    i = i + 1;
-    //    log.info('tjoho' + getGraphId(relation.id1) +  getGraphId(relation.id2) + JSON.stringify(relation));
-    //    g.setEdge(getGraphId(relation.id1), getGraphId(relation.id2), {relation: relation});
-    // }
  dagre.layout(g)
  g.nodes().forEach(function (v) {
    if (typeof v !== 'undefined') {
      log.debug('Node ' + v + ': ' + JSON.stringify(g.node(v)))
      d3.select('#' + v).attr('transform', 'translate(' + (g.node(v).x - (g.node(v).width / 2)) + ',' + (g.node(v).y - (g.node(v).height / 2)) + ' )')
-            // d3.select('#' +v +' rect').attr('x',(g.node(v).x-(g.node(v).width/2)))
-            // .attr('y',(g.node(v).y-(g.node(v).height/2)));
    }
  })
  g.edges().forEach(function (e) {
@@ -392,21 +360,7 @@ module.exports.draw = function (text, id) {
    drawEdge(diagram, g.edge(e), g.edge(e).relation)
  })

-    //
  diagram.attr('height', '100%')
  diagram.attr('width', '100%')
  diagram.attr('viewBox', '0 0 ' + (g.graph().width + 20) + ' ' + (g.graph().height + 20))
-    //
-    //
-    //
-    //
-    // if(conf.useMaxWidth) {
-    //    diagram.attr('height', '100%');
-    //    diagram.attr('width', '100%');
-    //    diagram.attr('style', 'max-width:' + (width) + 'px;');
-    // }else{
-    //    diagram.attr('height',height);
-    //    diagram.attr('width', width );
-    // }
-    // diagram.attr('viewBox', (box.startx-conf.diagramMarginX) + ' -' +conf.diagramMarginY + ' ' + width + ' ' + height);
 }
--- a/src/diagrams/classDiagram/classRenderer.spec.js
+++ b/src/diagrams/classDiagram/classRenderer.spec.js
@@ -1,87 +1,11 @@
 /* eslint-env jasmine */
-// var proxyquire = require('proxyquire');
-// var newD3;
-/// **
-// * Created by knut on 14-11-18.
-// */
-//
-// var d3 = {
-//    select:function(){
-//        return new newD3();
-//    },
-//    selectAll:function(){
-//        return new newD3();
-//    }
-// };
-
-// var classRenderer = proxyquire('./classRenderer', { '../../d3': d3 });
-// var testDom = require('testdom')('<html><body><div id="tst"></div></body></html>');
-
-// var classRenderer = require('./classRenderer')
-// var parser = require('./parser/classDiagram').parser
+/**
+ * Created by knut on 14-11-18.
+ */

 describe('class diagram, ', function () {
  describe('when rendering a classDiagram', function () {
-    // var conf
    beforeEach(function () {
-            /// /parser.yy = require('./classDb');
-            /// /parser.yy.clear();
-            /// /parseError = function(err, hash) {
-            /// /    log.debug('Syntax error:' + err);
-            /// /    log.debug(hash);
-            /// /};
-            /// /sq.yy.parseError = parseError;
-            //
-            // newD3 = function() {
-            //    var o = {
-            //        append: function () {
-            //            return newD3();
-            //        },
-            //        attr: function () {
-            //            return this;
-            //        },
-            //        style: function () {
-            //            return this;
-            //        },
-            //        text: function () {
-            //            return this;
-            //        },
-            //        0:{
-            //            0: {
-            //                getBBox: function () {
-            //                    return {
-            //                        height: 10,
-            //                        width: 20
-            //                    };
-            //                }
-            //            }
-            //
-            //        }
-            //    };
-            //
-            //    return o;
-            // };
-            //
-            // conf = {
-            //    diagramMarginX:50,
-            //    diagramMarginY:10,
-            //    actorMargin:50,
-            //    width:150,
-            //    // Height of actor boxes
-            //    height:65,
-            //    boxMargin:10,
-            //    messageMargin:40,
-            //    boxTextMargin:15,
-            //    noteMargin:25,
-            //    mirrorActors:true,
-            //    // Depending on css styling this might need adjustment
-            //    // Prolongs the edge of the diagram downwards
-            //    bottomMarginAdj:1
-            // };
-            // classRenderer.setConf(conf);
-
-                // ... add whatever browser globals your tests might need ...
-            // }
      Object.defineProperties(window.HTMLElement.prototype, {
        getBBox: {
          get: function () { return { x: 10, y: 10, width: 100, height: 100 } }
@@ -100,13 +24,5 @@ describe('class diagram, ', function () {
        }
      })
    })
-    it('it should handle one actor', function () {
-      // var str = 'classDiagram\n' +
-      //       'Class01 --|> Class02'
-
-            // classRenderer.draw(str,'tst');
-
-            // console.log(document.body.innerHTML);
-    })
  })
 })
--- a/src/diagrams/example/exampleRenderer.js
+++ b/src/diagrams/example/exampleRenderer.js
@@ -7,7 +7,6 @@ var d3 = require('../../d3')

 var Logger = require('../../logger')
 var log = Logger.Log
-// var log = new Logger.Log();

 /**
 * Draws a an info picture in the tag with id: id based on the graph definition in text.
@@ -35,13 +34,6 @@ exports.draw = function (txt, id, ver) {
    .style('text-anchor', 'middle')
    .text('mermaid ' + ver)

-    /*
-    var box = exports.bounds.getBounds();
-
-    var height = box.stopy-box.starty+2*conf.diagramMarginY;
-    var width  = box.stopx-box.startx+2*conf.diagramMarginX; */
-
  svg.attr('height', 100)
  svg.attr('width', 400)
-    // svg.attr('viewBox', '0 0 300 150');
 }
--- a/src/diagrams/flowchart/flowRenderer.js
+++ b/src/diagrams/flowchart/flowRenderer.js
@@ -50,8 +50,6 @@ exports.addVertices = function (vert, g) {
     */
    var classStr = ''

-    // log.debug(vertice.classes);
-
    if (vertice.classes.length > 0) {
      classStr = vertice.classes.join(' ')
    }
@@ -94,9 +92,6 @@ exports.addVertices = function (vert, g) {

      labelTypeStr = 'svg'
      verticeText = svgLabel
-
-      // verticeText = verticeText.replace(/<br\/>/g, '\n');
-      // labelTypeStr = 'text';
    }

    var radious = 0
@@ -242,7 +237,6 @@ exports.getClasses = function (text, isDot) {
  // Add default class if undefined
  if (typeof (classes.default) === 'undefined') {
    classes.default = { id: 'default' }
-    // classes.default.styles = ['fill:#ffa','stroke:#666','stroke-width:3px'];
    classes.default.styles = []
    classes.default.clusterStyles = ['rx:4px', 'fill: rgb(255, 255, 222)', 'rx: 4px', 'stroke: rgb(170, 170, 51)', 'stroke-width: 1px']
    classes.default.nodeLabelStyles = ['fill:#000', 'stroke:none', 'font-weight:300', 'font-family:"Helvetica Neue",Helvetica,Arial,sans-serf', 'font-size:14px']
@@ -307,7 +301,6 @@ exports.draw = function (text, id, isDot) {
  // Fetch the verices/nodes and edges/links from the parsed graph definition
  var vert = graph.getVertices()

-  // log.debug(vert);
  var edges = graph.getEdges()

  i = 0
@@ -318,7 +311,6 @@ exports.draw = function (text, id, isDot) {
    d3.selectAll('cluster').append('text')

    for (j = 0; j < subG.nodes.length; j++) {
-      // log.debug('Setting node',subG.nodes[j],' to subgraph '+id);
      g.setParent(subG.nodes[j], subG.id)
    }
  }
@@ -435,35 +427,20 @@ exports.draw = function (text, id, isDot) {

  // Set up an SVG group so that we can translate the final graph.
  var svg = d3.select('#' + id)
-  // svgGroup = d3.select('#' + id + ' g');

  // Run the renderer. This is what draws the final graph.
  var element = d3.select('#' + id + ' g')
  render(element, g)

-  // var tip = d3.tip().html(function(d) { return d; });
  element.selectAll('g.node')
    .attr('title', function () {
      return graph.getTooltip(this.id)
    })

-  /*
-   var xPos = document.querySelectorAll('.clusters rect')[0].x.baseVal.value;
-   var width = document.querySelectorAll('.clusters rect')[0].width.baseVal.value;
-      var cluster = d3.selectAll('.cluster');
-      var te = cluster.append('text');
-      te.attr('x', xPos+width/2);
-      te.attr('y', 12);
-      //te.stroke('black');
-      te.attr('id', 'apa12');
-      te.style('text-anchor', 'middle');
-      te.text('Title for cluster');
-  */
  if (conf.useMaxWidth) {
    // Center the graph
    svg.attr('height', '100%')
    svg.attr('width', conf.width)
-    // svg.attr('viewBox', svgb.getBBox().x + ' 0 '+ g.graph().width+' '+ g.graph().height);
    svg.attr('viewBox', '0 0 ' + (g.graph().width + 20) + ' ' + (g.graph().height + 20))
    svg.attr('style', 'max-width:' + (g.graph().width + 20) + 'px;')
  } else {
@@ -474,7 +451,6 @@ exports.draw = function (text, id, isDot) {
    } else {
      svg.attr('width', conf.width)
    }
-    // svg.attr('viewBox', svgb.getBBox().x + ' 0 '+ g.graph().width+' '+ g.graph().height);
    svg.attr('viewBox', '0 0 ' + (g.graph().width + 20) + ' ' + (g.graph().height + 20))
  }

@@ -486,7 +462,6 @@ exports.draw = function (text, id, isDot) {

    if (subG.title !== 'undefined') {
      var clusterRects = document.querySelectorAll('#' + id + ' #' + subG.id + ' rect')
-      // log.debug('looking up: #' + id + ' #' + subG.id)
      var clusterEl = document.querySelectorAll('#' + id + ' #' + subG.id)

      var xPos = clusterRects[0].x.baseVal.value
@@ -504,7 +479,6 @@ exports.draw = function (text, id, isDot) {
      if (typeof subG.title === 'undefined') {
        te.text('Undef')
      } else {
-        // te.text(subGraphs[subGraphs.length-i-1].title);
        te.text(subG.title)
      }
    }
--- a/src/diagrams/flowchart/graphDb.js
+++ b/src/diagrams/flowchart/graphDb.js
@@ -331,8 +331,6 @@ exports.addSubGraph = function (list, title) {
  nodeList = uniq(nodeList.concat.apply(nodeList, list))

  var subGraph = { id: 'subGraph' + subCount, nodes: nodeList, title: title }
-// log.debug('subGraph:' + subGraph.title + subGraph.id);
-// log.debug(subGraph.nodes);
  subGraphs.push(subGraph)
  subCount = subCount + 1
  return subGraph.id
@@ -342,11 +340,9 @@ var getPosForId = function (id) {
  var i
  for (i = 0; i < subGraphs.length; i++) {
    if (subGraphs[i].id === id) {
-            // log.debug('Found pos for ',id,' ',i);
      return i
    }
  }
-    // log.debug('No pos found for ',id,' ',i);
  return -1
 }
 var secCount = -1
@@ -357,7 +353,6 @@ var indexNodes = function (id, pos) {
  if (secCount > 2000) {
    return
  }
-    // var nPos = getPosForId(subGraphs[pos].id);
  posCrossRef[secCount] = pos
  // Check if match
  if (subGraphs[pos].id === id) {
--- a/src/diagrams/gantt/gantt.spec.js
+++ b/src/diagrams/gantt/gantt.spec.js
@@ -7,8 +7,6 @@ describe('when parsing a gantt diagram it', function () {
  beforeEach(function () {
    gantt = require('./parser/gantt').parser
    gantt.yy = require('./ganttDb')
-
-        // ex.yy.parseError = parseError;
  })

  it('should handle an dateFormat definition', function () {
@@ -52,5 +50,3 @@ describe('when parsing a gantt diagram it', function () {
    gantt.parse(str)
  })
 })
-
-// Ogiltigt id i after id
--- a/src/diagrams/gantt/ganttDb.js
+++ b/src/diagrams/gantt/ganttDb.js
@@ -53,20 +53,10 @@ exports.getTasks = function () {

  tasks = rawTasks

-    // var i;
-    // for(i=10000;i<tasks.length;i++){
-    //    tasks[i].startTime = moment(tasks[i].startTime).format(dateFormat);
-    //    tasks[i].endTime = moment(tasks[i].endTime).format(dateFormat);
-    // }
-
  return tasks
 }

 var getStartDate = function (prevTime, dateFormat, str) {
-    // console.log('Deciding start date:'+JSON.stringify(str));
-    // log.debug('Deciding start date:'+str);
-    // log.debug('with dateformat:'+dateFormat);
-
  str = str.trim()

  // Test for after
@@ -80,7 +70,6 @@ var getStartDate = function (prevTime, dateFormat, str) {
      var dt = new Date()
      dt.setHours(0, 0, 0, 0)
      return dt
-            // return undefined;
    }
    return task.endTime
  }
@@ -91,7 +80,6 @@ var getStartDate = function (prevTime, dateFormat, str) {
  } else {
    log.debug('Invalid date:' + str)
    log.debug('With date format:' + dateFormat.trim())
-        // log.debug('----');
  }

  // Default date - now
@@ -304,13 +292,6 @@ exports.addTask = function (descr, data) {
 }

 exports.findTaskById = function (id) {
-    // var i;
-    // for(i=0;i<tasks.length;i++){
-    //    if(tasks[i].id === id){
-    //        return tasks[i];
-    //    }
-    // }
-
  var pos = taskDb[id]
  return rawTasks[pos]
 }
--- a/src/diagrams/gantt/ganttDb.spec.js
+++ b/src/diagrams/gantt/ganttDb.spec.js
@@ -7,11 +7,8 @@ describe('when using the ganttDb', function () {
  var moment = require('moment')

  beforeEach(function () {
-        // gantt = require('./parser/gantt').parser;
-
    gDb = require('./ganttDb')
    gDb.clear()
-        // ex.yy.parseError = parseError;
  })

  it('should handle an fixed dates', function () {
@@ -180,5 +177,3 @@ describe('when using the ganttDb', function () {
    expect(tasks[2].endTime).toEqual(moment('2013-01-17', 'YYYY-MM-DD').toDate())
  })
 })
-
-// Ogiltigt id i after id
--- a/src/diagrams/gantt/ganttRenderer.js
+++ b/src/diagrams/gantt/ganttRenderer.js
@@ -2,7 +2,6 @@ var gantt = require('./parser/gantt').parser
 gantt.yy = require('./ganttDb')
 var d3 = require('../../d3')
 var moment = require('moment')
-// var log = require('../../logger').create();

 var daysInChart
 var conf = {
@@ -49,8 +48,6 @@ module.exports.draw = function (text, id) {
  elem.setAttribute('viewBox', '0 0 ' + w + ' ' + h)
  var svg = d3.select('#' + id)

-  // var dateFormat = d3.time.format('%Y-%m-%d');
-
  var startDate = d3.min(taskArray, function (d) {
    return d.startTime
  })
@@ -67,7 +64,6 @@ module.exports.draw = function (text, id) {
        return d.endTime
      })])
    .rangeRound([0, w - conf.leftPadding - conf.rightPadding])
-  // .nice(d3.time.monday);

  var categories = []

@@ -188,7 +184,6 @@ module.exports.draw = function (text, id) {
        return d.task
      })
      .attr('font-size', conf.fontSize)
-      // .attr('font-family',conf.fontFamily)
      .attr('x', function (d) {
        var startX = timeScale(d.startTime)
        var endX = timeScale(d.endTime)
@@ -208,7 +203,6 @@ module.exports.draw = function (text, id) {
      .attr('y', function (d, i) {
        return i * theGap + (conf.barHeight / 2) + (conf.fontSize / 2 - 2) + theTopPad
      })
-      // .attr('text-anchor', 'middle')
      .attr('text-height', theBarHeight)
      .attr('class', function (d) {
        var startX = timeScale(d.startTime)
@@ -279,7 +273,6 @@ module.exports.draw = function (text, id) {
      }],
      // Day within a week (not monday)
      ['%a %d', function (d) {
-        // return d.getDay() ==1;
        return d.getDay() && d.getDate() !== 1
      }],
      // within a month
@@ -346,7 +339,6 @@ module.exports.draw = function (text, id) {
        if (i > 0) {
          for (var j = 0; j < i; j++) {
            prevGap += numOccurances[i - 1][1]
-            // log.debug(prevGap);
            return d[1] * theGap / 2 + prevGap * theGap + theTopPad
          }
        } else {
--- a/src/diagrams/gitGraph/gitGraphAst.js
+++ b/src/diagrams/gitGraph/gitGraphAst.js
@@ -66,10 +66,12 @@ exports.getOptions = function () {
 }

 exports.commit = function (msg) {
-  var commit = { id: getId(),
+  var commit = {
+    id: getId(),
    message: msg,
    seq: seq++,
-    parent: head == null ? null : head.id}
+    parent: head == null ? null : head.id
+  }
  head = commit
  commits[commit.id] = commit
  branches[curBranch] = commit.id
@@ -141,7 +143,6 @@ function upsert (arr, key, newval) {
  } else {
    arr.push(newval)
  }
-    // console.log(arr);
 }

 function prettyPrintCommitHistory (commitArr) {
@@ -160,11 +161,9 @@ function prettyPrintCommitHistory (commitArr) {
  })
  log.debug(label.join(' '))
  if (Array.isArray(commit.parent)) {
-        // console.log("here", commit.parent);
    var newCommit = commits[commit.parent[0]]
    upsert(commitArr, commit, newCommit)
    commitArr.push(commits[commit.parent[1]])
-        // console.log("shoudl have 2", commitArr);
  } else if (commit.parent == null) {
    return
  } else {
@@ -193,7 +192,6 @@ exports.getBranchesAsObjArray = function () {
  var branchArr = _.map(branches, function (v, k) {
    return { 'name': k, 'commit': commits[v] }
  })
-    // return _.orderBy(branchArr, [function(b) { return b.commit.seq}], ['desc']);
  return branchArr
 }

--- a/src/diagrams/gitGraph/gitGraphParser.spec.js
+++ b/src/diagrams/gitGraph/gitGraphParser.spec.js
@@ -15,7 +15,6 @@ describe('when parsing a gitGraph', function () {

    parser.parse(str)
    var commits = parser.yy.getCommits()
-        // console.log(commits);

    expect(Object.keys(commits).length).toBe(1)
    expect(parser.yy.getCurrentBranch()).toBe('master')
@@ -31,7 +30,6 @@ describe('when parsing a gitGraph', function () {

    parser.parse(str)
    var commits = parser.yy.getCommits()
-        // console.log(commits);

    expect(parser.yy.getOptions()).toEqual({})
    expect(Object.keys(commits).length).toBe(1)
@@ -49,8 +47,6 @@ describe('when parsing a gitGraph', function () {

    parser.parse(str)
    var commits = parser.yy.getCommits()
-        // console.log(commits);
-        // console.log('options object', parser.yy.getOptions());
    expect(parser.yy.getOptions()['key']).toBe('value')
    expect(Object.keys(commits).length).toBe(1)
    expect(parser.yy.getCurrentBranch()).toBe('master')
@@ -67,7 +63,6 @@ describe('when parsing a gitGraph', function () {

    parser.parse(str)
    var commits = parser.yy.getCommits()
-        // console.log(commits);
    expect(Object.keys(commits).length).toBe(1)
    expect(parser.yy.getCurrentBranch()).toBe('master')
    expect(parser.yy.getDirection()).toBe('LR')
@@ -80,7 +75,6 @@ describe('when parsing a gitGraph', function () {

    parser.parse(str)
    var commits = parser.yy.getCommits()
-        // console.log(commits);

    expect(Object.keys(commits).length).toBe(1)
    expect(parser.yy.getCurrentBranch()).toBe('master')
@@ -122,7 +116,6 @@ describe('when parsing a gitGraph', function () {

    parser.parse(str)
    var commits = parser.yy.getCommits()
-        // console.log(commits);

    expect(Object.keys(commits).length).toBe(1)
    var key = Object.keys(commits)[0]
@@ -179,7 +172,6 @@ describe('when parsing a gitGraph', function () {
    parser.parse(str)

    var commits = parser.yy.getCommits()
-        // console.log(commits);
    expect(Object.keys(commits).length).toBe(3)
    expect(parser.yy.getCurrentBranch()).toBe('master')
    expect(parser.yy.getBranches()['newbranch']).toEqual(parser.yy.getBranches()['master'])
@@ -198,7 +190,6 @@ describe('when parsing a gitGraph', function () {
    parser.parse(str)

    var commits = parser.yy.getCommits()
-        // console.log(commits);
    expect(Object.keys(commits).length).toBe(3)
    expect(parser.yy.getCurrentBranch()).toBe('newbranch')
    expect(parser.yy.getBranches()['newbranch']).not.toEqual(parser.yy.getBranches()['master'])
@@ -219,7 +210,6 @@ describe('when parsing a gitGraph', function () {
    parser.parse(str)

    var commits = parser.yy.getCommits()
-        // console.log(commits);
    expect(Object.keys(commits).length).toBe(5)
    expect(parser.yy.getCurrentBranch()).toBe('master')
    expect(parser.yy.getBranches()['newbranch']).not.toEqual(parser.yy.getBranches()['master'])
@@ -243,7 +233,6 @@ describe('when parsing a gitGraph', function () {
    parser.parse(str)

    var commits = parser.yy.getCommits()
-        // console.log(commits);
    expect(Object.keys(commits).length).toBe(6)
    expect(parser.yy.getCurrentBranch()).toBe('newbranch')
    expect(parser.yy.getBranches()['newbranch']).toEqual(parser.yy.getBranches()['master'])
--- a/src/diagrams/gitGraph/gitGraphRenderer.js
+++ b/src/diagrams/gitGraph/gitGraphRenderer.js
@@ -76,7 +76,6 @@ function getElementCoords (element, coords) {
  var ctm = element.node().getCTM()
  var xn = ctm.e + coords.x * ctm.a
  var yn = ctm.f + coords.y * ctm.d
-    // log.debug(ctm, coords);
  return {
    left: xn,
    top: yn,
@@ -89,7 +88,6 @@ function svgDrawLineForCommits (svg, fromId, toId, direction, color) {
  log.debug('svgDrawLineForCommits: ', fromId, toId)
  var fromBbox = getElementCoords(svg.select('#node-' + fromId + ' circle'))
  var toBbox = getElementCoords(svg.select('#node-' + toId + ' circle'))
-    // log.debug('svgDrawLineForCommits: ', fromBbox, toBbox);
  switch (direction) {
    case 'LR':
      // (toBbox)
@@ -269,10 +267,6 @@ exports.draw = function (txt, id, ver) {
      if (direction === 'BT') return Object.keys(allCommitsDict).length * config.nodeSpacing
      return (branches.length + 1) * config.branchOffset
    })
-        // svg.attr('width', function() {
-            // if (direction === 'LR') return Object.keys(allCommitsDict).length * config.nodeSpacing + config.leftMargin;
-            // return (branches.length + 1) * config.branchOffset;
-        // });
  } catch (e) {
    log.error('Error while rendering gitgraph')
    log.error(e.message)
--- a/src/diagrams/sequenceDiagram/sequenceDb.js
+++ b/src/diagrams/sequenceDiagram/sequenceDb.js
@@ -23,9 +23,6 @@ exports.addMessage = function (idFrom, idTo, message, answer) {
  messages.push({ from: idFrom, to: idTo, message: message, answer: answer })
 }

-/**
- *
- */
 exports.addSignal = function (idFrom, idTo, message, messageType) {
  log.debug('Adding message from=' + idFrom + ' to=' + idTo + ' message=' + message + ' type=' + messageType)
  messages.push({ from: idFrom, to: idTo, message: message, type: messageType })
@@ -110,7 +107,6 @@ exports.apply = function (param) {
      exports.apply(item)
    })
  } else {
-        // console.info(param);
    switch (param.type) {
      case 'addActor':
        exports.addActor(param.actor, param.actor, param.description)
@@ -128,25 +124,19 @@ exports.apply = function (param) {
        exports.addSignal(param.from, param.to, param.msg, param.signalType)
        break
      case 'loopStart':
-                // log.debug('Loop text: ',param.loopText);
        exports.addSignal(undefined, undefined, param.loopText, param.signalType)
-                // yy.addSignal(undefined, undefined, $2, yy.LINETYPE.LOOP_START);
        break
      case 'loopEnd':
        exports.addSignal(undefined, undefined, undefined, param.signalType)
        break
      case 'optStart':
-                // log.debug('Loop text: ',param.loopText);
        exports.addSignal(undefined, undefined, param.optText, param.signalType)
-                // yy.addSignal(undefined, undefined, $2, yy.LINETYPE.LOOP_START);
        break
      case 'optEnd':
        exports.addSignal(undefined, undefined, undefined, param.signalType)
        break
      case 'altStart':
-                // log.debug('Loop text: ',param.loopText);
        exports.addSignal(undefined, undefined, param.altText, param.signalType)
-                // yy.addSignal(undefined, undefined, $2, yy.LINETYPE.LOOP_START);
        break
      case 'else':
        exports.addSignal(undefined, undefined, param.altText, param.signalType)
--- a/src/diagrams/sequenceDiagram/sequenceDiagram.spec.js
+++ b/src/diagrams/sequenceDiagram/sequenceDiagram.spec.js
@@ -3,8 +3,6 @@ var proxyquire = require('proxyquire')
 /**
 * Created by knut on 14-11-18.
 */
-// var proxyquire = require('proxyquire');
-// var log = require('../../logger').create();

 var sq = require('./parser/sequenceDiagram').parser
 var NewD3
@@ -17,13 +15,8 @@ var d3 = {
    return new NewD3()
  }
 }
-// var sd = proxyquire('./sequenceRenderer', { './d3': d3 });
 var sd = proxyquire('./sequenceRenderer', { '../../d3': d3 })

-//
-//
-// var sd = require('./sequenceRenderer');
-
 function addConf (conf, key, value) {
  if (value !== undefined) {
    conf[key] = value
@@ -36,11 +29,6 @@ describe('when parsing a sequenceDiagram', function () {
  beforeEach(function () {
    sq.yy = require('./sequenceDb')
    sq.yy.clear()
-        // parseError = function(err, hash) {
-        //    log.debug('Syntax error:' + err);
-        //    log.debug(hash);
-        // };
-        // sq.yy.parseError = parseError;
  })
  it('it should handle a sequenceDiagram defintion', function () {
    str = 'sequenceDiagram\n' +
@@ -615,12 +603,6 @@ describe('when checking the bounds in a sequenceDiagram', function () {
  beforeEach(function () {
    sq.yy = require('./sequenceDb')
    sq.yy.clear()
-        // parseError = function(err, hash) {
-        //    log.debug('Syntax error:' + err);
-        //    log.debug(hash);
-        // };
-        // sq.yy.parseError = parseError;
-
    conf = {
      diagramMarginX: 50,
      diagramMarginY: 10,
@@ -758,21 +740,8 @@ describe('when rendering a sequenceDiagram', function () {
    sq.yy = require('./sequenceDb')
    sq.yy.clear()

-        // var MockBrowser = require('mock-browser').mocks.MockBrowser;
-        // var mock = new MockBrowser();
-
    delete global.mermaid_config

-        // and in the run-code inside some object
-        // global.document = mock.getDocument();
-        // global.window = mock.getWindow();
-
-        // parseError = function(err, hash) {
-        //    log.debug('Syntax error:' + err);
-        //    log.debug(hash);
-        // };
-        // sq.yy.parseError = parseError;
-
    NewD3 = function () {
      var o = {
        append: function () {
@@ -816,11 +785,6 @@ describe('when rendering a sequenceDiagram', function () {
      noteMargin: 25
    }
    sd.setConf(conf)
-        // document.body.innerHTML = '<div id="tst"></div>';
-        // document.body.innerHTML = '<svg height="30" width="200"><text id="tst" x="0" y="15" fill="red">I love SVG!</text></svg>';
-        // document.body.innerHTML = '<svg height="30" width="200"><text x="0" y="15" fill="red"><tspan x="46" id="tst">Alice thinks</tspan></text></svg>';
-        // console.log('document.body');
-        // console.log(document.querySelector('#tst').getBBox());
  });
  ['tspan', 'fo', 'old', undefined].forEach(function (textPlacement) {
    it('it should handle one actor, when textPlacement is ' + textPlacement, function () {
@@ -992,11 +956,6 @@ describe('when rendering a sequenceDiagram with actor mirror activated', functio
  beforeEach(function () {
    sq.yy = require('./sequenceDb')
    sq.yy.clear()
-        // parseError = function(err, hash) {
-        //    log.debug('Syntax error:' + err);
-        //    log.debug(hash);
-        // };
-        // sq.yy.parseError = parseError;

    NewD3 = function () {
      var o = {
--- a/src/diagrams/sequenceDiagram/sequenceRenderer.js
+++ b/src/diagrams/sequenceDiagram/sequenceRenderer.js
@@ -114,7 +114,8 @@ exports.bounds = {
    var actorRect = sq.yy.getActors()[message.from.actor]
    var stackedSize = actorActivations(message.from.actor).length
    var x = actorRect.x + conf.width / 2 + (stackedSize - 1) * conf.activationWidth / 2
-    this.activations.push({startx: x,
+    this.activations.push({
+      startx: x,
      starty: this.verticalPos + 2,
      stopx: x + conf.activationWidth,
      stopy: undefined,
@@ -225,9 +226,7 @@ var drawMessage = function (elem, startx, stopx, verticalPos, msg) {
  if (typeof textElem[0][0].getBBox !== 'undefined') {
    textWidth = textElem[0][0].getBBox().width
  } else {
-        // textWidth = getBBox(textElem).width; //.getComputedTextLength()
    textWidth = textElem[0][0].getBoundingClientRect()
-        // textWidth = textElem[0][0].getComputedTextLength();
  }

  var line
@@ -294,7 +293,6 @@ module.exports.drawActors = function (diagram, actors, actorKeys, verticalPos) {
  }

  // Add a margin between the actor boxes and the first arrow
-    // exports.bounds.bumpVerticalPos(conf.height+conf.messageMargin);
  exports.bounds.bumpVerticalPos(conf.height)
 }

--- a/src/diagrams/sequenceDiagram/svgDraw.js
+++ b/src/diagrams/sequenceDiagram/svgDraw.js
@@ -1,7 +1,6 @@
 /**
 * Created by knut on 14-12-20.
 */
-// var log = require('../../logger').create();
 exports.drawRect = function (elem, rectData) {
  var rectElem = elem.append('rect')
  rectElem.attr('x', rectData.x)
@@ -32,17 +31,9 @@ exports.drawText = function (elem, textData, width) {
  if (typeof textData.class !== 'undefined') {
    textElem.attr('class', textData.class)
  }
-    /*    textData.text.split(/<br\/?>/ig).forEach(function(rowText){
-            var span = textElem.append('tspan');
-            span.attr('x', textData.x +textData.textMargin);
-            span.attr('dy', textData.dy);
-            span.text(rowText);
-        }); */

  var span = textElem.append('tspan')
-    // span.attr('x', textData.x);
  span.attr('x', textData.x + textData.textMargin * 2)
-    // span.attr('dy', textData.dy);
  span.attr('fill', textData.fill)
  span.text(nText)
  if (typeof textElem.textwrap !== 'undefined') {
@@ -73,8 +64,6 @@ exports.drawLabel = function (elem, txtObject) {
  txtObject.x = txtObject.x + 0.5 * txtObject.labelMargin
  txtObject.fill = 'white'
  exports.drawText(elem, txtObject)
-
-    // return textElem;
 }
 var actorCnt = -1
 /**