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

Commit

Permalink
Merge develop into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicoespeon
nicoespeon committed Jan 27, 2019
2 parents e3076e8 + 0983a60 commit c8f3ed6
Show file tree
Hide file tree
Showing 14 changed files with 37 additions and 28 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gitgraph.js",
"version": "1.15.0",
"version": "1.15.1",
"main": ["./build/gitgraph.js", "./build/gitgraph.css"],
"ignore": ["**/.*"]
}
2 changes: 1 addition & 1 deletion build/gitgraph.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ commit?: {
dot?: {

/**
* Commit dot color
* Commit dot font
*/
font?: string;

Expand Down
13 changes: 8 additions & 5 deletions build/gitgraph.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* ==========================================================
* GitGraph v1.15.0
* GitGraph v1.15.1
* https://github.com/nicoespeon/gitgraph.js
* ==========================================================
* Copyright (c) 2018 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
* Copyright (c) 2018 Fabien BERNARD (@fabien0102) ✌(✰‿✰)✌
* Copyright (c) 2019 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
* Copyright (c) 2019 Fabien BERNARD (@fabien0102) ✌(✰‿✰)✌
*
* GitGraph.js may be freely distributed under the MIT Licence
* ========================================================== */
Expand Down Expand Up @@ -1298,6 +1298,9 @@
}

alpha = rotate(alphaY, alphaX);
}

if (this.type === "mergeCommit"){
color = this.parentCommit.branch.color;
}

Expand Down Expand Up @@ -1406,9 +1409,9 @@
* @param {number} [options.branch.spacingY] - Space between branches
* @param {number} [options.commit.spacingX] - Space between commits
* @param {number} [options.commit.spacingY] - Space between commits
* @param {number} [options.commit.widthExtension = 0] - Additional width to be added to the calculated width
* @param {number} [options.commit.widthExtension = 0] - Additional width to be added to the calculated width
* @param {string} [options.commit.color] - Master commit color (dot & message)
* @param {string} [options.commit.dot.font] - Commit dot color
* @param {string} [options.commit.dot.font] - Commit dot font
* @param {string} [options.commit.dot.color] - Commit dot color
* @param {number} [options.commit.dot.size] - Commit dot size
* @param {number} [options.commit.dot.strokeWidth] - Commit dot stroke width
Expand Down
8 changes: 4 additions & 4 deletions build/gitgraph.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/Branch.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1928,7 +1928,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
<br class="clear">

<footer>
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)
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)
</footer>

<script> prettyPrint(); </script>
Expand Down
2 changes: 1 addition & 1 deletion docs/Commit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1713,7 +1713,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
<br class="clear">

<footer>
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)
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)
</footer>

<script> prettyPrint(); </script>
Expand Down
2 changes: 1 addition & 1 deletion docs/GitGraph.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2107,7 +2107,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
<br class="clear">

<footer>
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)
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)
</footer>

<script> prettyPrint(); </script>
Expand Down
4 changes: 2 additions & 2 deletions docs/Tag.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,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#line1342">line 1342</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1345">line 1345</a>
</li></ul></dd>


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

<footer>
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)
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)
</footer>

<script> prettyPrint(); </script>
Expand Down
8 changes: 4 additions & 4 deletions docs/Template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ <h6>Properties</h6>
</td>


<td class="description last"><p>Commit dot color</p></td>
<td class="description last"><p>Commit dot font</p></td>
</tr>


Expand Down Expand Up @@ -1219,7 +1219,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#line1418">line 1418</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1421">line 1421</a>
</li></ul></dd>


Expand Down Expand Up @@ -1374,7 +1374,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#line1507">line 1507</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1510">line 1510</a>
</li></ul></dd>


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

<footer>
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)
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)
</footer>

<script> prettyPrint(); </script>
Expand Down
9 changes: 6 additions & 3 deletions docs/gitgraph.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1316,6 +1316,9 @@ <h1 class="page-title">Source: gitgraph.js</h1>
}

alpha = rotate(alphaY, alphaX);
}

if (this.type === "mergeCommit"){
color = this.parentCommit.branch.color;
}

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

<footer>
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)
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)
</footer>

<script> prettyPrint(); </script>
Expand Down
2 changes: 1 addition & 1 deletion docs/global.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1561,7 +1561,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
<br class="clear">

<footer>
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)
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)
</footer>

<script> prettyPrint(); </script>
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
<br class="clear">

<footer>
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)
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)
</footer>

<script> prettyPrint(); </script>
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gitgraph.js",
"version": "1.15.0",
"version": "1.15.1",
"author": "Nicolas Carlo <nicolascarlo.espeon@gmail.com>",
"description": "A JavaScript library to draw pretty git graphs in the browser",
"contributors": [
Expand Down
7 changes: 5 additions & 2 deletions src/gitgraph.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1288,6 +1288,9 @@
}

alpha = rotate(alphaY, alphaX);
}

if (this.type === "mergeCommit"){
color = this.parentCommit.branch.color;
}

Expand Down Expand Up @@ -1396,9 +1399,9 @@
* @param {number} [options.branch.spacingY] - Space between branches
* @param {number} [options.commit.spacingX] - Space between commits
* @param {number} [options.commit.spacingY] - Space between commits
* @param {number} [options.commit.widthExtension = 0] - Additional width to be added to the calculated width
* @param {number} [options.commit.widthExtension = 0] - Additional width to be added to the calculated width
* @param {string} [options.commit.color] - Master commit color (dot & message)
* @param {string} [options.commit.dot.font] - Commit dot color
* @param {string} [options.commit.dot.font] - Commit dot font
* @param {string} [options.commit.dot.color] - Commit dot color
* @param {number} [options.commit.dot.size] - Commit dot size
* @param {number} [options.commit.dot.strokeWidth] - Commit dot stroke width
Expand Down

0 comments on commit c8f3ed6

Please sign in to comment.