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‎

Lines changed: 9 additions & 0 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 6 additions & 6 deletions
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‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/Branch.html‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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>

0 commit comments

Comments
 (0)