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

Commit 5f9057e

Browse files
nicoespeonnicoespeon
committed
Merge develop into master
2 parents 7d2c839 + 1f994ce commit 5f9057e

14 files changed

+113
-80
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.11.1",
3+
"version": "1.11.2",
44
"main": [
55
"./build/gitgraph.js",
66
"./build/gitgraph.css"

‎build/gitgraph.js

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* GitGraph v1.11.1
2+
* GitGraph v1.11.2
33
* https://github.com/nicoespeon/gitgraph.js
44
* ==========================================================
55
* Copyright (c) 2017 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
@@ -385,14 +385,8 @@
385385
return;
386386
}
387387

388-
// Fix firefox MouseEvent
389-
if (typeof InstallTrigger !== "undefined") /* == (is Firefox) */ {
390-
event.x = event.x ? event.x : event.clientX;
391-
event.y = event.y ? event.y : event.clientY;
392-
}
393-
394-
self.tooltip.style.left = event.x + "px"; // TODO Scroll bug
395-
self.tooltip.style.top = event.y + "px"; // TODO Scroll bug
388+
self.tooltip.style.left = event.clientX + "px"; // TODO Scroll bug
389+
self.tooltip.style.top = event.clientY + "px"; // TODO Scroll bug
396390
if (self.template.commit.tooltipHTMLFormatter !== null) {
397391
self.tooltip.innerHTML = self.template.commit.tooltipHTMLFormatter(commit);
398392
} else {

‎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
@@ -403,7 +403,7 @@ <h6>Properties</h6>
403403

404404
<dt class="tag-source">Source:</dt>
405405
<dd class="tag-source"><ul class="dummy"><li>
406-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line470">line 470</a>
406+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line464">line 464</a>
407407
</li></ul></dd>
408408

409409

@@ -558,7 +558,7 @@ <h5>Parameters:</h5>
558558

559559
<dt class="tag-source">Source:</dt>
560560
<dd class="tag-source"><ul class="dummy"><li>
561-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line560">line 560</a>
561+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line554">line 554</a>
562562
</li></ul></dd>
563563

564564

@@ -672,7 +672,7 @@ <h5>This:</h5>
672672

673673
<dt class="tag-source">Source:</dt>
674674
<dd class="tag-source"><ul class="dummy"><li>
675-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line967">line 967</a>
675+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line961">line 961</a>
676676
</li></ul></dd>
677677

678678

@@ -757,7 +757,7 @@ <h5>This:</h5>
757757

758758
<dt class="tag-source">Source:</dt>
759759
<dd class="tag-source"><ul class="dummy"><li>
760-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line845">line 845</a>
760+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line839">line 839</a>
761761
</li></ul></dd>
762762

763763

@@ -967,7 +967,7 @@ <h6>Properties</h6>
967967

968968
<dt class="tag-source">Source:</dt>
969969
<dd class="tag-source"><ul class="dummy"><li>
970-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line665">line 665</a>
970+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line659">line 659</a>
971971
</li></ul></dd>
972972

973973

@@ -1059,7 +1059,7 @@ <h5>This:</h5>
10591059

10601060
<dt class="tag-source">Source:</dt>
10611061
<dd class="tag-source"><ul class="dummy"><li>
1062-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line854">line 854</a>
1062+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line848">line 848</a>
10631063
</li></ul></dd>
10641064

10651065

@@ -1322,7 +1322,7 @@ <h6>Properties</h6>
13221322

13231323
<dt class="tag-source">Source:</dt>
13241324
<dd class="tag-source"><ul class="dummy"><li>
1325-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line870">line 870</a>
1325+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line864">line 864</a>
13261326
</li></ul></dd>
13271327

13281328

@@ -1437,7 +1437,7 @@ <h5>This:</h5>
14371437

14381438
<dt class="tag-source">Source:</dt>
14391439
<dd class="tag-source"><ul class="dummy"><li>
1440-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line992">line 992</a>
1440+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line986">line 986</a>
14411441
</li></ul></dd>
14421442

14431443

@@ -1522,7 +1522,7 @@ <h5>This:</h5>
15221522

15231523
<dt class="tag-source">Source:</dt>
15241524
<dd class="tag-source"><ul class="dummy"><li>
1525-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line585">line 585</a>
1525+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line579">line 579</a>
15261526
</li></ul></dd>
15271527

15281528

@@ -1831,7 +1831,7 @@ <h6>Properties</h6>
18311831

18321832
<dt class="tag-source">Source:</dt>
18331833
<dd class="tag-source"><ul class="dummy"><li>
1834-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line821">line 821</a>
1834+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line815">line 815</a>
18351835
</li></ul></dd>
18361836

18371837

@@ -1886,7 +1886,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
18861886
<br class="clear">
18871887

18881888
<footer>
1889-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Wed May 03 2017 23:49:53 GMT+0200 (CEST)
1889+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu May 25 2017 11:09:19 GMT+0200 (CEST)
18901890
</footer>
18911891

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

‎docs/Commit.html

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

13881388
<dt class="tag-source">Source:</dt>
13891389
<dd class="tag-source"><ul class="dummy"><li>
1390-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1067">line 1067</a>
1390+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1061">line 1061</a>
13911391
</li></ul></dd>
13921392

13931393

@@ -1490,7 +1490,7 @@ <h5>This:</h5>
14901490

14911491
<dt class="tag-source">Source:</dt>
14921492
<dd class="tag-source"><ul class="dummy"><li>
1493-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1227">line 1227</a>
1493+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1221">line 1221</a>
14941494
</li></ul></dd>
14951495

14961496

@@ -1575,7 +1575,7 @@ <h5>This:</h5>
15751575

15761576
<dt class="tag-source">Source:</dt>
15771577
<dd class="tag-source"><ul class="dummy"><li>
1578-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1116">line 1116</a>
1578+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1110">line 1110</a>
15791579
</li></ul></dd>
15801580

15811581

@@ -1623,7 +1623,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
16231623
<br class="clear">
16241624

16251625
<footer>
1626-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Wed May 03 2017 23:49:53 GMT+0200 (CEST)
1626+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu May 25 2017 11:09:19 GMT+0200 (CEST)
16271627
</footer>
16281628

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

‎docs/GitGraph.html

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

10531053
<dt class="tag-source">Source:</dt>
10541054
<dd class="tag-source"><ul class="dummy"><li>
1055-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line439">line 439</a>
1055+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line433">line 433</a>
10561056
</li></ul></dd>
10571057

10581058

@@ -2061,7 +2061,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
20612061
<br class="clear">
20622062

20632063
<footer>
2064-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Wed May 03 2017 23:49:53 GMT+0200 (CEST)
2064+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu May 25 2017 11:09:19 GMT+0200 (CEST)
20652065
</footer>
20662066

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

‎docs/Tag.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ <h6>Properties</h6>
294294

295295
<dt class="tag-source">Source:</dt>
296296
<dd class="tag-source"><ul class="dummy"><li>
297-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1315">line 1315</a>
297+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1309">line 1309</a>
298298
</li></ul></dd>
299299

300300

@@ -374,7 +374,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
374374
<br class="clear">
375375

376376
<footer>
377-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Wed May 03 2017 23:49:53 GMT+0200 (CEST)
377+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu May 25 2017 11:09:19 GMT+0200 (CEST)
378378
</footer>
379379

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

‎docs/Template.html

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

11811181
<dt class="tag-source">Source:</dt>
11821182
<dd class="tag-source"><ul class="dummy"><li>
1183-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1390">line 1390</a>
1183+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1384">line 1384</a>
11841184
</li></ul></dd>
11851185

11861186

@@ -1329,7 +1329,7 @@ <h5>Parameters:</h5>
13291329

13301330
<dt class="tag-source">Source:</dt>
13311331
<dd class="tag-source"><ul class="dummy"><li>
1332-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1478">line 1478</a>
1332+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1472">line 1472</a>
13331333
</li></ul></dd>
13341334

13351335

@@ -1399,7 +1399,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
13991399
<br class="clear">
14001400

14011401
<footer>
1402-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Wed May 03 2017 23:49:53 GMT+0200 (CEST)
1402+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu May 25 2017 11:09:19 GMT+0200 (CEST)
14031403
</footer>
14041404

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

‎docs/gitgraph.js.html

+3-9
Original file line numberDiff line numberDiff line change
@@ -403,14 +403,8 @@ <h1 class="page-title">Source: gitgraph.js</h1>
403403
return;
404404
}
405405

