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

Commit 3fc6fc2

Browse files
nicoespeonnicoespeon
committed
Merge develop into master
2 parents 421c5c5 + 52efb85 commit 3fc6fc2

12 files changed

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

‎build/gitgraph.js

+13-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* GitGraph v1.3.0
2+
* GitGraph v1.3.1
33
* https://github.com/nicoespeon/gitgraph.js
44
* ==========================================================
55
* Copyright (c) 2016 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
@@ -384,8 +384,18 @@
384384
**/
385385
GitGraph.prototype.applyCommits = function ( event, callbackFn ) {
386386
// Fallback onto layerX/layerY for older versions of Firefox.
387-
var offsetX = event.offsetX || event.layerX;
388-
var offsetY = event.offsetY || event.layerY;
387+
function getOffsetById ( id ) {
388+
var el = document.getElementById( id );
389+
var rect = el.getBoundingClientRect();
390+
391+
return {
392+
top: rect.top + document.body.scrollTop,
393+
left: rect.left + document.body.scrollLeft
394+
};
395+
}
396+
397+
var offsetX = event.offsetX || (event.pageX - getOffsetById( this.elementId ).left);
398+
var offsetY = event.offsetY || (event.pageY - getOffsetById( this.elementId ).top);
389399

390400
for ( var i = 0, commit; !!(commit = this.commits[ i ]); i++ ) {
391401
var distanceX = (commit.x + (this.offsetX + this.marginX) / this.scalingFactor - offsetX);

‎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#line492">line 492</a>
327+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line502">line 502</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#line581">line 581</a>
468+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line591">line 591</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#line856">line 856</a>
569+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line866">line 866</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#line776">line 776</a>
641+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line786">line 786</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#line655">line 655</a>
836+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line665">line 665</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#line785">line 785</a>
915+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line795">line 795</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#line799">line 799</a>
1095+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line809">line 809</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#line881">line 881</a>
1190+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line891">line 891</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#line606">line 606</a>
1262+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line616">line 616</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 Mon Aug 08 2016 19:11:55 GMT+0200 (CEST)
1309+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Sep 01 2016 11:56:54 GMT+0200 (CEST)
13101310
</footer>
13111311

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

‎docs/Commit.html

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

12971297
<dt class="tag-source">Source:</dt>
12981298
<dd class="tag-source"><ul class="dummy"><li>
1299-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line954">line 954</a>
1299+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line964">line 964</a>
13001300
</li></ul></dd>
13011301

13021302

@@ -1386,7 +1386,7 @@ <h5>This:</h5>
13861386

13871387
<dt class="tag-source">Source:</dt>
13881388
<dd class="tag-source"><ul class="dummy"><li>
1389-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1085">line 1085</a>
1389+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1095">line 1095</a>
13901390
</li></ul></dd>
13911391

13921392

@@ -1458,7 +1458,7 @@ <h5>This:</h5>
14581458

14591459
<dt class="tag-source">Source:</dt>
14601460
<dd class="tag-source"><ul class="dummy"><li>
1461-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1004">line 1004</a>
1461+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1014">line 1014</a>
14621462
</li></ul></dd>
14631463

14641464

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

15071507
<footer>
1508-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 08 2016 19:11:55 GMT+0200 (CEST)
1508+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Sep 01 2016 11:56:54 GMT+0200 (CEST)
15091509
</footer>
15101510

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

‎docs/GitGraph.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ <h5>Parameters:</h5>
946946

947947
<dt class="tag-source">Source:</dt>
948948
<dd class="tag-source"><ul class="dummy"><li>
949-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line463">line 463</a>
949+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line473">line 473</a>
950950
</li></ul></dd>
951951

952952

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

12161216
<dt class="tag-source">Source:</dt>
12171217
<dd class="tag-source"><ul class="dummy"><li>
1218-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line397">line 397</a>
1218+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line407">line 407</a>
12191219
</li></ul></dd>
12201220

12211221

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

16261626
<footer>
1627-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 08 2016 19:11:55 GMT+0200 (CEST)
1627+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Sep 01 2016 11:56:54 GMT+0200 (CEST)
16281628
</footer>
16291629

16301630
<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#line1201">line 1201</a>
1096+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1211">line 1211</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#line1281">line 1281</a>
1231+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1291">line 1291</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 Mon Aug 08 2016 19:11:55 GMT+0200 (CEST)
1300+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Sep 01 2016 11:56:54 GMT+0200 (CEST)
13011301
</footer>
13021302

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

‎docs/gitgraph.js.html

+13-3
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,18 @@ <h1 class="page-title">Source: gitgraph.js</h1>
401401
**/
402402
GitGraph.prototype.applyCommits = function ( event, callbackFn ) {
403403
// Fallback onto layerX/layerY for older versions of Firefox.
404-
var offsetX = event.offsetX || event.layerX;
405-
var offsetY = event.offsetY || event.layerY;
404+
function getOffsetById ( id ) {
405+
var el = document.getElementById( id );
406+
var rect = el.getBoundingClientRect();
407+
408+
return {
409+
top: rect.top + document.body.scrollTop,
410+
left: rect.left + document.body.scrollLeft
411+
};
412+
}
413+
414+
var offsetX = event.offsetX || (event.pageX - getOffsetById( this.elementId ).left);
415+
var offsetY = event.offsetY || (event.pageY - getOffsetById( this.elementId ).top);
406416

407417
for ( var i = 0, commit; !!(commit = this.commits[ i ]); i++ ) {
408418
var distanceX = (commit.x + (this.offsetX + this.marginX) / this.scalingFactor - offsetX);
@@ -1430,7 +1440,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
14301440
<br clear="both">
14311441

14321442
<footer>
1433-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 08 2016 19:11:55 GMT+0200 (CEST)
1443+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Sep 01 2016 11:56:54 GMT+0200 (CEST)
14341444
</footer>
14351445

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

‎docs/global.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
867867
<br clear="both">
868868

869869
<footer>
870-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 08 2016 19:11:55 GMT+0200 (CEST)
870+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Sep 01 2016 11:56:54 GMT+0200 (CEST)
871871
</footer>
872872

873873
<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">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
115115
<br clear="both">
116116

117117
<footer>
118-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon Aug 08 2016 19:11:55 GMT+0200 (CEST)
118+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Sep 01 2016 11:56:54 GMT+0200 (CEST)
119119
</footer>
120120

121121
<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.3.0",
3+
"version": "1.3.1",
44
"author": "Nicolas Carlo <nicolascarlo.espeon@gmail.com>",
55
"description": "A JavaScript library to draw pretty git graphs in the browser",
66
"contributors": [

‎src/gitgraph.js

+12-2
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,18 @@
374374
**/
375375
GitGraph.prototype.applyCommits = function ( event, callbackFn ) {
376376
// Fallback onto layerX/layerY for older versions of Firefox.
377-
var offsetX = event.offsetX || event.layerX;
378-
var offsetY = event.offsetY || event.layerY;
377+
function getOffsetById ( id ) {
378+
var el = document.getElementById( id );
379+
var rect = el.getBoundingClientRect();
380+
381+
return {
382+
top: rect.top + document.body.scrollTop,
383+
left: rect.left + document.body.scrollLeft
384+
};
385+
}
386+
387+
var offsetX = event.offsetX || (event.pageX - getOffsetById( this.elementId ).left);
388+
var offsetY = event.offsetY || (event.pageY - getOffsetById( this.elementId ).top);
379389

380390
for ( var i = 0, commit; !!(commit = this.commits[ i ]); i++ ) {
381391
var distanceX = (commit.x + (this.offsetX + this.marginX) / this.scalingFactor - offsetX);

0 commit comments

Comments
 (0)