Skip to content
This repository was archived by the owner on Jul 13, 2024. It is now read-only.

Commit 024c643

Browse files
nicoespeonnicoespeon
committed
Merge develop into master
2 parents f388dfb + 16422a8 commit 024c643

13 files changed

+56
-65
lines changed

‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gitgraph.js",
3-
"version": "1.8.2",
3+
"version": "1.8.3",
44
"main": ["./build/gitgraph.js", "./build/gitgraph.css"],
55
"ignore": [
66
"**/.*"

‎build/gitgraph.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* GitGraph v1.8.2
2+
* GitGraph v1.8.3
33
* https://github.com/nicoespeon/gitgraph.js
44
* ==========================================================
55
* Copyright (c) 2017 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
@@ -307,8 +307,6 @@
307307
branch.render();
308308
}
309309

310-
this.tagNum = 0;
311-
312310
// Render commits after to put them on the foreground
313311
for (var j = 0, commit; !!(commit = this.commits[j]); j++) {
314312
commit.render();
@@ -1296,15 +1294,14 @@
12961294
var textWidth = commit.context.measureText(commit.tag).width;
12971295
this.width = Math.max(commit.template.commit.tag.spacingX, textWidth);
12981296

1299-
commit.parent.tagNum++;
1300-
13011297
var x = 0;
13021298
var y = 0;
1299+
var tagColumn = (commit.parent.columnMax + 1);
13031300
if (_isHorizontal(commit.parent)) {
13041301
x = commit.x - commit.dotSize / 2;
1305-
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;
1302+
y = (tagColumn * commit.template.commit.tag.spacingY) - commit.template.commit.tag.spacingY / 2;
13061303
} else {
1307-
x = ((commit.parent.columnMax + 1) * commit.template.commit.tag.spacingX) - commit.template.commit.tag.spacingX / 2 + textWidth / 2;
1304+
x = (tagColumn * commit.template.commit.tag.spacingX) - commit.template.commit.tag.spacingX / 2 + textWidth / 2;
13081305
y = commit.y - commit.dotSize / 2;
13091306
}
13101307

‎build/gitgraph.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/Branch.html

+11-11
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ <h6>Properties</h6>
351351

352352
<dt class="tag-source">Source:</dt>
353353
<dd class="tag-source"><ul class="dummy"><li>
354-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line468">line 468</a>
354+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line466">line 466</a>
355355
</li></ul></dd>
356356

357357

@@ -492,7 +492,7 @@ <h5>Parameters:</h5>
492492

493493
<dt class="tag-source">Source:</dt>
494494
<dd class="tag-source"><ul class="dummy"><li>
495-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line558">line 558</a>
495+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line556">line 556</a>
496496
</li></ul></dd>
497497

498498

@@ -593,7 +593,7 @@ <h5>This:</h5>
593593

594594
<dt class="tag-source">Source:</dt>
595595
<dd class="tag-source"><ul class="dummy"><li>
596-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line931">line 931</a>
596+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line929">line 929</a>
597597
</li></ul></dd>
598598

599599

@@ -665,7 +665,7 @@ <h5>This:</h5>
665665

666666
<dt class="tag-source">Source:</dt>
667667
<dd class="tag-source"><ul class="dummy"><li>
668-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line810">line 810</a>
668+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line808">line 808</a>
669669
</li></ul></dd>
670670

671671

@@ -860,7 +860,7 @@ <h6>Properties</h6>
860860

861861
<dt class="tag-source">Source:</dt>
862862
<dd class="tag-source"><ul class="dummy"><li>
863-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line632">line 632</a>
863+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line630">line 630</a>
864864
</li></ul></dd>
865865

866866

@@ -939,7 +939,7 @@ <h5>This:</h5>
939939

940940
<dt class="tag-source">Source:</dt>
941941
<dd class="tag-source"><ul class="dummy"><li>
942-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line819">line 819</a>
942+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line817">line 817</a>
943943
</li></ul></dd>
944944

945945

@@ -1187,7 +1187,7 @@ <h6>Properties</h6>
11871187

11881188
<dt class="tag-source">Source:</dt>
11891189
<dd class="tag-source"><ul class="dummy"><li>
1190-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line834">line 834</a>
1190+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line832">line 832</a>
11911191
</li></ul></dd>
11921192

11931193

@@ -1282,7 +1282,7 @@ <h5>This:</h5>
12821282

12831283
<dt class="tag-source">Source:</dt>
12841284
<dd class="tag-source"><ul class="dummy"><li>
1285-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line956">line 956</a>
1285+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line954">line 954</a>
12861286
</li></ul></dd>
12871287

12881288

@@ -1354,7 +1354,7 @@ <h5>This:</h5>
13541354

13551355
<dt class="tag-source">Source:</dt>
13561356
<dd class="tag-source"><ul class="dummy"><li>
1357-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line583">line 583</a>
1357+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line581">line 581</a>
13581358
</li></ul></dd>
13591359

13601360

@@ -1648,7 +1648,7 @@ <h6>Properties</h6>
16481648

16491649
<dt class="tag-source">Source:</dt>
16501650
<dd class="tag-source"><ul class="dummy"><li>
1651-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line786">line 786</a>
1651+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line784">line 784</a>
16521652
</li></ul></dd>
16531653

16541654

@@ -1702,7 +1702,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
17021702
<br clear="both">
17031703

17041704
<footer>
1705-
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)
1705+
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)
17061706
</footer>
17071707

17081708
<script> prettyPrint(); </script>

