Merge develop into master

nicoespeon · Jun 13, 2017 · 5b4e449 · 5b4e449
2 parents 5f9057e + 034818b
commit 5b4e449
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -26,6 +26,7 @@ issue](https://github.com/nicoespeon/gitgraph.js/issues).
 
 Please have a look at the [Issue Guidelines][] from [Nicolas Gallagher][] before
 doing so.
+
 [Issue Guidelines]: https://github.com/necolas/issue-guidelines/blob/master/CONTRIBUTING.md
 [Nicolas Gallagher]: https://github.com/necolas
 
@@ -37,6 +38,7 @@ The JavaScript source code is documented with [JSDoc](http://usejsdoc.org/).
 
 Editor preferences are available in for [the editor config][] easy use in common
 text editors. Read more and download plugins at <http://editorconfig.org>.
+
 [the editor config]: https://github.com/nicoespeon/gitgraph.js/blob/master/.editorconfig
 
 The project uses [Grunt](http://gruntjs.com) with convenient methods for our
@@ -49,6 +51,7 @@ Grunt commands.
 From the command line:
 
 - Install [the necessary local dependencies][] with `npm install`.
+
 [the necessary local dependencies]: https://github.com/nicoespeon/gitgraph.js/blob/master/package.json
 
 When completed, you'll be able to run the various Grunt commands provided from
@@ -61,6 +64,7 @@ the command line.
 #### test code - `npm test`
 
 Check source code against [JSHint][] then runs unit tests with [Jasmine][].
+
 [JSHint]: http://www.jshint.com/
 [Jasmine]: https://jasmine.github.io/
 
@@ -120,6 +124,7 @@ And constructed with the following guidelines:
 ## Copyright and License
 
 Copyright (c) 2013 Nicolas CARLO and Fabien BERNARD under the [MIT license][]
+
 [MIT license]: https://github.com/nicoespeon/gitgraph.js/blob/master/LICENSE.md
 
 [> What does that mean?](http://choosealicense.com/licenses/mit/)
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "gitgraph.js",
-  "version": "1.11.2",
+  "version": "1.11.3",
   "main": [
     "./build/gitgraph.js",
     "./build/gitgraph.css"

diff --git a/build/gitgraph.js b/build/gitgraph.js
@@ -1,5 +1,5 @@
 /* ==========================================================
- *                  GitGraph v1.11.2
+ *                  GitGraph v1.11.3
  *      https://github.com/nicoespeon/gitgraph.js
  * ==========================================================
  * Copyright (c) 2017 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶
@@ -933,11 +933,21 @@
     } else {
       targetBranch.commit(commitOptions);
 
+      var detailOffsetY = 0;
+
+      if(commitOptions.detail) {
+        if(this.parent.orientation === "vertical") {
+          detailOffsetY = -1 * commitOptions.detail.clientHeight;
+        } else if (this.parent.orientation === "vertical-reverse") {
+          detailOffsetY = commitOptions.detail.clientHeight;
+        }
+      }
+
       // Add points to path
       var targetCommit = _getLast(targetBranch.commits);
       var endOfBranch = {
         x: this.offsetX + this.template.commit.spacingX * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetX,
-        y: this.offsetY + this.template.commit.spacingY * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetY,
+        y: this.offsetY + this.template.commit.spacingY * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetY + detailOffsetY,
         type: "joint"
       };
       this.pushPath(_clone(endOfBranch));

diff --git a/build/gitgraph.min.js b/build/gitgraph.min.js
diff --git a/docs/Branch.html b/docs/Branch.html
@@ -672,7 +672,7 @@ <h5>This:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line961">line 961</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line971">line 971</a>
     </li></ul></dd>
 
 
@@ -1437,7 +1437,7 @@ <h5>This:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line986">line 986</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line996">line 996</a>
     </li></ul></dd>
 
 
@@ -1886,7 +1886,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu May 25 2017 11:09:19 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Tue Jun 13 2017 21:41:57 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/Commit.html b/docs/Commit.html
@@ -1387,7 +1387,7 @@ <h6>Properties</h6>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1061">line 1061</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1071">line 1071</a>
     </li></ul></dd>
 
 
@@ -1490,7 +1490,7 @@ <h5>This:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1221">line 1221</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1231">line 1231</a>
     </li></ul></dd>
 
 
@@ -1575,7 +1575,7 @@ <h5>This:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1110">line 1110</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1120">line 1120</a>
     </li></ul></dd>
 
 
@@ -1623,7 +1623,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu May 25 2017 11:09:19 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Tue Jun 13 2017 21:41:57 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/GitGraph.html b/docs/GitGraph.html
@@ -2061,7 +2061,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu May 25 2017 11:09:19 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Tue Jun 13 2017 21:41:57 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/Tag.html b/docs/Tag.html
@@ -294,7 +294,7 @@ <h6>Properties</h6>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1309">line 1309</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1319">line 1319</a>
     </li></ul></dd>
 
 
@@ -374,7 +374,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu May 25 2017 11:09:19 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Tue Jun 13 2017 21:41:57 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/Template.html b/docs/Template.html
@@ -1180,7 +1180,7 @@ <h6>Properties</h6>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1384">line 1384</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1394">line 1394</a>
     </li></ul></dd>
 
 
@@ -1329,7 +1329,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1472">line 1472</a>
+        <a href="gitgraph.js.html">gitgraph.js</a>, <a href="gitgraph.js.html#line1482">line 1482</a>
     </li></ul></dd>
 
 
@@ -1399,7 +1399,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu May 25 2017 11:09:19 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Tue Jun 13 2017 21:41:57 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/gitgraph.js.html b/docs/gitgraph.js.html
@@ -951,11 +951,21 @@ <h1 class="page-title">Source: gitgraph.js</h1>
     } else {
       targetBranch.commit(commitOptions);
 
+      var detailOffsetY = 0;
+
+      if(commitOptions.detail) {
+        if(this.parent.orientation === "vertical") {
+          detailOffsetY = -1 * commitOptions.detail.clientHeight;
+        } else if (this.parent.orientation === "vertical-reverse") {
+          detailOffsetY = commitOptions.detail.clientHeight;
+        }
+      }
+
       // Add points to path
       var targetCommit = _getLast(targetBranch.commits);
       var endOfBranch = {
         x: this.offsetX + this.template.commit.spacingX * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetX,
-        y: this.offsetY + this.template.commit.spacingY * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetY,
+        y: this.offsetY + this.template.commit.spacingY * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetY + detailOffsetY,
         type: "joint"
       };
       this.pushPath(_clone(endOfBranch));
@@ -1870,7 +1880,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu May 25 2017 11:09:19 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Tue Jun 13 2017 21:41:57 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/global.html b/docs/global.html
@@ -1514,7 +1514,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu May 25 2017 11:09:19 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Tue Jun 13 2017 21:41:57 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/index.html b/docs/index.html
@@ -115,7 +115,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Branch.ht
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Thu May 25 2017 11:09:19 GMT+0200 (CEST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Tue Jun 13 2017 21:41:57 GMT+0200 (CEST)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gitgraph.js",
-  "version": "1.11.2",
+  "version": "1.11.3",
   "author": "Nicolas Carlo <nicolascarlo.espeon@gmail.com>",
   "description": "A JavaScript library to draw pretty git graphs in the browser",
   "contributors": [

diff --git a/src/gitgraph.js b/src/gitgraph.js
@@ -923,11 +923,21 @@
     } else {
       targetBranch.commit(commitOptions);
 
+      var detailOffsetY = 0;
+
+      if(commitOptions.detail) {
+        if(this.parent.orientation === "vertical") {
+          detailOffsetY = -1 * commitOptions.detail.clientHeight;
+        } else if (this.parent.orientation === "vertical-reverse") {
+          detailOffsetY = commitOptions.detail.clientHeight;
+        }
+      }
+
       // Add points to path
       var targetCommit = _getLast(targetBranch.commits);
       var endOfBranch = {
         x: this.offsetX + this.template.commit.spacingX * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetX,
-        y: this.offsetY + this.template.commit.spacingY * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetY,
+        y: this.offsetY + this.template.commit.spacingY * (targetCommit.showLabel ? 3 : 2) - this.parent.commitOffsetY + detailOffsetY,
         type: "joint"
       };
       this.pushPath(_clone(endOfBranch));