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

Commit e44dbac

Browse files
nicoespeonnicoespeon
committed
Merge develop into master
2 parents 3ddefc2 + de8b85d commit e44dbac

File tree

12 files changed

+30
-36
lines changed

12 files changed

+30
-36
lines changed

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

‎build/gitgraph.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* GitGraph v1.1.1
2+
* GitGraph v1.1.2
33
* https://github.com/nicoespeon/gitgraph.js
44
* ==========================================================
55
* Copyright (c) 2016 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
@@ -342,9 +342,7 @@
342342
**/
343343
GitGraph.prototype.applyCommits = function(event, callbackFn) {
344344
// Fix firefox MouseEvent
345-
if ( typeof InstallTrigger !== "undefined" )/* == (is Firefox) */ {
346-
event.offsetX = event.offsetX ? event.offsetX : event.layerX;
347-
event.offsetY = event.offsetY ? event.offsetY : event.layerY;
345+
if ( typeof InstallTrigger !== "undefined" )/* == (is Firefox) */ {
348346
event.x = event.x ? event.x : event.clientX;
349347
event.y = event.y ? event.y : event.clientY;
350348
}

‎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: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ <h6>Properties</h6>
271271

272272
<dt class="tag-source">Source:</dt>
273273
<dd class="tag-source"><ul class="dummy"><li>
274-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line442">line 442</a>
274+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line440">line 440</a>
275275
</li></ul></dd>
276276

277277

@@ -412,7 +412,7 @@ <h5>Parameters:</h5>
412412

413413
<dt class="tag-source">Source:</dt>
414414
<dd class="tag-source"><ul class="dummy"><li>
415-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line497">line 497</a>
415+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line495">line 495</a>
416416
</li></ul></dd>
417417

418418

@@ -513,7 +513,7 @@ <h5>This:</h5>
513513

514514
<dt class="tag-source">Source:</dt>
515515
<dd class="tag-source"><ul class="dummy"><li>
516-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line759">line 759</a>
516+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line757">line 757</a>
517517
</li></ul></dd>
518518

519519

@@ -585,7 +585,7 @@ <h5>This:</h5>
585585

586586
<dt class="tag-source">Source:</dt>
587587
<dd class="tag-source"><ul class="dummy"><li>
588-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line679">line 679</a>
588+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line677">line 677</a>
589589
</li></ul></dd>
590590

591591

@@ -780,7 +780,7 @@ <h6>Properties</h6>
780780

781781
<dt class="tag-source">Source:</dt>
782782
<dd class="tag-source"><ul class="dummy"><li>
783-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line562">line 562</a>
783+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line560">line 560</a>
784784
</li></ul></dd>
785785

786786

@@ -859,7 +859,7 @@ <h5>This:</h5>
859859

860860
<dt class="tag-source">Source:</dt>
861861
<dd class="tag-source"><ul class="dummy"><li>
862-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line688">line 688</a>
862+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line686">line 686</a>
863863
</li></ul></dd>
864864

865865

@@ -1039,7 +1039,7 @@ <h5>Parameters:</h5>
10391039

10401040
<dt class="tag-source">Source:</dt>
10411041
<dd class="tag-source"><ul class="dummy"><li>
1042-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line702">line 702</a>
1042+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line700">line 700</a>
10431043
</li></ul></dd>
10441044

10451045

@@ -1133,7 +1133,7 @@ <h5>This:</h5>
11331133

11341134
<dt class="tag-source">Source:</dt>
11351135
<dd class="tag-source"><ul class="dummy"><li>
1136-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line522">line 522</a>
1136+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line520">line 520</a>
11371137
</li></ul></dd>
11381138

11391139

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

11821182
<footer>
1183-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sat Jan 09 2016 11:06:32 GMT+0100 (CET)
1183+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sat Jan 23 2016 19:40:19 GMT+0100 (CET)
11841184
</footer>
11851185

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

‎docs/Commit.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@ <h6>Properties</h6>
10251025

10261026
<dt class="tag-source">Source:</dt>
10271027
<dd class="tag-source"><ul class="dummy"><li>
1028-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line814">line 814</a>
1028+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line812">line 812</a>
10291029
</li></ul></dd>
10301030

10311031

@@ -1115,7 +1115,7 @@ <h5>This:</h5>
11151115

11161116
<dt class="tag-source">Source:</dt>
11171117
<dd class="tag-source"><ul class="dummy"><li>
1118-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line943">line 943</a>
1118+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line941">line 941</a>
11191119
</li></ul></dd>
11201120

11211121

@@ -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#line863">line 863</a>
1190+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line861">line 861</a>
11911191
</li></ul></dd>
11921192

11931193

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

12361236
<footer>
1237-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sat Jan 09 2016 11:06:32 GMT+0100 (CET)
1237+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sat Jan 23 2016 19:40:19 GMT+0100 (CET)
12381238
</footer>
12391239

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

‎docs/GitGraph.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ <h5>Parameters:</h5>
823823

824824
<dt class="tag-source">Source:</dt>
825825
<dd class="tag-source"><ul class="dummy"><li>
826-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line414">line 414</a>
826+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line412">line 412</a>
827827
</li></ul></dd>
828828

829829

@@ -1089,7 +1089,7 @@ <h5>Parameters:</h5>
10891089

10901090
<dt class="tag-source">Source:</dt>
10911091
<dd class="tag-source"><ul class="dummy"><li>
1092-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line359">line 359</a>
1092+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line357">line 357</a>
10931093
</li></ul></dd>
10941094

10951095

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

15001500
<footer>
1501-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sat Jan 09 2016 11:06:32 GMT+0100 (CET)
1501+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sat Jan 23 2016 19:40:19 GMT+0100 (CET)
15021502
</footer>
15031503

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

‎docs/Template.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@ <h6>Properties</h6>
10541054

10551055
<dt class="tag-source">Source:</dt>
10561056
<dd class="tag-source"><ul class="dummy"><li>
1057-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1028">line 1028</a>
1057+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1026">line 1026</a>
10581058
</li></ul></dd>
10591059

10601060

@@ -1189,7 +1189,7 @@ <h5>Parameters:</h5>
11891189

11901190
<dt class="tag-source">Source:</dt>
11911191
<dd class="tag-source"><ul class="dummy"><li>
1192-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1107">line 1107</a>
1192+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1105">line 1105</a>
11931193
</li></ul></dd>
11941194

11951195

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

12601260
<footer>
1261-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sat Jan 09 2016 11:06:32 GMT+0100 (CET)
1261+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sat Jan 23 2016 19:40:19 GMT+0100 (CET)
12621262
</footer>
12631263

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

‎docs/gitgraph.js.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,7 @@ <h1 class="page-title">Source: gitgraph.js</h1>
359359
**/
360360
GitGraph.prototype.applyCommits = function(event, callbackFn) {
361361
// Fix firefox MouseEvent
362-
if ( typeof InstallTrigger !== "undefined" )/* == (is Firefox) */ {
363-
event.offsetX = event.offsetX ? event.offsetX : event.layerX;
364-
event.offsetY = event.offsetY ? event.offsetY : event.layerY;
362+
if ( typeof InstallTrigger !== "undefined" )/* == (is Firefox) */ {
365363
event.x = event.x ? event.x : event.clientX;
366364
event.y = event.y ? event.y : event.clientY;
367365
}
@@ -1251,7 +1249,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
12511249
<br clear="both">
12521250

12531251
<footer>
1254-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sat Jan 09 2016 11:06:32 GMT+0100 (CET)
1252+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sat Jan 23 2016 19:40:18 GMT+0100 (CET)
12551253
</footer>
12561254

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

‎docs/global.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
461461
<br clear="both">
462462

463463
<footer>
464-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sat Jan 09 2016 11:06:32 GMT+0100 (CET)
464+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sat Jan 23 2016 19:40:19 GMT+0100 (CET)
465465
</footer>
466466

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

‎docs/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
114114
<br clear="both">
115115

116116
<footer>
117-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sat Jan 09 2016 11:06:32 GMT+0100 (CET)
117+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Sat Jan 23 2016 19:40:19 GMT+0100 (CET)
118118
</footer>
119119

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

0 commit comments

Comments
 (0)