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 committed Dec 29, 2018
2 parents c692acd + 79d638c commit e3076e8
Show file tree
Hide file tree
Showing 13 changed files with 37 additions and 34 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gitgraph.js",
"version": "1.14.0",
"version": "1.15.0",
"main": ["./build/gitgraph.js", "./build/gitgraph.css"],
"ignore": ["**/.*"]
}
5 changes: 3 additions & 2 deletions build/gitgraph.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ==========================================================
* GitGraph v1.14.0
* GitGraph v1.15.0
* https://github.com/nicoespeon/gitgraph.js
* ==========================================================
* Copyright (c) 2018 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
Expand Down Expand Up @@ -400,7 +400,8 @@
author: commit.author,
message: commit.message,
date: commit.date,
sha1: commit.sha1
sha1: commit.sha1,
commit: commit
};

_emitEvent(self.canvas, "commit:" + event, mouseEventOptions);
Expand Down
4 changes: 2 additions & 2 deletions build/gitgraph.min.js

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions docs/Branch.html
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,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#line464">line 464</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line465">line 465</a>
</li></ul></dd>


Expand Down Expand Up @@ -566,7 +566,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#line554">line 554</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line555">line 555</a>
</li></ul></dd>


Expand Down Expand Up @@ -684,7 +684,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#line973">line 973</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line974">line 974</a>
</li></ul></dd>


Expand Down Expand Up @@ -773,7 +773,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#line841">line 841</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line842">line 842</a>
</li></ul></dd>


Expand Down Expand Up @@ -987,7 +987,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#line660">line 660</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line661">line 661</a>
</li></ul></dd>


Expand Down Expand Up @@ -1083,7 +1083,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#line850">line 850</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line851">line 851</a>
</li></ul></dd>


Expand Down Expand Up @@ -1350,7 +1350,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#line866">line 866</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line867">line 867</a>
</li></ul></dd>


Expand Down Expand Up @@ -1469,7 +1469,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#line998">line 998</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line999">line 999</a>
</li></ul></dd>


Expand Down Expand Up @@ -1558,7 +1558,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#line579">line 579</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line580">line 580</a>
</li></ul></dd>


Expand Down Expand Up @@ -1871,7 +1871,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#line817">line 817</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line818">line 818</a>
</li></ul></dd>


Expand Down 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 Mon Dec 03 2018 21:57:09 GMT-0500 (EST)
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)
</footer>

<script> prettyPrint(); </script>
Expand Down
8 changes: 4 additions & 4 deletions docs/Commit.html
Original file line number Diff line number Diff line change
Expand Up @@ -1465,7 +1465,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#line1076">line 1076</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1077">line 1077</a>
</li></ul></dd>


Expand Down Expand Up @@ -1574,7 +1574,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#line1253">line 1253</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1254">line 1254</a>
</li></ul></dd>


Expand Down Expand Up @@ -1663,7 +1663,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#line1127">line 1127</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1128">line 1128</a>
</li></ul></dd>


Expand Down 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 Mon Dec 03 2018 21:57:09 GMT-0500 (EST)
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)
</footer>

<script> prettyPrint(); </script>
Expand Down
4 changes: 2 additions & 2 deletions docs/GitGraph.html
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,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#line433">line 433</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line434">line 434</a>
</li></ul></dd>


Expand Down 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 Mon Dec 03 2018 21:57:09 GMT-0500 (EST)
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)
</footer>

<script> prettyPrint(); </script>
Expand Down
4 changes: 2 additions & 2 deletions docs/Tag.html
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#line1341">line 1341</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1342">line 1342</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 Mon Dec 03 2018 21:57:09 GMT-0500 (EST)
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)
</footer>

<script> prettyPrint(); </script>
Expand Down
6 changes: 3 additions & 3 deletions docs/Template.html
Original file line number Diff line number Diff line change
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#line1417">line 1417</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1418">line 1418</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#line1506">line 1506</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1507">line 1507</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 Mon Dec 03 2018 21:57:09 GMT-0500 (EST)
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)
</footer>

<script> prettyPrint(); </script>
Expand Down
5 changes: 3 additions & 2 deletions docs/gitgraph.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,8 @@ <h1 class="page-title">Source: gitgraph.js</h1>
author: commit.author,
message: commit.message,
date: commit.date,
sha1: commit.sha1
sha1: commit.sha1,
commit: commit
};

_emitEvent(self.canvas, "commit:" + event, mouseEventOptions);
Expand Down Expand Up @@ -1904,7 +1905,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 Mon Dec 03 2018 21:57:09 GMT-0500 (EST)
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)
</footer>

<script> prettyPrint(); </script>
Expand Down
4 changes: 2 additions & 2 deletions docs/global.html
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,7 @@ <h5 class="subsection-title">Properties:</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#line611">line 611</a>
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line612">line 612</a>
</li></ul></dd>


Expand Down 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 Mon Dec 03 2018 21:57:09 GMT-0500 (EST)
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)
</footer>

<script> prettyPrint(); </script>
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
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 Mon Dec 03 2018 21:57:09 GMT-0500 (EST)
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)
</footer>

<script> prettyPrint(); </script>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gitgraph.js",
"version": "1.14.0",
"version": "1.15.0",
"author": "Nicolas Carlo <[email protected]>",
"description": "A JavaScript library to draw pretty git graphs in the browser",
"contributors": [
Expand Down
3 changes: 2 additions & 1 deletion src/gitgraph.js
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,8 @@
author: commit.author,
message: commit.message,
date: commit.date,
sha1: commit.sha1
sha1: commit.sha1,
commit: commit
};

_emitEvent(self.canvas, "commit:" + event, mouseEventOptions);
Expand Down

0 comments on commit e3076e8

Please sign in to comment.