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

Commit c8f3ed6

Browse files
nicoespeonnicoespeon
committedJan 27, 2019
Merge develop into master
2 parents e3076e8 + 0983a60 commit c8f3ed6

14 files changed

+37
-28
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.15.0",
3+
"version": "1.15.1",
44
"main": ["./build/gitgraph.js", "./build/gitgraph.css"],
55
"ignore": ["**/.*"]
66
}

‎build/gitgraph.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ commit?: {
481481
dot?: {
482482

483483
/**
484-
* Commit dot color
484+
* Commit dot font
485485
*/
486486
font?: string;
487487

‎build/gitgraph.js

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* ==========================================================
2-
* GitGraph v1.15.0
2+
* GitGraph v1.15.1
33
* https://github.com/nicoespeon/gitgraph.js
44
* ==========================================================
5-
* Copyright (c) 2018 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
6-
* Copyright (c) 2018 Fabien BERNARD (@fabien0102) ✌(✰‿✰)✌
5+
* Copyright (c) 2019 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
6+
* Copyright (c) 2019 Fabien BERNARD (@fabien0102) ✌(✰‿✰)✌
77
*
88
* GitGraph.js may be freely distributed under the MIT Licence
99
* ========================================================== */
@@ -1298,6 +1298,9 @@
12981298
}
12991299

13001300
alpha = rotate(alphaY, alphaX);
1301+
}
1302+
1303+
if (this.type === "mergeCommit"){
13011304
color = this.parentCommit.branch.color;
13021305
}
13031306

@@ -1406,9 +1409,9 @@
14061409
* @param {number} [options.branch.spacingY] - Space between branches
14071410
* @param {number} [options.commit.spacingX] - Space between commits
14081411
* @param {number} [options.commit.spacingY] - Space between commits
1409-
* @param {number} [options.commit.widthExtension = 0] - Additional width to be added to the calculated width
1412+
* @param {number} [options.commit.widthExtension = 0] - Additional width to be added to the calculated width
14101413
* @param {string} [options.commit.color] - Master commit color (dot & message)
1411-
* @param {string} [options.commit.dot.font] - Commit dot color
1414+
* @param {string} [options.commit.dot.font] - Commit dot font
14121415
* @param {string} [options.commit.dot.color] - Commit dot color
14131416
* @param {number} [options.commit.dot.size] - Commit dot size
14141417
* @param {number} [options.commit.dot.strokeWidth] - Commit dot stroke width

‎build/gitgraph.min.js

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

‎docs/Branch.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1928,7 +1928,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
19281928
<br class="clear">
19291929

19301930
<footer>
1931-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Dec 29 2018 16:51:16 GMT-0500 (EST)
1931+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Jan 27 2019 14:02:18 GMT-0500 (EST)
19321932
</footer>
19331933

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

‎docs/Commit.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1713,7 +1713,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
17131713
<br class="clear">
17141714

17151715
<footer>
1716-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Dec 29 2018 16:51:16 GMT-0500 (EST)
1716+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Jan 27 2019 14:02:18 GMT-0500 (EST)
17171717
</footer>
17181718

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

‎docs/GitGraph.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2107,7 +2107,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
21072107
<br class="clear">
21082108

21092109
<footer>
2110-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Dec 29 2018 16:51:16 GMT-0500 (EST)
2110+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Jan 27 2019 14:02:18 GMT-0500 (EST)
21112111
</footer>
21122112

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

‎docs/Tag.html

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

297297
<dt class="tag-source">Source:</dt>
298298
<dd class="tag-source"><ul class="dummy"><li>
299-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1342">line 1342</a>
299+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1345">line 1345</a>
300300
</li></ul></dd>
301301

302302

@@ -380,7 +380,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
380380
<br class="clear">
381381

382382
<footer>
383-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Dec 29 2018 16:51:16 GMT-0500 (EST)
383+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Jan 27 2019 14:02:18 GMT-0500 (EST)
384384
</footer>
385385

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

‎docs/Template.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ <h6>Properties</h6>
686686
</td>
687687

688688

689-
<td class="description last"><p>Commit dot color</p></td>
689+
<td class="description last"><p>Commit dot font</p></td>
690690
</tr>
691691

692692

@@ -1219,7 +1219,7 @@ <h6>Properties</h6>
12191219

12201220
<dt class="tag-source">Source:</dt>
12211221
<dd class="tag-source"><ul class="dummy"><li>
1222-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1418">line 1418</a>
1222+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1421">line 1421</a>
12231223
</li></ul></dd>
12241224

