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

Commit ad1b55a

Browse files
nicoespeonnicoespeon
committed
Merge develop into master
2 parents 4ab6597 + 1e19925 commit ad1b55a

12 files changed

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

‎build/gitgraph.js

+21-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* GitGraph v1.6.0
2+
* GitGraph v1.6.1
33
* https://github.com/nicoespeon/gitgraph.js
44
* ==========================================================
55
* Copyright (c) 2016 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
@@ -864,16 +864,30 @@
864864
var parentBranchLastCommit = targetBranch.commits.slice( -1 )[ 0 ];
865865
var isFastForwardPossible = (branchParentCommit.sha1 === parentBranchLastCommit.sha1);
866866
if (commitOptions.fastForward && isFastForwardPossible) {
867+
var isGraphHorizontal  = _isHorizontal(this.parent);
867868
this.color = targetBranch.color;
868869

869870
// Make branch path follow target branch ones
870-
var targetBranchX = targetBranch.path[1].x;
871-
this.path.forEach(function (point) {
872-
point.x = targetBranchX;
873-
});
871+
if (isGraphHorizontal) {
872+
var targetBranchY = targetBranch.path[1].y;
873+
this.path.forEach(function(point) {
874+
console.log(point.y, targetBranchY);
875+
point.y = targetBranchY;
876+
});
877+
} else {
878+
var targetBranchX = targetBranch.path[1].x;
879+
this.path.forEach(function (point) {
880+
point.x = targetBranchX;
881+
});
882+
}
883+
884+
this.commits.forEach(function(commit) {
885+
if (isGraphHorizontal) {
886+
commit.y = branchParentCommit.y;
887+
} else {
888+
commit.x = branchParentCommit.x;
889+
}
874890

875-
this.commits.forEach(function (commit) {
876-
commit.x = branchParentCommit.x;
877891
commit.labelColor = branchParentCommit.labelColor;
878892
commit.messageColor = branchParentCommit.messageColor;
879893
commit.dotColor = branchParentCommit.dotColor;

‎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

+3-3
Original file line numberDiff line numberDiff line change
@@ -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#line910">line 910</a>
569+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line924">line 924</a>
570570
</li></ul></dd>
571571

572572

@@ -1255,7 +1255,7 @@ <h5>This:</h5>
12551255

12561256
<dt class="tag-source">Source:</dt>
12571257
<dd class="tag-source"><ul class="dummy"><li>
1258-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line935">line 935</a>
1258+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line949">line 949</a>
12591259
</li></ul></dd>
12601260

12611261

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

13761376
<footer>
1377-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 13:45:44 GMT+0100 (CET)
1377+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 17:14:22 GMT+0100 (CET)
13781378
</footer>
13791379

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

‎docs/Commit.html

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

13361336
<dt class="tag-source">Source:</dt>
13371337
<dd class="tag-source"><ul class="dummy"><li>
1338-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1009">line 1009</a>
1338+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1023">line 1023</a>
13391339
</li></ul></dd>
13401340

13411341

@@ -1425,7 +1425,7 @@ <h5>This:</h5>
14251425

14261426
<dt class="tag-source">Source:</dt>
14271427
<dd class="tag-source"><ul class="dummy"><li>
1428-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1141">line 1141</a>
1428+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1155">line 1155</a>
14291429
</li></ul></dd>
14301430

14311431

@@ -1497,7 +1497,7 @@ <h5>This:</h5>
14971497

14981498
<dt class="tag-source">Source:</dt>
14991499
<dd class="tag-source"><ul class="dummy"><li>
1500-
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1060">line 1060</a>
1500+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1074">line 1074</a>
15011501
</li></ul></dd>
15021502

15031503

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

15461546
<footer>
1547-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 13:45:44 GMT+0100 (CET)
1547+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 17:14:22 GMT+0100 (CET)
15481548
</footer>
15491549

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

‎docs/GitGraph.html

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

16981698
<footer>
1699-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 13:45:44 GMT+0100 (CET)
1699+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 17:14:22 GMT+0100 (CET)
17001700
</footer>
17011701

17021702
<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#line1257">line 1257</a>
1096+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1271">line 1271</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#line1337">line 1337</a>
1231+
<a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1351">line 1351</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 Fri Dec 16 2016 13:45:44 GMT+0100 (CET)
1300+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 17:14:22 GMT+0100 (CET)
13011301
</footer>
13021302

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

‎docs/gitgraph.js.html

+21-7
Original file line numberDiff line numberDiff line change
@@ -881,16 +881,30 @@ <h1 class="page-title">Source: gitgraph.js</h1>
881881
var parentBranchLastCommit = targetBranch.commits.slice( -1 )[ 0 ];
882882
var isFastForwardPossible = (branchParentCommit.sha1 === parentBranchLastCommit.sha1);
883883
if (commitOptions.fastForward && isFastForwardPossible) {
884+
var isGraphHorizontal  = _isHorizontal(this.parent);
884885
this.color = targetBranch.color;
885886

886887
// Make branch path follow target branch ones
887-
var targetBranchX = targetBranch.path[1].x;
888-
this.path.forEach(function (point) {
889-
point.x = targetBranchX;
890-
});
888+
if (isGraphHorizontal) {
889+
var targetBranchY = targetBranch.path[1].y;
890+
this.path.forEach(function(point) {
891+
console.log(point.y, targetBranchY);
892+
point.y = targetBranchY;
893+
});
894+
} else {
895+
var targetBranchX = targetBranch.path[1].x;
896+
this.path.forEach(function (point) {
897+
point.x = targetBranchX;
898+
});
899+
}
900+
901+
this.commits.forEach(function(commit) {
902+
if (isGraphHorizontal) {
903+
commit.y = branchParentCommit.y;
904+
} else {
905+
commit.x = branchParentCommit.x;
906+
}
891907

892-
this.commits.forEach(function (commit) {
893-
commit.x = branchParentCommit.x;
894908
commit.labelColor = branchParentCommit.labelColor;
895909
commit.messageColor = branchParentCommit.messageColor;
896910
commit.dotColor = branchParentCommit.dotColor;
@@ -1486,7 +1500,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="Branch.h
14861500
<br clear="both">
14871501

14881502
<footer>
1489-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 13:45:44 GMT+0100 (CET)
1503+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 17:14:22 GMT+0100 (CET)
14901504
</footer>
14911505

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

‎docs/global.html

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

10091009
<footer>
1010-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 13:45:44 GMT+0100 (CET)
1010+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 17:14:22 GMT+0100 (CET)
10111011
</footer>
10121012

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

‎docs/index.html

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

133133
<footer>
134-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 13:45:44 GMT+0100 (CET)
134+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Fri Dec 16 2016 17:14:22 GMT+0100 (CET)
135135
</footer>
136136

137137
<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.6.0",
3+
"version": "1.6.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

+20-6
Original file line numberDiff line numberDiff line change
@@ -854,16 +854,30 @@
854854
var parentBranchLastCommit = targetBranch.commits.slice( -1 )[ 0 ];
855855
var isFastForwardPossible = (branchParentCommit.sha1 === parentBranchLastCommit.sha1);
856856
if (commitOptions.fastForward && isFastForwardPossible) {
857+
var isGraphHorizontal  = _isHorizontal(this.parent);
857858
this.color = targetBranch.color;
858859

859860
// Make branch path follow target branch ones
860-
var targetBranchX = targetBranch.path[1].x;
861-
this.path.forEach(function (point) {
862-
point.x = targetBranchX;
863-
});
861+
if (isGraphHorizontal) {
862+
var targetBranchY = targetBranch.path[1].y;
863+
this.path.forEach(function(point) {
864+
console.log(point.y, targetBranchY);
865+
point.y = targetBranchY;
866+
});
867+
} else {
868+
var targetBranchX = targetBranch.path[1].x;
869+
this.path.forEach(function (point) {
870+
point.x = targetBranchX;
871+
});
872+
}
873+
874+
this.commits.forEach(function(commit) {
875+
if (isGraphHorizontal) {
876+
commit.y = branchParentCommit.y;
877+
} else {
878+
commit.x = branchParentCommit.x;
879+
}
864880

865-
this.commits.forEach(function (commit) {
866-
commit.x = branchParentCommit.x;
867881
commit.labelColor = branchParentCommit.labelColor;
868882
commit.messageColor = branchParentCommit.messageColor;
869883
commit.dotColor = branchParentCommit.dotColor;

0 commit comments

Comments
 (0)