‎docs/Commit.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -1335,7 +1335,7 @@ <h6>Properties</h6>
13351335

13361336
<dt class="tag-source">Source:</dt>
13371337
<dd class="tag-source"><ul class="dummy"><li>
1338-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1030">line 1030</a>
1338+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1028">line 1028</a>
13391339
</li></ul></dd>
13401340

13411341

@@ -1425,7 +1425,7 @@ <h5>This:</h5>
14251425

14261426
<dt class="tag-source">Source:</dt>
14271427
<dd class="tag-source"><ul class="dummy"><li>
1428-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1185">line 1185</a>
1428+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1183">line 1183</a>
14291429
</li></ul></dd>
14301430

14311431

@@ -1497,7 +1497,7 @@ <h5>This:</h5>
14971497

14981498
<dt class="tag-source">Source:</dt>
14991499
<dd class="tag-source"><ul class="dummy"><li>
1500-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1078">line 1078</a>
1500+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1076">line 1076</a>
15011501
</li></ul></dd>
15021502

15031503

@@ -1544,7 +1544,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
15441544
<br clear="both">
15451545

15461546
<footer>
1547-
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)
1547+
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)
15481548
</footer>
15491549

15501550
<script> prettyPrint(); </script>

‎docs/GitGraph.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ <h5>Parameters:</h5>
674674

675675
<dt class="tag-source">Source:</dt>
676676
<dd class="tag-source"><ul class="dummy"><li>
677-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line336">line 336</a>
677+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line334">line 334</a>
678678
</li></ul></dd>
679679

680680

@@ -946,7 +946,7 @@ <h5>Parameters:</h5>
946946

947947
<dt class="tag-source">Source:</dt>
948948
<dd class="tag-source"><ul class="dummy"><li>
949-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line438">line 438</a>
949+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line436">line 436</a>
950950
</li></ul></dd>
951951

952952

@@ -1287,7 +1287,7 @@ <h5>Parameters:</h5>
12871287

12881288
<dt class="tag-source">Source:</dt>
12891289
<dd class="tag-source"><ul class="dummy"><li>
1290-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line368">line 368</a>
1290+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line366">line 366</a>
12911291
</li></ul></dd>
12921292

12931293

@@ -1845,7 +1845,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
18451845
<br clear="both">
18461846

18471847
<footer>
1848-
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)
1848+
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)
18491849
</footer>
18501850

18511851
<script> prettyPrint(); </script>

‎docs/Tag.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ <h6>Properties</h6>
281281

282282
<dt class="tag-source">Source:</dt>
283283
<dd class="tag-source"><ul class="dummy"><li>
284-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1273">line 1273</a>
284+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1271">line 1271</a>
285285
</li></ul></dd>
286286

287287

@@ -360,7 +360,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
360360
<br clear="both">
361361

362362
<footer>
363-
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)
363+
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)
364364
</footer>
365365

366366
<script> prettyPrint(); </script>

‎docs/Template.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,7 @@ <h6>Properties</h6>
10931093

10941094
<dt class="tag-source">Source:</dt>
10951095
<dd class="tag-source"><ul class="dummy"><li>
1096-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1347">line 1347</a>
1096+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1344">line 1344</a>
10971097
</li></ul></dd>
10981098

10991099

@@ -1228,7 +1228,7 @@ <h5>Parameters:</h5>
12281228

12291229
<dt class="tag-source">Source:</dt>
12301230
<dd class="tag-source"><ul class="dummy"><li>
1231-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1434">line 1434</a>
1231+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1431">line 1431</a>
12321232
</li></ul></dd>
12331233

12341234

@@ -1297,7 +1297,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
12971297
<br clear="both">
12981298

12991299
<footer>
1300-
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)
1300+
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)
13011301
</footer>
13021302

13031303
<script> prettyPrint(); </script>

‎docs/gitgraph.js.html

+4-7
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,6 @@ <h1 class="page-title">Source: gitgraph.js</h1>
324324
branch.render();
325325
}
326326

327-
this.tagNum = 0;
328-
329327
// Render commits after to put them on the foreground
330328
for (var j = 0, commit; !!(commit = this.commits[j]); j++) {
331329
commit.render();
@@ -1313,15 +1311,14 @@ <h1 class="page-title">Source: gitgraph.js</h1>
13131311
var textWidth = commit.context.measureText(commit.tag).width;
13141312
this.width = Math.max(commit.template.commit.tag.spacingX, textWidth);
13151313

1316-
commit.parent.tagNum++;
1317-
13181314
var x = 0;
13191315
var y = 0;
1316+
var tagColumn = (commit.parent.columnMax + 1);
13201317
if (_isHorizontal(commit.parent)) {
13211318
x = commit.x - commit.dotSize / 2;
1322-
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;
1319+
y = (tagColumn * commit.template.commit.tag.spacingY) - commit.template.commit.tag.spacingY / 2;
13231320
} else {
1324-
x = ((commit.parent.columnMax + 1) * commit.template.commit.tag.spacingX) - commit.template.commit.tag.spacingX / 2 + textWidth / 2;
1321+
x = (tagColumn * commit.template.commit.tag.spacingX) - commit.template.commit.tag.spacingX / 2 + textWidth / 2;
13251322
y = commit.y - commit.dotSize / 2;
13261323
}
13271324

@@ -1831,7 +1828,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
18311828
<br clear="both">
18321829

18331830
<footer>
1834-
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)
1831+
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)
18351832
</footer>
18361833

18371834
<script> prettyPrint(); </script>

0 commit comments

Comments
 (0)