12251225

@@ -1374,7 +1374,7 @@ <h5>Parameters:</h5>
13741374

13751375
<dt class="tag-source">Source:</dt>
13761376
<dd class="tag-source"><ul class="dummy"><li>
1377-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1507">line 1507</a>
1377+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1510">line 1510</a>
13781378
</li></ul></dd>
13791379

13801380

@@ -1446,7 +1446,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
14461446
<br class="clear">
14471447

14481448
<footer>
1449-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Dec 29 2018 16:51:16 GMT-0500 (EST)
1449+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Jan 27 2019 14:02:18 GMT-0500 (EST)
14501450
</footer>
14511451

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

‎docs/gitgraph.js.html

+6-3
Original file line numberDiff line numberDiff line change
@@ -1316,6 +1316,9 @@ <h1 class="page-title">Source: gitgraph.js</h1>
13161316
}
13171317

13181318
alpha = rotate(alphaY, alphaX);
1319+
}
1320+
1321+
if (this.type === "mergeCommit"){
13191322
color = this.parentCommit.branch.color;
13201323
}
13211324

@@ -1424,9 +1427,9 @@ <h1 class="page-title">Source: gitgraph.js</h1>
14241427
* @param {number} [options.branch.spacingY] - Space between branches
14251428
* @param {number} [options.commit.spacingX] - Space between commits
14261429
* @param {number} [options.commit.spacingY] - Space between commits
1427-
* @param {number} [options.commit.widthExtension = 0] - Additional width to be added to the calculated width
1430+
* @param {number} [options.commit.widthExtension = 0] - Additional width to be added to the calculated width
14281431
* @param {string} [options.commit.color] - Master commit color (dot &amp; message)
1429-
* @param {string} [options.commit.dot.font] - Commit dot color
1432+
* @param {string} [options.commit.dot.font] - Commit dot font
14301433
* @param {string} [options.commit.dot.color] - Commit dot color
14311434
* @param {number} [options.commit.dot.size] - Commit dot size
14321435
* @param {number} [options.commit.dot.strokeWidth] - Commit dot stroke width
@@ -1905,7 +1908,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
19051908
<br class="clear">
19061909

19071910
<footer>
1908-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Dec 29 2018 16:51:16 GMT-0500 (EST)
1911+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Jan 27 2019 14:02:18 GMT-0500 (EST)
19091912
</footer>
19101913

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

‎docs/global.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1561,7 +1561,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
15611561
<br class="clear">
15621562

15631563
<footer>
1564-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Dec 29 2018 16:51:16 GMT-0500 (EST)
1564+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Jan 27 2019 14:02:18 GMT-0500 (EST)
15651565
</footer>
15661566

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

‎docs/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
123123
<br class="clear">
124124

125125
<footer>
126-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Dec 29 2018 16:51:16 GMT-0500 (EST)
126+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sun Jan 27 2019 14:02:18 GMT-0500 (EST)
127127
</footer>
128128

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

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gitgraph.js",
3-
"version": "1.15.0",
3+
"version": "1.15.1",
44
"author": "Nicolas Carlo <nicolascarlo.espeon@gmail.com>",
55
"description": "A JavaScript library to draw pretty git graphs in the browser",
66
"contributors": [

‎src/gitgraph.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -1288,6 +1288,9 @@
12881288
}
12891289

12901290
alpha = rotate(alphaY, alphaX);
1291+
}
1292+
1293+
if (this.type === "mergeCommit"){
12911294
color = this.parentCommit.branch.color;
12921295
}
12931296

@@ -1396,9 +1399,9 @@
13961399
* @param {number} [options.branch.spacingY] - Space between branches
13971400
* @param {number} [options.commit.spacingX] - Space between commits
13981401
* @param {number} [options.commit.spacingY] - Space between commits
1399-
* @param {number} [options.commit.widthExtension = 0] - Additional width to be added to the calculated width
1402+
* @param {number} [options.commit.widthExtension = 0] - Additional width to be added to the calculated width
14001403
* @param {string} [options.commit.color] - Master commit color (dot & message)
1401-
* @param {string} [options.commit.dot.font] - Commit dot color
1404+
* @param {string} [options.commit.dot.font] - Commit dot font
14021405
* @param {string} [options.commit.dot.color] - Commit dot color
14031406
* @param {number} [options.commit.dot.size] - Commit dot size
14041407
* @param {number} [options.commit.dot.strokeWidth] - Commit dot stroke width

0 commit comments

Comments
 (0)
Failed to load comments.