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

Commit 421c5c5

Browse files
nicoespeonnicoespeon
committed
Merge develop into master
2 parents 23d356d + 07e12d3 commit 421c5c5

13 files changed

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

‎build/gitgraph.js

+24-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* GitGraph v1.2.4
2+
* GitGraph v1.3.0
33
* https://github.com/nicoespeon/gitgraph.js
44
* ==========================================================
55
* Copyright (c) 2016 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
@@ -553,7 +553,7 @@
553553
this.offsetY = this.column * this.spacingY;
554554

555555
// Add start point
556-
if (this.parentBranch) {
556+
if ( this.parentBranch ) {
557557
if ( this.parentCommit === this.parentBranch.commits.slice( -1 )[ 0 ] ) {
558558
this.startPoint = {
559559
x: this.parentBranch.offsetX - this.parent.commitOffsetX + this.template.commit.spacingX,
@@ -885,18 +885,18 @@
885885
/**
886886
* Push a new point to path.
887887
* This method will combine duplicate points and reject reversed points.
888-
*
888+
*
889889
* @this Branch
890890
*/
891-
Branch.prototype.pushPath = function (point) {
891+
Branch.prototype.pushPath = function ( point ) {
892892
var lastPoint = this.path.slice( -1 )[ 0 ];
893893
if ( !lastPoint ) {
894894
this.path.push( point );
895895
} else if ( lastPoint.x === point.x && lastPoint.y === point.y ) {
896896
if ( lastPoint.type !== "start" && point.type === "end" ) {
897897
lastPoint.type = "end";
898898
} else if ( point.type === "join" ) {
899-
899+
900900
} else {
901901
this.path.push( point );
902902
}
@@ -938,6 +938,7 @@
938938
* @param {String} [options.tag] - Tag of the commit
939939
* @param {String} [options.tagColor = options.color] - Specific tag color
940940
* @param {String} [options.tagFont = this.template.commit.tag.font] - Font of the tag
941+
* @param {String} [options.displayTagBox = true] - If true, display a box around tag
941942
*
942943
* @param {String} [options.dotColor = options.color] - Specific dot color
943944
* @param {Number} [options.dotSize = this.template.commit.dot.size] - Dot size
@@ -978,6 +979,7 @@
978979
this.tag = options.tag || null;
979980
this.tagColor = options.tagColor || options.color;
980981
this.tagFont = options.tagFont || this.template.commit.tag.font;
982+
this.displayTagBox = booleanOptionOr( options.displayTagBox, true );
981983
this.sha1 = options.sha1 || (Math.random( 100 )).toString( 16 ).substring( 3, 10 );
982984
this.message = options.message || "He doesn't like George Michael! Boooo!";
983985
this.arrowDisplay = options.arrowDisplay;
@@ -1013,7 +1015,7 @@
10131015

10141016
// Label
10151017
if ( this.showLabel ) {
1016-
drawTextBG( this.context, this.x + this.template.commit.spacingX, this.y + this.template.commit.spacingY, this.branch.name, "black", this.labelColor, this.labelFont, this.template.branch.labelRotation );
1018+
drawTextBG( this.context, this.x + this.template.commit.spacingX, this.y + this.template.commit.spacingY, this.branch.name, this.labelColor, this.labelFont, this.template.branch.labelRotation, true );
10171019
}
10181020

10191021
// Dot
@@ -1046,12 +1048,12 @@
10461048
drawTextBG( this.context,
10471049
this.x - this.dotSize / 2,
10481050
((this.parent.columnMax + 1) * this.template.commit.tag.spacingY) - this.template.commit.tag.spacingY / 2 + (this.parent.tagNum % 2) * textHeight * 1.5,
1049-
this.tag, "black", this.tagColor, this.tagFont, 0 );
1051+
this.tag, this.tagColor, this.tagFont, 0, this.displayTagBox );
10501052
} else {
10511053
drawTextBG( this.context,
10521054
((this.parent.columnMax + 1) * this.template.commit.tag.spacingX) - this.template.commit.tag.spacingX / 2 + textWidth / 2,
10531055
this.y - this.dotSize / 2,
1054-
this.tag, "black", this.tagColor, this.tagFont, 0 );
1056+
this.tag, this.tagColor, this.tagFont, 0, this.displayTagBox );
10551057
}
10561058
tagWidth = (tagWidth < textWidth) ? textWidth : tagWidth;
10571059
}
@@ -1361,7 +1363,7 @@
13611363
return (typeof booleanOption === "boolean") ? booleanOption : defaultOption;
13621364
}
13631365

1364-
function drawTextBG ( context, x, y, text, fgcolor, bgcolor, font, angle ) {
1366+
function drawTextBG ( context, x, y, text, color, font, angle, useStroke ) {
13651367
context.save();
13661368
context.translate( x, y );
13671369
context.rotate( angle * (Math.PI / 180) );
@@ -1371,15 +1373,20 @@
13711373
var width = context.measureText( text ).width;
13721374
var height = getFontHeight( font );
13731375

1374-
context.beginPath();
1375-
context.rect( -(width / 2) - 4, -(height / 2) + 2, width + 8, height + 2 );
1376-
context.fillStyle = bgcolor;
1377-
context.fill();
1378-
context.lineWidth = 2;
1379-
context.strokeStyle = "black";
1380-
context.stroke();
1376+
if ( useStroke ) {
1377+
context.beginPath();
1378+
context.rect( -(width / 2) - 4, -(height / 2) + 2, width + 8, height + 2 );
1379+
context.fillStyle = color;
1380+
context.fill();
1381+
context.lineWidth = 2;
1382+
context.strokeStyle = "black";
1383+
context.stroke();
1384+
1385+
context.fillStyle = "black";
1386+
} else {
1387+
context.fillStyle = color;
1388+
}
13811389

1382-
context.fillStyle = fgcolor;
13831390
context.fillText( text, 0, height / 2 );
13841391
context.restore();
13851392
}

‎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

+1-1
Original file line numberDiff line numberDiff line change
@@ -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 Jul 25 2016 15:08:04 GMT+0200 (CEST)
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)
13101310
</footer>
13111311

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

‎docs/Commit.html

+43-4
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,45 @@ <h6>Properties</h6>
644644

645645

646646

647+
<tr>
648+
649+
<td class="name"><code>displayTagBox</code></td>
650+
651+
652+
<td class="type">
653+
654+
655+
<span class="param-type">String</span>
656+
657+
658+
659+
</td>
660+
661+
662+
<td class="attributes">
663+
664+
&lt;optional><br>
665+
666+
667+
668+
669+
670+
</td>
671+
672+
673+
674+
<td class="default">
675+
676+
true
677+
678+
</td>
679+
680+
681+
<td class="description last"><p>If true, display a box around tag</p></td>
682+
</tr>
683+
684+
685+
647686
<tr>
648687

649688
<td class="name"><code>dotColor</code></td>
@@ -1257,7 +1296,7 @@ <h6>Properties</h6>
12571296

12581297
<dt class="tag-source">Source:</dt>
12591298
<dd class="tag-source"><ul class="dummy"><li>
1260-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line953">line 953</a>
1299+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line954">line 954</a>
12611300
</li></ul></dd>
12621301

12631302

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

13481387
<dt class="tag-source">Source:</dt>
13491388
<dd class="tag-source"><ul class="dummy"><li>
1350-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1083">line 1083</a>
1389+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1085">line 1085</a>
13511390
</li></ul></dd>
13521391

13531392

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

14201459
<dt class="tag-source">Source:</dt>
14211460
<dd class="tag-source"><ul class="dummy"><li>
1422-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1002">line 1002</a>
1461+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1004">line 1004</a>
14231462
</li></ul></dd>
14241463

14251464

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

14681507
<footer>
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)
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)
14701509
</footer>
14711510

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

