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

Commit 23d356d

Browse files
nicoespeonnicoespeon
committed
Merge develop into master
2 parents 7c2e41e + d8c497c commit 23d356d

12 files changed

+126
-42
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.2.3",
3+
"version": "1.2.4",
44
"main": [ "./build/gitgraph.js", "./build/gitgraph.css" ],
55
"ignore": [
66
"**/.*"

‎build/gitgraph.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* GitGraph v1.2.3
2+
* GitGraph v1.2.4
33
* https://github.com/nicoespeon/gitgraph.js
44
* ==========================================================
55
* Copyright (c) 2016 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
@@ -103,6 +103,8 @@
103103
* @param {HTMLElement} [options.canvas] - DOM canvas (ex: document.getElementById("id"))
104104
* @param {String} [options.orientation = ("vertical-reverse"|"horizontal"|"horizontal-reverse")] - Graph orientation
105105
* @param {Boolean} [options.reverseArrow = false] - Make arrows point to ancestors if true
106+
* @param {Number} [options.initCommitOffsetX = 0] - Add custom offsetX to initial commit.
107+
* @param {Number} [options.initCommitOffsetY= 0] - Add custom offsetY to initial commit.
106108
*
107109
* @this GitGraph
108110
**/
@@ -190,8 +192,8 @@
190192

191193
// Utilities
192194
this.columnMax = 0; // nb of column for message position
193-
this.commitOffsetX = 0;
194-
this.commitOffsetY = 0;
195+
this.commitOffsetX = options.initCommitOffsetX || 0;
196+
this.commitOffsetY = options.initCommitOffsetY || 0;
195197

196198
// Bindings
197199
var mouseMoveOptions = {

‎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

+10-10
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ <h6>Properties</h6>
324324

325325
<dt class="tag-source">Source:</dt>
326326
<dd class="tag-source"><ul class="dummy"><li>
327-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line490">line 490</a>
327+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line492">line 492</a>
328328
</li></ul></dd>
329329

330330

@@ -465,7 +465,7 @@ <h5>Parameters:</h5>
465465

466466
<dt class="tag-source">Source:</dt>
467467
<dd class="tag-source"><ul class="dummy"><li>
468-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line579">line 579</a>
468+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line581">line 581</a>
469469
</li></ul></dd>
470470

471471

@@ -566,7 +566,7 @@ <h5>This:</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#line854">line 854</a>
569+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line856">line 856</a>
570570
</li></ul></dd>
571571

572572

@@ -638,7 +638,7 @@ <h5>This:</h5>
638638

639639
<dt class="tag-source">Source:</dt>
640640
<dd class="tag-source"><ul class="dummy"><li>
641-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line774">line 774</a>
641+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line776">line 776</a>
642642
</li></ul></dd>
643643

644644

@@ -833,7 +833,7 @@ <h6>Properties</h6>
833833

834834
<dt class="tag-source">Source:</dt>
835835
<dd class="tag-source"><ul class="dummy"><li>
836-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line653">line 653</a>
836+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line655">line 655</a>
837837
</li></ul></dd>
838838

839839

@@ -912,7 +912,7 @@ <h5>This:</h5>
912912

913913
<dt class="tag-source">Source:</dt>
914914
<dd class="tag-source"><ul class="dummy"><li>
915-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line783">line 783</a>
915+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line785">line 785</a>
916916
</li></ul></dd>
917917

918918

@@ -1092,7 +1092,7 @@ <h5>Parameters:</h5>
10921092

10931093
<dt class="tag-source">Source:</dt>
10941094
<dd class="tag-source"><ul class="dummy"><li>
1095-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line797">line 797</a>
1095+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line799">line 799</a>
10961096
</li></ul></dd>
10971097

10981098

@@ -1187,7 +1187,7 @@ <h5>This:</h5>
11871187

11881188
<dt class="tag-source">Source:</dt>
11891189
<dd class="tag-source"><ul class="dummy"><li>
1190-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line879">line 879</a>
1190+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line881">line 881</a>
11911191
</li></ul></dd>
11921192

11931193

@@ -1259,7 +1259,7 @@ <h5>This:</h5>
12591259

12601260
<dt class="tag-source">Source:</dt>
12611261
<dd class="tag-source"><ul class="dummy"><li>
1262-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line604">line 604</a>
1262+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line606">line 606</a>
12631263
</li></ul></dd>
12641264

12651265

@@ -1306,7 +1306,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
13061306
<br clear="both">
13071307

13081308
<footer>
1309-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Jul 07 2016 08:44:21 GMT+0200 (CEST)
1309+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Jul 25 2016 15:08:04 GMT+0200 (CEST)
13101310
</footer>
13111311

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

‎docs/Commit.html

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

12581258
<dt class="tag-source">Source:</dt>
12591259
<dd class="tag-source"><ul class="dummy"><li>
1260-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line951">line 951</a>
1260+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line953">line 953</a>
12611261
</li></ul></dd>
12621262

12631263

@@ -1347,7 +1347,7 @@ <h5>This:</h5>
13471347

13481348
<dt class="tag-source">Source:</dt>
13491349
<dd class="tag-source"><ul class="dummy"><li>
1350-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1081">line 1081</a>
1350+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1083">line 1083</a>
13511351
</li></ul></dd>
13521352

13531353

@@ -1419,7 +1419,7 @@ <h5>This:</h5>
14191419

14201420
<dt class="tag-source">Source:</dt>
14211421
<dd class="tag-source"><ul class="dummy"><li>
1422-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1000">line 1000</a>
1422+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1002">line 1002</a>
14231423
</li></ul></dd>
14241424

14251425

@@ -1466,7 +1466,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
14661466
<br clear="both">
14671467

14681468
<footer>
1469-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Jul 07 2016 08:44:21 GMT+0200 (CEST)
1469+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Jul 25 2016 15:08:04 GMT+0200 (CEST)
14701470
</footer>
14711471

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

‎docs/GitGraph.html

+88-10
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,84 @@ <h6>Properties</h6>
402402
</tr>
403403

404404

405+
406+
<tr>
407+
408+
<td class="name"><code>initCommitOffsetX</code></td>
409+
410+
411+
<td class="type">
412+
413+
414+
<span class="param-type">Number</span>
415+
416+
417+
418+
</td>
419+
420+
421+
<td class="attributes">
422+
423+
&lt;optional><br>
424+
425+
426+
427+
428+
429+
</td>
430+
431+
432+
433+
<td class="default">
434+
435+
0
436+
437+
</td>
438+
439+
440+
<td class="description last"><p>Add custom offsetX to initial commit.</p></td>
441+
</tr>
442+
443+
444+
445+
<tr>
446+
447+
<td class="name"><code>initCommitOffsetY</code></td>
448+
449+
450+
<td class="type">
451+
452+
453+
<span class="param-type">Number</span>
454+
455+
456+
457+
</td>
458+
459+
460+
<td class="attributes">
461+
462+
&lt;optional><br>
463+
464+
465+
466+
467+
468+
</td>
469+
470+
471+
472+
<td class="default">
473+
474+
0
475+
476+
</td>
477+
478+
479+
<td class="description last"><p>Add custom offsetY to initial commit.</p></td>
480+
</tr>
481+
482+
405483
</tbody>
406484
</table>
407485
</td>
@@ -435,7 +513,7 @@ <h6>Properties</h6>
435513

436514
<dt class="tag-source">Source:</dt>
437515
<dd class="tag-source"><ul class="dummy"><li>
438-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line99">line 99</a>
516+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line101">line 101</a>
439517
</li></ul></dd>
440518

441519

@@ -596,7 +674,7 @@ <h5>Parameters:</h5>
596674

597675
<dt class="tag-source">Source:</dt>
598676
<dd class="tag-source"><ul class="dummy"><li>
599-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line373">line 373</a>
677+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line375">line 375</a>
600678
</li></ul></dd>
601679

602680

@@ -719,7 +797,7 @@ <h5>Parameters:</h5>
719797

720798
<dt class="tag-source">Source:</dt>
721799
<dd class="tag-source"><ul class="dummy"><li>
722-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line213">line 213</a>
800+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line215">line 215</a>
723801
</li></ul></dd>
724802

725803

@@ -868,7 +946,7 @@ <h5>Parameters:</h5>
868946

869947
<dt class="tag-source">Source:</dt>
870948
<dd class="tag-source"><ul class="dummy"><li>
871-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line461">line 461</a>
949+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line463">line 463</a>
872950
</li></ul></dd>
873951

874952

@@ -988,7 +1066,7 @@ <h5>Parameters:</h5>
9881066

9891067
<dt class="tag-source">Source:</dt>
9901068
<dd class="tag-source"><ul class="dummy"><li>
991-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line272">line 272</a>
1069+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line274">line 274</a>
9921070
</li></ul></dd>
9931071

9941072

@@ -1137,7 +1215,7 @@ <h5>Parameters:</h5>
11371215

11381216
<dt class="tag-source">Source:</dt>
11391217
<dd class="tag-source"><ul class="dummy"><li>
1140-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line395">line 395</a>
1218+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line397">line 397</a>
11411219
</li></ul></dd>
11421220

11431221

@@ -1257,7 +1335,7 @@ <h5>Parameters:</h5>
12571335

12581336
<dt class="tag-source">Source:</dt>
12591337
<dd class="tag-source"><ul class="dummy"><li>
1260-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line286">line 286</a>
1338+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line288">line 288</a>
12611339
</li></ul></dd>
12621340

12631341

@@ -1398,7 +1476,7 @@ <h5>Parameters:</h5>
13981476

13991477
<dt class="tag-source">Source:</dt>
14001478
<dd class="tag-source"><ul class="dummy"><li>
1401-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line243">line 243</a>
1479+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line245">line 245</a>
14021480
</li></ul></dd>
14031481

14041482

@@ -1499,7 +1577,7 @@ <h5>This:</h5>
14991577

15001578
<dt class="tag-source">Source:</dt>
15011579
<dd class="tag-source"><ul class="dummy"><li>
1502-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line298">line 298</a>
1580+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line300">line 300</a>
15031581
</li></ul></dd>
15041582

15051583

@@ -1546,7 +1624,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
15461624
<br clear="both">
15471625

15481626
<footer>
1549-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Jul 07 2016 08:44:21 GMT+0200 (CEST)
1627+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Jul 25 2016 15:08:05 GMT+0200 (CEST)
15501628
</footer>
15511629

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

‎docs/Template.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,7 @@ <h6>Properties</h6>
10931093

10941094
<dt class="tag-source">Source:</dt>
10951095
<dd class="tag-source"><ul class="dummy"><li>
1096-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1197">line 1197</a>
1096+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1199">line 1199</a>
10971097
</li></ul></dd>
10981098

10991099

@@ -1228,7 +1228,7 @@ <h5>Parameters:</h5>
12281228

12291229
<dt class="tag-source">Source:</dt>
12301230
<dd class="tag-source"><ul class="dummy"><li>
1231-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1277">line 1277</a>
1231+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1279">line 1279</a>
12321232
</li></ul></dd>
12331233

12341234

@@ -1297,7 +1297,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
12971297
<br clear="both">
12981298

12991299
<footer>
1300-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Jul 07 2016 08:44:21 GMT+0200 (CEST)
1300+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Jul 25 2016 15:08:05 GMT+0200 (CEST)
13011301
</footer>
13021302

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

‎docs/gitgraph.js.html

+5-3
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ <h1 class="page-title">Source: gitgraph.js</h1>
120120
* @param {HTMLElement} [options.canvas] - DOM canvas (ex: document.getElementById("id"))
121121
* @param {String} [options.orientation = ("vertical-reverse"|"horizontal"|"horizontal-reverse")] - Graph orientation
122122
* @param {Boolean} [options.reverseArrow = false] - Make arrows point to ancestors if true
123+
* @param {Number} [options.initCommitOffsetX = 0] - Add custom offsetX to initial commit.
124+
* @param {Number} [options.initCommitOffsetY= 0] - Add custom offsetY to initial commit.
123125
*
124126
* @this GitGraph
125127
**/
@@ -207,8 +209,8 @@ <h1 class="page-title">Source: gitgraph.js</h1>
207209

208210
// Utilities
209211
this.columnMax = 0; // nb of column for message position
210-
this.commitOffsetX = 0;
211-
this.commitOffsetY = 0;
212+
this.commitOffsetX = options.initCommitOffsetX || 0;
213+
this.commitOffsetY = options.initCommitOffsetY || 0;
212214

213215
// Bindings
214216
var mouseMoveOptions = {
@@ -1421,7 +1423,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
14211423
<br clear="both">
14221424

14231425
<footer>
1424-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Jul 07 2016 08:44:21 GMT+0200 (CEST)
1426+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Jul 25 2016 15:08:04 GMT+0200 (CEST)
14251427
</footer>
14261428

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

0 commit comments

Comments
 (0)