406-
// Fix firefox MouseEvent
407-
if (typeof InstallTrigger !== "undefined") /* == (is Firefox) */ {
408-
event.x = event.x ? event.x : event.clientX;
409-
event.y = event.y ? event.y : event.clientY;
410-
}
411-
412-
self.tooltip.style.left = event.x + "px"; // TODO Scroll bug
413-
self.tooltip.style.top = event.y + "px"; // TODO Scroll bug
406+
self.tooltip.style.left = event.clientX + "px"; // TODO Scroll bug
407+
self.tooltip.style.top = event.clientY + "px"; // TODO Scroll bug
414408
if (self.template.commit.tooltipHTMLFormatter !== null) {
415409
self.tooltip.innerHTML = self.template.commit.tooltipHTMLFormatter(commit);
416410
} else {
@@ -1876,7 +1870,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
18761870
<br class="clear">
18771871

18781872
<footer>
1879-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Wed May 03 2017 23:49:53 GMT+0200 (CEST)
1873+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu May 25 2017 11:09:19 GMT+0200 (CEST)
18801874
</footer>
18811875

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

‎docs/global.html

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

11711171
<dt class="tag-source">Source:</dt>
11721172
<dd class="tag-source"><ul class="dummy"><li>
1173-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line617">line 617</a>
1173+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line611">line 611</a>
11741174
</li></ul></dd>
11751175

11761176

@@ -1514,7 +1514,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
15141514
<br class="clear">
15151515

15161516
<footer>
1517-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Wed May 03 2017 23:49:53 GMT+0200 (CEST)
1517+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu May 25 2017 11:09:19 GMT+0200 (CEST)
15181518
</footer>
15191519

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

‎docs/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
115115
<br class="clear">
116116

117117
<footer>
118-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Wed May 03 2017 23:49:53 GMT+0200 (CEST)
118+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu May 25 2017 11:09:19 GMT+0200 (CEST)
119119
</footer>
120120

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

0 commit comments

Comments
 (0)