Merge pull request #154 from yodalee/issue140-vertical-arrow-with-multiple-branch-commit

Close #140. Vertical arrow with multiple branch commit.

Author: nicoespeon

src/gitgraph.js

@@ -505,7 +505,7 @@
     this.height = 0;
     this.width = 0;
     this.commits = [];
-    this.path = []; // Path to draw, this is an array of points {x, y, type("start"|"join"|"end")}
+    this.path = []; // Path to draw, this is an array of points {x, y, type("start"|"joint"|"end")}
 
     // Column number calculation for auto-color & auto-offset
     if (typeof options.column === "number") {
@@ -757,23 +757,25 @@
     var point = {
       x: commit.x,
       y: commit.y,
-      type: "join"
+      type: "joint"
     };
 
     if (!isFirstBranch && isPathBeginning) {
       this.pushPath(this.startPoint);
-
-      // Trace path from parent branch if it has commits already
-      if (this.parentBranch.commits.length > 0) {
+      // Add a path joint to startpoint + template spacing
+      // So that line will not go through commit of other branches
+      if ((this.parent.orientation === "vertical-reverse") || (this.parent.orientation === "vertical")) {
         this.pushPath({
-          x: this.startPoint.x - this.parentBranch.offsetX + this.offsetX - this.template.commit.spacingX,
-          y: this.startPoint.y - this.parentBranch.offsetY + this.offsetY - this.template.commit.spacingY,
-          type: "join"
+          x: commit.x,
+          y: this.startPoint.y - this.template.commit.spacingY,
+          type: "joint"
+        });
+      } else {
+        this.pushPath({
+          x: this.startPoint.x - this.template.commit.spacingX,
+          y: commit.y,
+          type: "joint"
         });
-
-        var parent = _clone(this.startPoint);
-        parent.type = "join";
-        this.parentBranch.pushPath(parent);
       }
     } else if (isPathBeginning) {
       point.type = "start";
@@ -932,7 +934,7 @@
       var endOfBranch = {
         x: this.offsetX + this.template.commit.spacingX * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetX,
         y: this.offsetY + this.template.commit.spacingY * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetY,
-        type: "join"
+        type: "joint"
       };
       this.pushPath(_clone(endOfBranch));
 
@@ -994,13 +996,13 @@
     } else if (lastPoint.x === point.x && lastPoint.y === point.y) {
       if (lastPoint.type !== "start" && point.type === "end") {
         lastPoint.type = "end";
-      } else if (point.type === "join") {
+      } else if (point.type === "joint") {
 
       } else {
         this.path.push(point);
       }
     } else {
-      if (point.type === "join") {
+      if (point.type === "joint") {
         if ((point.x - lastPoint.x) * this.template.commit.spacingX < 0) {
           this.path.push(point);
         } else if ((point.y - lastPoint.y) * this.template.commit.spacingY < 0) {