‎docs/GitGraph.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -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 Jul 25 2016 15:08:05 GMT+0200 (CEST)
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)
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#line1199">line 1199</a>
1096+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1201">line 1201</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#line1279">line 1279</a>
1231+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1281">line 1281</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 Jul 25 2016 15:08:05 GMT+0200 (CEST)
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)
13011301
</footer>
13021302

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

‎docs/gitgraph.js.html

+24-17
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ <h1 class="page-title">Source: gitgraph.js</h1>
570570
this.offsetY = this.column * this.spacingY;
571571

572572
// Add start point
573-
if (this.parentBranch) {
573+
if ( this.parentBranch ) {
574574
if ( this.parentCommit === this.parentBranch.commits.slice( -1 )[ 0 ] ) {
575575
this.startPoint = {
576576
x: this.parentBranch.offsetX - this.parent.commitOffsetX + this.template.commit.spacingX,
@@ -902,18 +902,18 @@ <h1 class="page-title">Source: gitgraph.js</h1>
902902
/**
903903
* Push a new point to path.
904904
* This method will combine duplicate points and reject reversed points.
905-
*
905+
*
906906
* @this Branch
907907
*/
908-
Branch.prototype.pushPath = function (point) {
908+
Branch.prototype.pushPath = function ( point ) {
909909
var lastPoint = this.path.slice( -1 )[ 0 ];
910910
if ( !lastPoint ) {
911911
this.path.push( point );
912912
} else if ( lastPoint.x === point.x && lastPoint.y === point.y ) {
913913
if ( lastPoint.type !== "start" && point.type === "end" ) {
914914
lastPoint.type = "end";
915915
} else if ( point.type === "join" ) {
916-
916+
917917
} else {
918918
this.path.push( point );
919919
}
@@ -955,6 +955,7 @@ <h1 class="page-title">Source: gitgraph.js</h1>
955955
* @param {String} [options.tag] - Tag of the commit
956956
* @param {String} [options.tagColor = options.color] - Specific tag color
957957
* @param {String} [options.tagFont = this.template.commit.tag.font] - Font of the tag
958+
* @param {String} [options.displayTagBox = true] - If true, display a box around tag
958959
*
959960
* @param {String} [options.dotColor = options.color] - Specific dot color
960961
* @param {Number} [options.dotSize = this.template.commit.dot.size] - Dot size
@@ -995,6 +996,7 @@ <h1 class="page-title">Source: gitgraph.js</h1>
995996
this.tag = options.tag || null;
996997
this.tagColor = options.tagColor || options.color;
997998
this.tagFont = options.tagFont || this.template.commit.tag.font;
999+
this.displayTagBox = booleanOptionOr( options.displayTagBox, true );
9981000
this.sha1 = options.sha1 || (Math.random( 100 )).toString( 16 ).substring( 3, 10 );
9991001
this.message = options.message || "He doesn't like George Michael! Boooo!";
10001002
this.arrowDisplay = options.arrowDisplay;
@@ -1030,7 +1032,7 @@ <h1 class="page-title">Source: gitgraph.js</h1>
10301032

10311033
// Label
10321034
if ( this.showLabel ) {
1033-
drawTextBG( this.context, this.x + this.template.commit.spacingX, this.y + this.template.commit.spacingY, this.branch.name, "black", this.labelColor, this.labelFont, this.template.branch.labelRotation );
1035+
drawTextBG( this.context, this.x + this.template.commit.spacingX, this.y + this.template.commit.spacingY, this.branch.name, this.labelColor, this.labelFont, this.template.branch.labelRotation, true );
10341036
}
10351037

10361038
// Dot
@@ -1063,12 +1065,12 @@ <h1 class="page-title">Source: gitgraph.js</h1>
10631065
drawTextBG( this.context,
10641066
this.x - this.dotSize / 2,
10651067
((this.parent.columnMax + 1) * this.template.commit.tag.spacingY) - this.template.commit.tag.spacingY / 2 + (this.parent.tagNum % 2) * textHeight * 1.5,
1066-
this.tag, "black", this.tagColor, this.tagFont, 0 );
1068+
this.tag, this.tagColor, this.tagFont, 0, this.displayTagBox );
10671069
} else {
10681070
drawTextBG( this.context,
10691071
((this.parent.columnMax + 1) * this.template.commit.tag.spacingX) - this.template.commit.tag.spacingX / 2 + textWidth / 2,
10701072
this.y - this.dotSize / 2,
1071-
this.tag, "black", this.tagColor, this.tagFont, 0 );
1073+
this.tag, this.tagColor, this.tagFont, 0, this.displayTagBox );
10721074
}
10731075
tagWidth = (tagWidth &lt; textWidth) ? textWidth : tagWidth;
10741076
}
@@ -1378,7 +1380,7 @@ <h1 class="page-title">Source: gitgraph.js</h1>
13781380
return (typeof booleanOption === "boolean") ? booleanOption : defaultOption;
13791381
}
13801382

1381-
function drawTextBG ( context, x, y, text, fgcolor, bgcolor, font, angle ) {
1383+
function drawTextBG ( context, x, y, text, color, font, angle, useStroke ) {
13821384
context.save();
13831385
context.translate( x, y );
13841386
context.rotate( angle * (Math.PI / 180) );
@@ -1388,15 +1390,20 @@ <h1 class="page-title">Source: gitgraph.js</h1>
13881390
var width = context.measureText( text ).width;
13891391
var height = getFontHeight( font );
13901392

1391-
context.beginPath();
1392-
context.rect( -(width / 2) - 4, -(height / 2) + 2, width + 8, height + 2 );
1393-
context.fillStyle = bgcolor;
1394-
context.fill();
1395-
context.lineWidth = 2;
1396-
context.strokeStyle = "black";
1397-
context.stroke();
1393+
if ( useStroke ) {
1394+
context.beginPath();
1395+
context.rect( -(width / 2) - 4, -(height / 2) + 2, width + 8, height + 2 );
1396+
context.fillStyle = color;
1397+
context.fill();
1398+
context.lineWidth = 2;
1399+
context.strokeStyle = "black";
1400+
context.stroke();
1401+
1402+
context.fillStyle = "black";
1403+
} else {
1404+
context.fillStyle = color;
1405+
}
13981406

1399-
context.fillStyle = fgcolor;
14001407
context.fillText( text, 0, height / 2 );
14011408
context.restore();
14021409
}
@@ -1423,7 +1430,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
14231430
<br clear="both">
14241431

14251432
<footer>
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)
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)
14271434
</footer>
14281435

14291436
<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 Jul 25 2016 15:08:04 GMT+0200 (CEST)
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)
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 Jul 25 2016 15:08:04 GMT+0200 (CEST)
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)
119119
</footer>
120120

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

‎examples/index.js

+3
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ test.commit( { message: "It works !" } );
120120
// Add a tag to a commit
121121
test.commit( { message: "Here you can see something", tag: "a-tag" } );
122122

123+
// Don't display tag box
124+
test.commit( { message: "Here is a fresh new tag", tag: "my-tag", displayTagBox: false } );
125+
123126
// Perform a merge, with a tag
124127
test.merge( master, { message: "New release", tag: "v1.0.0" } );
125128

0 commit comments

Comments
 (0)