Refactor arrow color fix for merge commit

nicoespeon · nicoespeon · commit b3b487fd2739 · 2019-01-27T14:01:35.000-05:00
diff --git a/src/gitgraph.js b/src/gitgraph.js
@@ -1288,9 +1288,10 @@
       }
 
       alpha = rotate(alphaY, alphaX);
-      if (this.type != null ){
-        color = this.parentCommit.branch.color;
-      }
+    }
+
+    if (this.type === "mergeCommit"){
+      color = this.parentCommit.branch.color;
     }
 
     var delta = Math.PI / 7; // Delta between left & right (radian)

Original file line number	Diff line number	Diff line change
`@@ -1288,9 +1288,10 @@`
`1288`	`1288`	`}`
`1289`	`1289`
`1290`	`1290`	`alpha = rotate(alphaY, alphaX);`
`1291`		`- if (this.type != null ){`
`1292`		`- color = this.parentCommit.branch.color;`
`1293`		`- }`
	`1291`	`+ }`
	`1292`	`+`
	`1293`	`+ if (this.type === "mergeCommit"){`
	`1294`	`+ color = this.parentCommit.branch.color;`
`1294`	`1295`	`}`
`1295`	`1296`
`1296`	`1297`	`var delta = Math.PI / 7; // Delta between left & right (radian)`