Merge develop into master

nicoespeon · Jan 10, 2017 · 024c643 · 024c643
2 parents f388dfb + 16422a8
commit 024c643
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 65 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "gitgraph.js",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "main": ["./build/gitgraph.js", "./build/gitgraph.css"],
   "ignore": [
     "**/.*"

diff --git a/build/gitgraph.js b/build/gitgraph.js
@@ -1,5 +1,5 @@
 /* ==========================================================
- *                  GitGraph v1.8.2
+ *                  GitGraph v1.8.3
  *      https://github.com/nicoespeon/gitgraph.js
  * ==========================================================
  * Copyright (c) 2017 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
@@ -307,8 +307,6 @@
       branch.render();
     }
 
-    this.tagNum = 0;
-
     // Render commits after to put them on the foreground
     for (var j = 0, commit; !!(commit = this.commits[j]); j++) {
       commit.render();
@@ -1296,15 +1294,14 @@
     var textWidth = commit.context.measureText(commit.tag).width;
     this.width = Math.max(commit.template.commit.tag.spacingX, textWidth);
 
-    commit.parent.tagNum++;
-
     var x = 0;
     var y = 0;
+    var tagColumn = (commit.parent.columnMax + 1);
     if (_isHorizontal(commit.parent)) {
       x = commit.x - commit.dotSize / 2;
-      y = ((commit.parent.columnMax + 1) * commit.template.commit.tag.spacingY) - commit.template.commit.tag.spacingY / 2 + (commit.parent.tagNum % 2) * _getFontHeight(this.font) * 1.5;
+      y = (tagColumn * commit.template.commit.tag.spacingY) - commit.template.commit.tag.spacingY / 2;
     } else {
-      x = ((commit.parent.columnMax + 1) * commit.template.commit.tag.spacingX) - commit.template.commit.tag.spacingX / 2 + textWidth / 2;
+      x = (tagColumn * commit.template.commit.tag.spacingX) - commit.template.commit.tag.spacingX / 2 + textWidth / 2;
       y = commit.y - commit.dotSize / 2;
     }
 

diff --git a/build/gitgraph.min.js b/build/gitgraph.min.js
diff --git a/docs/Branch.html b/docs/Branch.html
@@ -351,7 +351,7 @@ <h6>Properties</h6>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line468">line 468</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line466">line 466</a>
     </li></ul></dd>
 
 
@@ -492,7 +492,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line558">line 558</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line556">line 556</a>
     </li></ul></dd>
 
 
@@ -593,7 +593,7 @@ <h5>This:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line931">line 931</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line929">line 929</a>
     </li></ul></dd>
 
 
@@ -665,7 +665,7 @@ <h5>This:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line810">line 810</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line808">line 808</a>
     </li></ul></dd>
 
 
@@ -860,7 +860,7 @@ <h6>Properties</h6>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line632">line 632</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line630">line 630</a>
     </li></ul></dd>
 
 
@@ -939,7 +939,7 @@ <h5>This:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line819">line 819</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line817">line 817</a>
     </li></ul></dd>
 
 
@@ -1187,7 +1187,7 @@ <h6>Properties</h6>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line834">line 834</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line832">line 832</a>
     </li></ul></dd>
 
 
@@ -1282,7 +1282,7 @@ <h5>This:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line956">line 956</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line954">line 954</a>
     </li></ul></dd>
 
 
@@ -1354,7 +1354,7 @@ <h5>This:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line583">line 583</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line581">line 581</a>
     </li></ul></dd>
 
 
@@ -1648,7 +1648,7 @@ <h6>Properties</h6>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line786">line 786</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line784">line 784</a>
     </li></ul></dd>
 
 
@@ -1702,7 +1702,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Tue Jan 10 2017 00:50:02 GMT+0100 (CET)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Tue Jan 10 2017 08:09:14 GMT+0100 (CET)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/Commit.html b/docs/Commit.html
@@ -1335,7 +1335,7 @@ <h6>Properties</h6>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1030">line 1030</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1028">line 1028</a>
     </li></ul></dd>
 
 
@@ -1425,7 +1425,7 @@ <h5>This:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1185">line 1185</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1183">line 1183</a>
     </li></ul></dd>
 
 
@@ -1497,7 +1497,7 @@ <h5>This:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1078">line 1078</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1076">line 1076</a>
     </li></ul></dd>
 
 
@@ -1544,7 +1544,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Tue Jan 10 2017 00:50:02 GMT+0100 (CET)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Tue Jan 10 2017 08:09:14 GMT+0100 (CET)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/GitGraph.html b/docs/GitGraph.html
@@ -674,7 +674,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line336">line 336</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line334">line 334</a>
     </li></ul></dd>
 
 
@@ -946,7 +946,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line438">line 438</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line436">line 436</a>
     </li></ul></dd>
 
 
@@ -1287,7 +1287,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line368">line 368</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line366">line 366</a>
     </li></ul></dd>
 
 
@@ -1845,7 +1845,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Tue Jan 10 2017 00:50:02 GMT+0100 (CET)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Tue Jan 10 2017 08:09:14 GMT+0100 (CET)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/Tag.html b/docs/Tag.html
@@ -281,7 +281,7 @@ <h6>Properties</h6>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1273">line 1273</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1271">line 1271</a>
     </li></ul></dd>
 
 
@@ -360,7 +360,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Tue Jan 10 2017 00:50:02 GMT+0100 (CET)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Tue Jan 10 2017 08:09:14 GMT+0100 (CET)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/Template.html b/docs/Template.html
@@ -1093,7 +1093,7 @@ <h6>Properties</h6>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1347">line 1347</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1344">line 1344</a>
     </li></ul></dd>
 
 
@@ -1228,7 +1228,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1434">line 1434</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1431">line 1431</a>
     </li></ul></dd>
 
 
@@ -1297,7 +1297,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Tue Jan 10 2017 00:50:02 GMT+0100 (CET)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Tue Jan 10 2017 08:09:14 GMT+0100 (CET)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/gitgraph.js.html b/docs/gitgraph.js.html
@@ -324,8 +324,6 @@ <h1 class="page-title">Source: gitgraph.js</h1>
       branch.render();
     }
 
-    this.tagNum = 0;
-
     // Render commits after to put them on the foreground
     for (var j = 0, commit; !!(commit = this.commits[j]); j++) {
       commit.render();
@@ -1313,15 +1311,14 @@ <h1 class="page-title">Source: gitgraph.js</h1>
     var textWidth = commit.context.measureText(commit.tag).width;
     this.width = Math.max(commit.template.commit.tag.spacingX, textWidth);
 
-    commit.parent.tagNum++;
-
     var x = 0;
     var y = 0;
+    var tagColumn = (commit.parent.columnMax + 1);
     if (_isHorizontal(commit.parent)) {
       x = commit.x - commit.dotSize / 2;
-      y = ((commit.parent.columnMax + 1) * commit.template.commit.tag.spacingY) - commit.template.commit.tag.spacingY / 2 + (commit.parent.tagNum % 2) * _getFontHeight(this.font) * 1.5;
+      y = (tagColumn * commit.template.commit.tag.spacingY) - commit.template.commit.tag.spacingY / 2;
     } else {
-      x = ((commit.parent.columnMax + 1) * commit.template.commit.tag.spacingX) - commit.template.commit.tag.spacingX / 2 + textWidth / 2;
+      x = (tagColumn * commit.template.commit.tag.spacingX) - commit.template.commit.tag.spacingX / 2 + textWidth / 2;
       y = commit.y - commit.dotSize / 2;
     }
 
@@ -1831,7 +1828,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Tue Jan 10 2017 00:50:01 GMT+0100 (CET)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Tue Jan 10 2017 08:09:14 GMT+0100 (CET)
 </footer>
 
 <script> prettyPrint(); </script>