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

Commit e3076e8

Browse files
nicoespeonnicoespeon
committed
Merge develop into master
2 parents c692acd + 79d638c commit e3076e8

13 files changed

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

‎build/gitgraph.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* GitGraph v1.14.0
2+
* GitGraph v1.15.0
33
* https://github.com/nicoespeon/gitgraph.js
44
* ==========================================================
55
* Copyright (c) 2018 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
@@ -400,7 +400,8 @@
400400
author: commit.author,
401401
message: commit.message,
402402
date: commit.date,
403-
sha1: commit.sha1
403+
sha1: commit.sha1,
404+
commit: commit
404405
};
405406

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

‎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
@@ -405,7 +405,7 @@ <h6>Properties</h6>
405405

406406
<dt class="tag-source">Source:</dt>
407407
<dd class="tag-source"><ul class="dummy"><li>
408-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line464">line 464</a>
408+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line465">line 465</a>
409409
</li></ul></dd>
410410

411411

@@ -566,7 +566,7 @@ <h5>Parameters:</h5>
566566

567567
<dt class="tag-source">Source:</dt>
568568
<dd class="tag-source"><ul class="dummy"><li>
569-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line554">line 554</a>
569+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line555">line 555</a>
570570
</li></ul></dd>
571571

572572

@@ -684,7 +684,7 @@ <h5>This:</h5>
684684

685685
<dt class="tag-source">Source:</dt>
686686
<dd class="tag-source"><ul class="dummy"><li>
687-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line973">line 973</a>
687+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line974">line 974</a>
688688
</li></ul></dd>
689689

690690

@@ -773,7 +773,7 @@ <h5>This:</h5>
773773

774774
<dt class="tag-source">Source:</dt>
775775
<dd class="tag-source"><ul class="dummy"><li>
776-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line841">line 841</a>
776+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line842">line 842</a>
777777
</li></ul></dd>
778778

779779

@@ -987,7 +987,7 @@ <h6>Properties</h6>
987987

988988
<dt class="tag-source">Source:</dt>
989989
<dd class="tag-source"><ul class="dummy"><li>
990-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line660">line 660</a>
990+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line661">line 661</a>
991991
</li></ul></dd>
992992

993993

@@ -1083,7 +1083,7 @@ <h5>This:</h5>
10831083

10841084
<dt class="tag-source">Source:</dt>
10851085
<dd class="tag-source"><ul class="dummy"><li>
1086-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line850">line 850</a>
1086+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line851">line 851</a>
10871087
</li></ul></dd>
10881088

10891089

@@ -1350,7 +1350,7 @@ <h6>Properties</h6>
13501350

13511351
<dt class="tag-source">Source:</dt>
13521352
<dd class="tag-source"><ul class="dummy"><li>
1353-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line866">line 866</a>
1353+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line867">line 867</a>
13541354
</li></ul></dd>
13551355

13561356

@@ -1469,7 +1469,7 @@ <h5>This:</h5>
14691469

14701470
<dt class="tag-source">Source:</dt>
14711471
<dd class="tag-source"><ul class="dummy"><li>
1472-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line998">line 998</a>
1472+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line999">line 999</a>
14731473
</li></ul></dd>
14741474

14751475

@@ -1558,7 +1558,7 @@ <h5>This:</h5>
15581558

15591559
<dt class="tag-source">Source:</dt>
15601560
<dd class="tag-source"><ul class="dummy"><li>
1561-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line579">line 579</a>
1561+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line580">line 580</a>
15621562
</li></ul></dd>
15631563

15641564

@@ -1871,7 +1871,7 @@ <h6>Properties</h6>
18711871

18721872
<dt class="tag-source">Source:</dt>
18731873
<dd class="tag-source"><ul class="dummy"><li>
1874-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line817">line 817</a>
1874+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line818">line 818</a>
18751875
</li></ul></dd>
18761876

18771877

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

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

‎docs/Commit.html

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

14661466
<dt class="tag-source">Source:</dt>
14671467
<dd class="tag-source"><ul class="dummy"><li>
1468-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1076">line 1076</a>
1468+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1077">line 1077</a>
14691469
</li></ul></dd>
14701470

14711471

@@ -1574,7 +1574,7 @@ <h5>This:</h5>
15741574

15751575
<dt class="tag-source">Source:</dt>
15761576
<dd class="tag-source"><ul class="dummy"><li>
1577-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1253">line 1253</a>
1577+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1254">line 1254</a>
15781578
</li></ul></dd>
15791579

15801580

@@ -1663,7 +1663,7 @@ <h5>This:</h5>
16631663

16641664
<dt class="tag-source">Source:</dt>
16651665
<dd class="tag-source"><ul class="dummy"><li>
1666-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1127">line 1127</a>
1666+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1128">line 1128</a>
16671667
</li></ul></dd>
16681668

16691669

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

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

‎docs/GitGraph.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ <h5>Parameters:</h5>
10681068

10691069
<dt class="tag-source">Source:</dt>
10701070
<dd class="tag-source"><ul class="dummy"><li>
1071-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line433">line 433</a>
1071+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line434">line 434</a>
10721072
</li></ul></dd>
10731073

10741074

@@ -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 Mon Dec 03 2018 21:57:09 GMT-0500 (EST)
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)
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#line1341">line 1341</a>
299+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1342">line 1342</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 Mon Dec 03 2018 21:57:09 GMT-0500 (EST)
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)
384384
</footer>
385385

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

‎docs/Template.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -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#line1417">line 1417</a>
1222+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1418">line 1418</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#line1506">line 1506</a>
1377+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1507">line 1507</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 Mon Dec 03 2018 21:57:09 GMT-0500 (EST)
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)
14501450
</footer>
14511451

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

‎docs/gitgraph.js.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,8 @@ <h1 class="page-title">Source: gitgraph.js</h1>
418418
author: commit.author,
419419
message: commit.message,
420420
date: commit.date,
421-
sha1: commit.sha1
421+
sha1: commit.sha1,
422+
commit: commit
422423
};
423424

424425
_emitEvent(self.canvas, "commit:" + event, mouseEventOptions);
@@ -1904,7 +1905,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
19041905
<br class="clear">
19051906

19061907
<footer>
1907-
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)
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)
19081909
</footer>
19091910

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

‎docs/global.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1209,7 +1209,7 @@ <h5 class="subsection-title">Properties:</h5>
12091209

12101210
<dt class="tag-source">Source:</dt>
12111211
<dd class="tag-source"><ul class="dummy"><li>
1212-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line611">line 611</a>
1212+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line612">line 612</a>
12131213
</li></ul></dd>
12141214

12151215

@@ -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 Mon Dec 03 2018 21:57:09 GMT-0500 (EST)
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)
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 Mon Dec 03 2018 21:57:09 GMT-0500 (EST)
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)
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.14.0",
3+
"version": "1.15.0",
44
"author": "Nicolas Carlo <[email protected]>",
55
"description": "A JavaScript library to draw pretty git graphs in the browser",
66
"contributors": [

‎src/gitgraph.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,8 @@
390390
author: commit.author,
391391
message: commit.message,
392392
date: commit.date,
393-
sha1: commit.sha1
393+
sha1: commit.sha1,
394+
commit: commit
394395
};
395396

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

0 commit comments

Comments
 (0)