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

Commit c692acd

Browse files
nicoespeonnicoespeon
committed
Merge develop into master
2 parents ef815bf + cf35bf8 commit c692acd

15 files changed

+49
-32
lines changed

‎README.md

+9
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,15 @@ And constructed with the following guidelines:
121121

122122
**Fabien Bernard** - [@fabien0102](https://twitter.com/fabien0102)
123123

124+
[![0](https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/images/0)](https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/links/0)
125+
[![1](https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/images/1)](https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/links/1)
126+
[![2](https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/images/2)](https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/links/2)
127+
[![3](https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/images/3)](https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/links/3)
128+
[![4](https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/images/4)](https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/links/4)
129+
[![5](https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/images/5)](https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/links/5)
130+
[![6](https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/images/6)](https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/links/6)
131+
[![7](https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/images/7)](https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/links/7)
132+
124133
## Copyright and License
125134

126135
Copyright (c) 2013 Nicolas CARLO and Fabien BERNARD under the [MIT license][]

‎bower.json

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

‎build/gitgraph.d.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ date?: string;
213213
/**
214214
* DOM Element of detail part
215215
*/
216-
detail?: string;
216+
detail?: HTMLElement;
217217

218218
/**
219219
* Sha1, default is a random short sha1
@@ -614,7 +614,7 @@ date?: string;
614614
/**
615615
* DOM Element of detail part
616616
*/
617-
detail?: string;
617+
detail?: HTMLElement;
618618

619619
/**
620620
* Sha1, default is a random short sha1

‎build/gitgraph.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* GitGraph v1.13.0
2+
* GitGraph v1.14.0
33
* https://github.com/nicoespeon/gitgraph.js
44
* ==========================================================
55
* Copyright (c) 2018 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
@@ -626,7 +626,7 @@
626626
* @property {string} [color] - Master color (dot & message)
627627
* @property {string} [author = this.parent.author] - Author name & email
628628
* @property {string} [date] - Date of commit, default is now
629-
* @property {string} [detail] - DOM Element of detail part
629+
* @property {HTMLElement} [detail] - DOM Element of detail part
630630
* @property {string} [sha1] - Sha1, default is a random short sha1
631631
* @property {Commit} [parentCommit] - Parent commit
632632
* @property {string} [type = ("mergeCommit"|null)] - Type of commit
@@ -727,10 +727,10 @@
727727

728728
// Detail
729729
var isCompact = (this.parent.mode === "compact");
730-
if (typeof options.detailId === "string" && !isCompact) {
731-
options.detail = document.getElementById(options.detailId);
732-
} else {
730+
if (isCompact) {
733731
options.detail = null;
732+
} else if (typeof options.detailId === "string") {
733+
options.detail = document.getElementById(options.detailId) || options.detail;
734734
}
735735

736736
// Check collision (Cause of special compact mode)
@@ -1047,7 +1047,7 @@
10471047
* @param {boolean} options.arrowDisplay - Add a arrow under commit dot
10481048
* @param {string} [options.author = this.parent.author] - Author name & email
10491049
* @param {string} [options.date] - Date of commit, default is now
1050-
* @param {string} [options.detail] - DOM Element of detail part
1050+
* @param {HTMLElement} [options.detail] - DOM Element of detail part
10511051
* @param {string} [options.sha1] - Sha1, default is a random short sha1
10521052
* @param {Commit} [options.parentCommit] - Parent commit
10531053
* @param {string} [options.type = ("mergeCommit"|null)] - Type of commit

‎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

+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 Thu Aug 23 2018 21:43:30 GMT-0400 (EDT)
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)
19321932
</footer>
19331933

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

‎docs/Commit.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ <h6>Properties</h6>
391391
<td class="type">
392392

393393

394-
<span class="param-type">string</span>
394+
<span class="param-type">HTMLElement</span>
395395

396396

397397

@@ -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 Thu Aug 23 2018 21:43:30 GMT-0400 (EDT)
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)
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 Thu Aug 23 2018 21:43:30 GMT-0400 (EDT)
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)
21112111
</footer>
21122112

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

‎docs/Tag.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -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 Thu Aug 23 2018 21:43:30 GMT-0400 (EDT)
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)
384384
</footer>
385385

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

‎docs/Template.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -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 Thu Aug 23 2018 21:43:30 GMT-0400 (EDT)
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)
14501450
</footer>
14511451

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

‎docs/gitgraph.js.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ <h1 class="page-title">Source: gitgraph.js</h1>
644644
* @property {string} [color] - Master color (dot &amp; message)
645645
* @property {string} [author = this.parent.author] - Author name &amp; email
646646
* @property {string} [date] - Date of commit, default is now
647-
* @property {string} [detail] - DOM Element of detail part
647+
* @property {HTMLElement} [detail] - DOM Element of detail part
648648
* @property {string} [sha1] - Sha1, default is a random short sha1
649649
* @property {Commit} [parentCommit] - Parent commit
650650
* @property {string} [type = ("mergeCommit"|null)] - Type of commit
@@ -745,10 +745,10 @@ <h1 class="page-title">Source: gitgraph.js</h1>
745745

746746
// Detail
747747
var isCompact = (this.parent.mode === "compact");
748-
if (typeof options.detailId === "string" &amp;&amp; !isCompact) {
749-
options.detail = document.getElementById(options.detailId);
750-
} else {
748+
if (isCompact) {
751749
options.detail = null;
750+
} else if (typeof options.detailId === "string") {
751+
options.detail = document.getElementById(options.detailId) || options.detail;
752752
}
753753

754754
// Check collision (Cause of special compact mode)
@@ -1065,7 +1065,7 @@ <h1 class="page-title">Source: gitgraph.js</h1>
10651065
* @param {boolean} options.arrowDisplay - Add a arrow under commit dot
10661066
* @param {string} [options.author = this.parent.author] - Author name &amp; email
10671067
* @param {string} [options.date] - Date of commit, default is now
1068-
* @param {string} [options.detail] - DOM Element of detail part
1068+
* @param {HTMLElement} [options.detail] - DOM Element of detail part
10691069
* @param {string} [options.sha1] - Sha1, default is a random short sha1
10701070
* @param {Commit} [options.parentCommit] - Parent commit
10711071
* @param {string} [options.type = ("mergeCommit"|null)] - Type of commit
@@ -1904,7 +1904,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
19041904
<br class="clear">
19051905

19061906
<footer>
1907-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Aug 23 2018 21:43:30 GMT-0400 (EDT)
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)
19081908
</footer>
19091909

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

‎docs/global.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ <h5 class="subsection-title">Properties:</h5>
270270
<td class="type">
271271

272272

273-
<span class="param-type">string</span>
273+
<span class="param-type">HTMLElement</span>
274274

275275

276276

@@ -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 Thu Aug 23 2018 21:43:30 GMT-0400 (EDT)
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)
15651565
</footer>
15661566

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

‎docs/index.html

+9-1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,14 @@ <h3>What does that mean?</h3><p>Releases will be numbered with the following for
9797
</ul>
9898
<h2>Authors and contributors</h2><p><strong>Nicolas Carlo</strong> - <a href="https://twitter.com/nicoespeon">@nicoespeon</a> } <a href="http://nicoespeon.com">http://nicoespeon.com</a></p>
9999
<p><strong>Fabien Bernard</strong> - <a href="https://twitter.com/fabien0102">@fabien0102</a></p>
100+
<p><a href="https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/links/0"><img src="https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/images/0" alt="0"></a>
101+
<a href="https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/links/1"><img src="https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/images/1" alt="1"></a>
102+
<a href="https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/links/2"><img src="https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/images/2" alt="2"></a>
103+
<a href="https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/links/3"><img src="https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/images/3" alt="3"></a>
104+
<a href="https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/links/4"><img src="https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/images/4" alt="4"></a>
105+
<a href="https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/links/5"><img src="https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/images/5" alt="5"></a>
106+
<a href="https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/links/6"><img src="https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/images/6" alt="6"></a>
107+
<a href="https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/links/7"><img src="https://sourcerer.io/fame/nicoespeon/nicoespeon/gitgraph.js/images/7" alt="7"></a></p>
100108
<h2>Copyright and License</h2><p>Copyright (c) 2013 Nicolas CARLO and Fabien BERNARD under the <a href="https://github.com/nicoespeon/gitgraph.js/blob/master/LICENSE.md">MIT license</a></p>
101109
<p><a href="http://choosealicense.com/licenses/mit/">&gt; What does that mean?</a></p></article>
102110
</section>
@@ -115,7 +123,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
115123
<br class="clear">
116124

117125
<footer>
118-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Thu Aug 23 2018 21:43:30 GMT-0400 (EDT)
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)
119127
</footer>
120128

121129
<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.13.0",
3+
"version": "1.14.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

+5-5
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@
616616
* @property {string} [color] - Master color (dot & message)
617617
* @property {string} [author = this.parent.author] - Author name & email
618618
* @property {string} [date] - Date of commit, default is now
619-
* @property {string} [detail] - DOM Element of detail part
619+
* @property {HTMLElement} [detail] - DOM Element of detail part
620620
* @property {string} [sha1] - Sha1, default is a random short sha1
621621
* @property {Commit} [parentCommit] - Parent commit
622622
* @property {string} [type = ("mergeCommit"|null)] - Type of commit
@@ -717,10 +717,10 @@
717717

718718
// Detail
719719
var isCompact = (this.parent.mode === "compact");
720-
if (typeof options.detailId === "string" && !isCompact) {
721-
options.detail = document.getElementById(options.detailId);
722-
} else {
720+
if (isCompact) {
723721
options.detail = null;
722+
} else if (typeof options.detailId === "string") {
723+
options.detail = document.getElementById(options.detailId) || options.detail;
724724
}
725725

726726
// Check collision (Cause of special compact mode)
@@ -1037,7 +1037,7 @@
10371037
* @param {boolean} options.arrowDisplay - Add a arrow under commit dot
10381038
* @param {string} [options.author = this.parent.author] - Author name & email
10391039
* @param {string} [options.date] - Date of commit, default is now
1040-
* @param {string} [options.detail] - DOM Element of detail part
1040+
* @param {HTMLElement} [options.detail] - DOM Element of detail part
10411041
* @param {string} [options.sha1] - Sha1, default is a random short sha1
10421042
* @param {Commit} [options.parentCommit] - Parent commit
10431043
* @param {string} [options.type = ("mergeCommit"|null)] - Type of commit

0 commit comments

Comments
 (0)