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

Commit bd94c52

Browse files
nicoespeonnicoespeon
committed
Merge develop into master
2 parents 2b992a2 + 6881e48 commit bd94c52

13 files changed

+50
-22
lines changed

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ You have different options to start with the library:
1414
- [Download the latest release](https://github.com/nicoespeon/gitgraph.js/releases/latest).
1515
- Clone the repo: `git clone git://github.com/nicoespeon/gitgraph.js.git`.
1616
- Install with [Bower](http://bower.io/): `bower install gitgraph.js`.
17+
- Use [the CDNjs hosted lib](https://cdnjs.com/libraries/gitgraph.js).
1718

1819
Production files are available under the `build/` directory.
1920

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

‎build/gitgraph.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* GitGraph v1.2.1
2+
* GitGraph v1.2.2
33
* https://github.com/nicoespeon/gitgraph.js
44
* ==========================================================
55
* Copyright (c) 2016 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
@@ -595,11 +595,20 @@
595595

596596
this.context.lineWidth = this.lineWidth;
597597
this.context.strokeStyle = this.color;
598+
599+
var prevLineDash;
598600
if ( this.context.setLineDash !== undefined ) {
601+
prevLineDash = this.context.getLineDash();
599602
this.context.setLineDash( this.lineDash );
600603
}
604+
601605
this.context.stroke();
602606
this.context.closePath();
607+
608+
//Restore previous line dash setting, if any
609+
if ( prevLineDash !== undefined ) {
610+
this.context.setLineDash( prevLineDash );
611+
}
603612
};
604613

605614
/**

‎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

+6-6
Original file line numberDiff line numberDiff line change
@@ -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#line801">line 801</a>
516+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line810">line 810</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#line721">line 721</a>
588+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line730">line 730</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#line605">line 605</a>
783+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line614">line 614</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#line730">line 730</a>
862+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line739">line 739</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#line744">line 744</a>
1042+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line753">line 753</a>
10431043
</li></ul></dd>
10441044

10451045

@@ -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 Tue Mar 29 2016 16:30:31 GMT+0200 (CEST)
1183+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon May 09 2016 13:34:54 GMT+0200 (CEST)
11841184
</footer>
11851185

11861186
<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#line867">line 867</a>
1260+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line876">line 876</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#line997">line 997</a>
1350+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1006">line 1006</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#line916">line 916</a>
1422+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line925">line 925</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 Tue Mar 29 2016 16:30:31 GMT+0200 (CEST)
1469+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon May 09 2016 13:34:54 GMT+0200 (CEST)
14701470
</footer>
14711471

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

‎docs/GitGraph.html

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

15481548
<footer>
1549-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Tue Mar 29 2016 16:30:31 GMT+0200 (CEST)
1549+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon May 09 2016 13:34:54 GMT+0200 (CEST)
15501550
</footer>
15511551

15521552
<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#line1107">line 1107</a>
1096+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1116">line 1116</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#line1187">line 1187</a>
1231+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1196">line 1196</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 Tue Mar 29 2016 16:30:31 GMT+0200 (CEST)
1300+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon May 09 2016 13:34:54 GMT+0200 (CEST)
13011301
</footer>
13021302

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

‎docs/gitgraph.js.html

+10-1
Original file line numberDiff line numberDiff line change
@@ -612,11 +612,20 @@ <h1 class="page-title">Source: gitgraph.js</h1>
612612

613613
this.context.lineWidth = this.lineWidth;
614614
this.context.strokeStyle = this.color;
615+
616+
var prevLineDash;
615617
if ( this.context.setLineDash !== undefined ) {
618+
prevLineDash = this.context.getLineDash();
616619
this.context.setLineDash( this.lineDash );
617620
}
621+
618622
this.context.stroke();
619623
this.context.closePath();
624+
625+
//Restore previous line dash setting, if any
626+
if ( prevLineDash !== undefined ) {
627+
this.context.setLineDash( prevLineDash );
628+
}
620629
};
621630

622631
/**
@@ -1331,7 +1340,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
13311340
<br clear="both">
13321341

13331342
<footer>
1334-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Tue Mar 29 2016 16:30:31 GMT+0200 (CEST)
1343+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon May 09 2016 13:34:54 GMT+0200 (CEST)
13351344
</footer>
13361345

13371346
<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 Tue Mar 29 2016 16:30:31 GMT+0200 (CEST)
870+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon May 09 2016 13:34:54 GMT+0200 (CEST)
871871
</footer>
872872

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

‎docs/index.html

+1-1
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 Tue Mar 29 2016 16:30:31 GMT+0200 (CEST)
117+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Mon May 09 2016 13:34:54 GMT+0200 (CEST)
118118
</footer>
119119

120120
<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.2.1",
3+
"version": "1.2.2",
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

+9
Original file line numberDiff line numberDiff line change
@@ -585,11 +585,20 @@
585585

586586
this.context.lineWidth = this.lineWidth;
587587
this.context.strokeStyle = this.color;
588+
589+
var prevLineDash;
588590
if ( this.context.setLineDash !== undefined ) {
591+
prevLineDash = this.context.getLineDash();
589592
this.context.setLineDash( this.lineDash );
590593
}
594+
591595
this.context.stroke();
592596
this.context.closePath();
597+
598+
//Restore previous line dash setting, if any
599+
if ( prevLineDash !== undefined ) {
600+
this.context.setLineDash( prevLineDash );
601+
}
593602
};
594603

595604
/**

0 commit comments

Comments
 (0)