From 63916eee91f09995a4390da6f5ebae879a0ab02f Mon Sep 17 00:00:00 2001 From: Nicolas Carlo Date: Fri, 21 Apr 2017 20:19:16 +0200 Subject: [PATCH 1/2] Add lineDash option to branch and commits Document existing branch lineDash options for templates. Close #139 --- examples/index.js | 20 +++++++++++++++++++- src/gitgraph.js | 22 ++++++++++++---------- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/examples/index.js b/examples/index.js index 667440e2..3d890796 100644 --- a/examples/index.js +++ b/examples/index.js @@ -6,12 +6,16 @@ var myTemplateConfig = { colors: ["#F00", "#0F0", "#00F"], // branches colors, 1 per column branch: { lineWidth: 8, + // Dash segments, see: + // https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash + lineDash: [5, 3], spacingX: 50 }, commit: { spacingY: -80, dot: { - size: 12 + size: 12, + lineDash: [4] }, message: { displayAuthor: true, @@ -56,6 +60,7 @@ gitGraph.commit("My second commit").commit("Add awesome feature"); var dev = master.branch({ name: "dev", color: "#F00", + // lineDash: [5], commitDefaultOptions: { color: "#F00" } @@ -204,3 +209,16 @@ test.commit({ console.log("You just clicked my commit.", commit, event); } }); + +// Display WIP-like commit +test + .commit({ + lineDash: [3, 2], + dotStrokeWidth: 5, + dotColor: "white", + messageHashDisplay: false, + messageAuthorDisplay: false, + message: "Current WIP", + tag: "HEAD", + displayTagBox: false + }); diff --git a/src/gitgraph.js b/src/gitgraph.js index af2a315b..c3556f72 100644 --- a/src/gitgraph.js +++ b/src/gitgraph.js @@ -462,6 +462,7 @@ * @param {Branch} [options.parentBranch = options.parentCommit.branch] - Parent branch * @param {Commit} [options.parentCommit = _getLast(options.parentBranch.commits)] - Parent commit * @param {string} [options.name = "no-name"] - Branch name + * @param {number[]} [options.lineDash = this.template.branch.lineDash] - Branch line dash segments * @param {object} [options.commitDefaultOptions = {}] - Default options for commits * * @this Branch @@ -605,19 +606,12 @@ this.context.lineWidth = this.lineWidth; this.context.strokeStyle = this.color; - var prevLineDash; - if (this.context.setLineDash !== undefined) { - prevLineDash = this.context.getLineDash(); + if (typeof this.context.setLineDash === "function") { this.context.setLineDash(this.lineDash); } this.context.stroke(); this.context.closePath(); - - //Restore previous line dash setting, if any - if (prevLineDash !== undefined) { - this.context.setLineDash(prevLineDash); - } }; /** @@ -1049,6 +1043,7 @@ * @param {number} [options.dotSize = this.template.commit.dot.size] - Dot size * @param {number} [options.dotStrokeWidth = this.template.commit.dot.strokeWidth] - Dot stroke width * @param {string} [options.dotStrokeColor = this.template.commit.dot.strokeColor] + * @param {number[]} [options.lineDash = this.template.commit.dot.lineDash] * * @param {string} [options.message = "He doesn't like George Michael! Boooo!"] - Commit message * @param {string} [options.messageColor = options.color] - Specific message color @@ -1095,6 +1090,7 @@ this.dotSize = options.dotSize || this.template.commit.dot.size; this.dotStrokeWidth = options.dotStrokeWidth || this.template.commit.dot.strokeWidth; this.dotStrokeColor = options.dotStrokeColor || this.template.commit.dot.strokeColor || options.color; + this.lineDash = options.lineDash || this.template.commit.dot.lineDash; this.type = options.type || null; this.tooltipDisplay = _booleanOptionOr(options.tooltipDisplay, true); this.onClick = options.onClick || null; @@ -1121,7 +1117,6 @@ // Label if (this.showLabel) { - /* * For cases where we want a 0 or 180 degree label rotation in horizontal mode, * we need to modify the position of the label to sit centrally above the commit dot. @@ -1161,7 +1156,11 @@ this.context.strokeStyle = this.dotStrokeColor; this.context.lineWidth = this.dotStrokeWidth; - if (typeof (this.dotStrokeWidth) === "number") { + if (typeof this.context.setLineDash === "function") { + this.context.setLineDash(this.lineDash); + } + + if (typeof this.dotStrokeWidth === "number") { this.context.stroke(); } @@ -1362,6 +1361,7 @@ * @param {number} [options.arrow.offset] - Arrow offset * @param {string} [options.branch.color] - Branch color * @param {number} [options.branch.lineWidth] - Branch line width + * @param {number[]} [options.branch.lineDash] - Branch line dash segments * @param {string} [options.branch.mergeStyle = ("bezier"|"straight")] - Branch merge style * @param {number} [options.branch.spacingX] - Space between branches * @param {number} [options.branch.spacingY] - Space between branches @@ -1373,6 +1373,7 @@ * @param {number} [options.commit.dot.size] - Commit dot size * @param {number} [options.commit.dot.strokeWidth] - Commit dot stroke width * @param {string} [options.commit.dot.strokeColor] - Commit dot stroke color + * @param {number[]} [options.commit.dot.lineDash] - Commit dot line dash segments * @param {string} [options.commit.message.color] - Commit message color * @param {boolean} [options.commit.message.display] - Commit display policy * @param {boolean} [options.commit.message.displayAuthor] - Commit message author policy @@ -1446,6 +1447,7 @@ this.commit.dot.size = options.commit.dot.size || 3; this.commit.dot.strokeWidth = options.commit.dot.strokeWidth || null; this.commit.dot.strokeColor = options.commit.dot.strokeColor || null; + this.commit.dot.lineDash = options.commit.dot.lineDash || this.branch.lineDash; this.commit.tag = {}; this.commit.tag.color = options.commit.tag.color || this.commit.dot.color; From 69e9a3625674da2e67c84c842914265bfd022612 Mon Sep 17 00:00:00 2001 From: Nicolas Carlo Date: Fri, 21 Apr 2017 21:01:38 +0200 Subject: [PATCH 2/2] Bump version and compile --- bower.json | 2 +- build/gitgraph.d.ts | 20 +++++++++++ build/gitgraph.js | 24 +++++++------ build/gitgraph.min.js | 4 +-- docs/Branch.html | 61 +++++++++++++++++++++++++++------ docs/Commit.html | 47 ++++++++++++++++++++++--- docs/GitGraph.html | 2 +- docs/Tag.html | 4 +-- docs/Template.html | 80 +++++++++++++++++++++++++++++++++++++++++-- docs/gitgraph.js.html | 24 +++++++------ docs/global.html | 4 +-- docs/index.html | 2 +- package.json | 2 +- 13 files changed, 226 insertions(+), 50 deletions(-) diff --git a/bower.json b/bower.json index f8e5b80d..444b4310 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "gitgraph.js", - "version": "1.10.1", + "version": "1.11.0", "main": [ "./build/gitgraph.js", "./build/gitgraph.css" diff --git a/build/gitgraph.d.ts b/build/gitgraph.d.ts index 36f8ccb3..5403f63c 100644 --- a/build/gitgraph.d.ts +++ b/build/gitgraph.d.ts @@ -81,6 +81,11 @@ declare namespace GitGraph { */ name?: string; + /** + * Branch line dash segments + */ + lineDash?: number[]; + /** * Default options for commits */ @@ -265,6 +270,11 @@ declare namespace GitGraph { */ dotStrokeColor?: string; + /** + * undefined + */ + lineDash?: number[]; + /** * Commit message */ @@ -416,6 +426,11 @@ declare namespace GitGraph { */ lineWidth?: number; + /** + * Branch line dash segments + */ + lineDash?: number[]; + /** * Branch merge style */ @@ -474,6 +489,11 @@ declare namespace GitGraph { */ strokeColor?: string; + /** + * Commit dot line dash segments + */ + lineDash?: number[]; + }; message?: { diff --git a/build/gitgraph.js b/build/gitgraph.js index a478b73e..dc703dfc 100644 --- a/build/gitgraph.js +++ b/build/gitgraph.js @@ -1,5 +1,5 @@ /* ========================================================== - * GitGraph v1.10.1 + * GitGraph v1.11.0 * https://github.com/nicoespeon/gitgraph.js * ========================================================== * Copyright (c) 2017 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶ @@ -472,6 +472,7 @@ * @param {Branch} [options.parentBranch = options.parentCommit.branch] - Parent branch * @param {Commit} [options.parentCommit = _getLast(options.parentBranch.commits)] - Parent commit * @param {string} [options.name = "no-name"] - Branch name + * @param {number[]} [options.lineDash = this.template.branch.lineDash] - Branch line dash segments * @param {object} [options.commitDefaultOptions = {}] - Default options for commits * * @this Branch @@ -615,19 +616,12 @@ this.context.lineWidth = this.lineWidth; this.context.strokeStyle = this.color; - var prevLineDash; - if (this.context.setLineDash !== undefined) { - prevLineDash = this.context.getLineDash(); + if (typeof this.context.setLineDash === "function") { this.context.setLineDash(this.lineDash); } this.context.stroke(); this.context.closePath(); - - //Restore previous line dash setting, if any - if (prevLineDash !== undefined) { - this.context.setLineDash(prevLineDash); - } }; /** @@ -1059,6 +1053,7 @@ * @param {number} [options.dotSize = this.template.commit.dot.size] - Dot size * @param {number} [options.dotStrokeWidth = this.template.commit.dot.strokeWidth] - Dot stroke width * @param {string} [options.dotStrokeColor = this.template.commit.dot.strokeColor] + * @param {number[]} [options.lineDash = this.template.commit.dot.lineDash] * * @param {string} [options.message = "He doesn't like George Michael! Boooo!"] - Commit message * @param {string} [options.messageColor = options.color] - Specific message color @@ -1105,6 +1100,7 @@ this.dotSize = options.dotSize || this.template.commit.dot.size; this.dotStrokeWidth = options.dotStrokeWidth || this.template.commit.dot.strokeWidth; this.dotStrokeColor = options.dotStrokeColor || this.template.commit.dot.strokeColor || options.color; + this.lineDash = options.lineDash || this.template.commit.dot.lineDash; this.type = options.type || null; this.tooltipDisplay = _booleanOptionOr(options.tooltipDisplay, true); this.onClick = options.onClick || null; @@ -1131,7 +1127,6 @@ // Label if (this.showLabel) { - /* * For cases where we want a 0 or 180 degree label rotation in horizontal mode, * we need to modify the position of the label to sit centrally above the commit dot. @@ -1171,7 +1166,11 @@ this.context.strokeStyle = this.dotStrokeColor; this.context.lineWidth = this.dotStrokeWidth; - if (typeof (this.dotStrokeWidth) === "number") { + if (typeof this.context.setLineDash === "function") { + this.context.setLineDash(this.lineDash); + } + + if (typeof this.dotStrokeWidth === "number") { this.context.stroke(); } @@ -1372,6 +1371,7 @@ * @param {number} [options.arrow.offset] - Arrow offset * @param {string} [options.branch.color] - Branch color * @param {number} [options.branch.lineWidth] - Branch line width + * @param {number[]} [options.branch.lineDash] - Branch line dash segments * @param {string} [options.branch.mergeStyle = ("bezier"|"straight")] - Branch merge style * @param {number} [options.branch.spacingX] - Space between branches * @param {number} [options.branch.spacingY] - Space between branches @@ -1383,6 +1383,7 @@ * @param {number} [options.commit.dot.size] - Commit dot size * @param {number} [options.commit.dot.strokeWidth] - Commit dot stroke width * @param {string} [options.commit.dot.strokeColor] - Commit dot stroke color + * @param {number[]} [options.commit.dot.lineDash] - Commit dot line dash segments * @param {string} [options.commit.message.color] - Commit message color * @param {boolean} [options.commit.message.display] - Commit display policy * @param {boolean} [options.commit.message.displayAuthor] - Commit message author policy @@ -1456,6 +1457,7 @@ this.commit.dot.size = options.commit.dot.size || 3; this.commit.dot.strokeWidth = options.commit.dot.strokeWidth || null; this.commit.dot.strokeColor = options.commit.dot.strokeColor || null; + this.commit.dot.lineDash = options.commit.dot.lineDash || this.branch.lineDash; this.commit.tag = {}; this.commit.tag.color = options.commit.tag.color || this.commit.dot.color; diff --git a/build/gitgraph.min.js b/build/gitgraph.min.js index 7ff42385..093d414c 100644 --- a/build/gitgraph.min.js +++ b/build/gitgraph.min.js @@ -1,5 +1,5 @@ /* ========================================================== - * GitGraph v1.10.1 + * GitGraph v1.11.0 * https://github.com/nicoespeon/gitgraph.js * ========================================================== * Copyright (c) 2017 Nicolas CARLO (@nicoespeon) ٩(^‿^)۶ @@ -7,4 +7,4 @@ * * GitGraph.js may be freely distributed under the MIT Licence * ========================================================== */ -!function(){"use strict";function a(a){switch(a=q(a)?a:{},this.elementId="string"==typeof a.elementId?a.elementId:"gitGraph",this.author="string"==typeof a.author?a.author:"Sergio Flores ",this.reverseArrow=k(a.reverseArrow,!1),"string"==typeof a.template||q(a.template)?this.template=this.newTemplate(a.template):a.template instanceof e?this.template=a.template:this.template=this.newTemplate("metro"),this.mode=a.mode||null,"compact"===this.mode&&(this.template.commit.message.display=!1),a.orientation){case"vertical-reverse":this.template.commit.spacingY*=-1,this.orientation="vertical-reverse",this.template.branch.labelRotation=r(a,"template.branch.labelRotation")?0:a.template.branch.labelRotation,this.template.commit.tag.spacingY*=-1;break;case"horizontal":this.template.commit.message.display=!1,this.template.commit.spacingX=this.template.commit.spacingY,this.template.branch.spacingY=this.template.branch.spacingX,this.template.commit.spacingY=0,this.template.branch.spacingX=0,this.orientation="horizontal",this.template.branch.labelRotation=r(a,"template.branch.labelRotation")?-90:a.template.branch.labelRotation,this.template.commit.tag.spacingX=-this.template.commit.spacingX,this.template.commit.tag.spacingY=this.template.branch.spacingY;break;case"horizontal-reverse":this.template.commit.message.display=!1,this.template.commit.spacingX=-this.template.commit.spacingY,this.template.branch.spacingY=this.template.branch.spacingX,this.template.commit.spacingY=0,this.template.branch.spacingX=0,this.orientation="horizontal-reverse",this.template.branch.labelRotation=r(a,"template.branch.labelRotation")?90:a.template.branch.labelRotation,this.template.commit.tag.spacingX=-this.template.commit.spacingY,this.template.commit.tag.spacingY=this.template.branch.spacingY;break;default:this.orientation="vertical",this.template.branch.labelRotation=r(a,"template.branch.labelRotation")?0:a.template.branch.labelRotation}this.marginX=this.template.branch.spacingX+2*this.template.commit.dot.size,this.marginY=this.template.branch.spacingY+2*this.template.commit.dot.size,this.offsetX=0,this.offsetY=0,this.canvas=document.getElementById(this.elementId)||a.canvas,this.context=this.canvas.getContext("2d"),this.context.textBaseline="center",this.tooltip=document.createElement("div"),this.tooltip.className="gitgraph-tooltip",this.tooltip.style.position="fixed",this.tooltip.style.display="none",(a.tooltipContainer||document.body).appendChild(this.tooltip),this.HEAD=null,this.branches=[],this.commits=[],this.columnMax=0,this.commitOffsetX=a.initCommitOffsetX||0,this.commitOffsetY=a.initCommitOffsetY||0,this.mouseMoveOptions={handleEvent:this.hover,gitgraph:this},this.canvas.addEventListener("mousemove",this.mouseMoveOptions,!1),this.mouseDownOptions={handleEvent:this.click,gitgraph:this},this.canvas.addEventListener("mousedown",this.mouseDownOptions,!1),window.onresize=this.render.bind(this)}function b(b){if(b.parent instanceof a!=!1){if(b=q(b)?b:{},this.parent=b.parent,b.parentCommit&&b.parentBranch){if(b.parentCommit.branch!==b.parentBranch)return;this.parentCommit=b.parentCommit,this.parentBranch=b.parentBranch}else b.parentCommit?(this.parentCommit=b.parentCommit,this.parentBranch=b.parentCommit.branch):b.parentBranch?(this.parentCommit=h(b.parentBranch),this.parentBranch=b.parentBranch):(this.parentCommit=null,this.parentBranch=null);this.name="string"==typeof b.name?b.name:"no-name",this.commitDefaultOptions=q(b.commitDefaultOptions)?b.commitDefaultOptions:{},this.context=this.parent.context,this.template=this.parent.template,this.lineWidth=b.lineWidth||this.template.branch.lineWidth,this.lineDash=b.lineDash||this.template.branch.lineDash,this.showLabel=k(b.showLabel,this.template.branch.showLabel),this.spacingX=this.template.branch.spacingX,this.spacingY=this.template.branch.spacingY,this.size=0,this.height=0,this.width=0,this.commits=[],this.path=[],"number"==typeof b.column?this.column=b.column:(this.column=0,this.calculColumn()),this.parent.columnMax=this.column>this.parent.columnMax?this.column:this.parent.columnMax,this.offsetX=this.column*this.spacingX,this.offsetY=this.column*this.spacingY,this.parentBranch&&this.parentCommit?this.parentCommit===h(this.parentBranch)&&this.commits.length>0?this.startPoint={x:this.parentBranch.offsetX-this.parent.commitOffsetX+this.template.commit.spacingX,y:this.parentBranch.offsetY-this.parent.commitOffsetY+this.template.commit.spacingY,type:"start"}:this.startPoint={x:this.parentCommit.x,y:this.parentCommit.y,type:"start"}:this.startPoint=null;var c=this.column%this.template.colors.length;this.color=b.color||this.template.branch.color||this.template.colors[c],this.checkout()}}function c(b){b.parent instanceof a!=!1&&(b=q(b)?b:{},this.parent=b.parent,this.template=this.parent.template,this.context=this.parent.context,this.branch=b.branch,this.author=b.author||this.parent.author,this.date=b.date||(new Date).toUTCString(),this.detail=b.detail||null,this.sha1=b.sha1||Math.random(100).toString(16).substring(3,10),this.message=b.message||"He doesn't like George Michael! Boooo!",this.arrowDisplay=b.arrowDisplay,this.messageDisplay=k(b.messageDisplay,this.template.commit.message.display),this.messageAuthorDisplay=k(b.messageAuthorDisplay,this.template.commit.message.displayAuthor),this.messageBranchDisplay=k(b.messageBranchDisplay,this.template.commit.message.displayBranch),this.messageHashDisplay=k(b.messageHashDisplay,this.template.commit.message.displayHash),this.messageColor=b.messageColor||b.color,this.messageFont=b.messageFont||this.template.commit.message.font,this.dotColor=b.dotColor||b.color,this.dotSize=b.dotSize||this.template.commit.dot.size,this.dotStrokeWidth=b.dotStrokeWidth||this.template.commit.dot.strokeWidth,this.dotStrokeColor=b.dotStrokeColor||this.template.commit.dot.strokeColor||b.color,this.type=b.type||null,this.tooltipDisplay=k(b.tooltipDisplay,!0),this.onClick=b.onClick||null,this.representedObject=b.representedObject||null,this.parentCommit=b.parentCommit,this.x=b.x,this.y=b.y,this.showLabel=b.showLabel,this.labelColor=b.labelColor||b.color,this.labelFont=b.labelFont||this.template.branch.labelFont,g(this,b),this.parent.commits.push(this))}function d(a,b){if(!q(a))throw new Error("You can't tag a commit that doesn't exist");b=q(b)?b:{},this.color=b.color||a.color,this.font=b.font||a.template.commit.tag.font;var c=a.context.font;a.context.font=this.font;var d=a.context.measureText(a.tag).width;this.width=Math.max(a.template.commit.tag.spacingX,d);var e=0,f=0,g=a.parent.columnMax+1;return p(a.parent)?(e=a.x-a.dotSize/2,f=g*a.template.commit.tag.spacingY-a.template.commit.tag.spacingY/2):(e=g*a.template.commit.tag.spacingX-a.template.commit.tag.spacingX/2+d/2,f=a.y-a.dotSize/2),l(a.context,e,f,a.tag,this.color,this.font,0,a.displayTagBox),a.context.font=c,this}function e(a){a=q(a)?a:{},a.branch=a.branch||{},a.arrow=a.arrow||{},a.commit=a.commit||{},a.commit.dot=a.commit.dot||{},a.commit.tag=a.commit.tag||{},a.commit.message=a.commit.message||{},this.colors=a.colors||["#6963FF","#47E8D4","#6BDB52","#E84BA5","#FFA657"],this.branch={},this.branch.color=a.branch.color||null,this.branch.lineWidth=a.branch.lineWidth||2,this.branch.lineDash=a.branch.lineDash||[],this.branch.showLabel=a.branch.showLabel||!1,this.branch.labelColor=a.branch.labelColor||null,this.branch.labelFont=a.branch.labelFont||"normal 8pt Calibri",this.branch.labelRotation=void 0!==a.branch.labelRotation?a.branch.labelRotation:null,this.branch.mergeStyle=a.branch.mergeStyle||"bezier",this.branch.spacingX="number"==typeof a.branch.spacingX?a.branch.spacingX:20,this.branch.spacingY=a.branch.spacingY||0,this.arrow={},this.arrow.size=a.arrow.size||null,this.arrow.color=a.arrow.color||null,this.arrow.active="number"==typeof this.arrow.size,this.arrow.offset=a.arrow.offset||2,this.commit={},this.commit.spacingX=a.commit.spacingX||0,this.commit.spacingY="number"==typeof a.commit.spacingY?a.commit.spacingY:25,this.commit.widthExtension="number"==typeof a.commit.widthExtension?a.commit.widthExtension:0,this.commit.tooltipHTMLFormatter=a.commit.tooltipHTMLFormatter||null,this.commit.shouldDisplayTooltipsInCompactMode=k(a.commit.shouldDisplayTooltipsInCompactMode,!0),this.commit.color=a.commit.color||null,this.commit.dot={},this.commit.dot.color=a.commit.dot.color||null,this.commit.dot.size=a.commit.dot.size||3,this.commit.dot.strokeWidth=a.commit.dot.strokeWidth||null,this.commit.dot.strokeColor=a.commit.dot.strokeColor||null,this.commit.tag={},this.commit.tag.color=a.commit.tag.color||this.commit.dot.color,this.commit.tag.font=a.commit.tag.font||a.commit.message.font||"normal 10pt Calibri",this.commit.tag.spacingX=this.branch.spacingX,this.commit.tag.spacingY=this.commit.spacingY,this.commit.message={},this.commit.message.display=k(a.commit.message.display,!0),this.commit.message.displayAuthor=k(a.commit.message.displayAuthor,!0),this.commit.message.displayBranch=k(a.commit.message.displayBranch,!0),this.commit.message.displayHash=k(a.commit.message.displayHash,!0),this.commit.message.color=a.commit.message.color||null,this.commit.message.font=a.commit.message.font||"normal 12pt Calibri"}function f(a){return a.slice(-1)[0]}function g(a,b){a.tag=b.tag||null,a.tagColor=b.tagColor||a.messageColor,a.tagFont=b.tagFont||a.template.commit.tag.font,a.displayTagBox=k(b.displayTagBox,!0)}function h(a){return f(a.commits)?f(a.commits):a.parentBranch?h(a.parentBranch):null}function i(a){return JSON.parse(JSON.stringify(a))}function j(a){var b=document.getElementsByTagName("body")[0],c=document.createElement("div"),d=document.createTextNode("Mg");c.appendChild(d),c.setAttribute("style","font: "+a+"; display: inline-block;"),b.appendChild(c);var e=c.offsetHeight;return b.removeChild(c),e}function k(a,b){return"boolean"==typeof a?a:b}function l(a,b,c,d,e,f,g,h){a.save(),a.translate(b,c),a.rotate(g*(Math.PI/180)),a.textAlign="center",a.font=f;var i=a.measureText(d).width,k=j(f);h?(a.beginPath(),a.rect(-(i/2)-4,2-k/2,i+8,k+2),a.fillStyle=e,a.fill(),a.lineWidth=2,a.strokeStyle="black",a.stroke(),a.fillStyle="black"):a.fillStyle=e,a.fillText(d,0,k/2),a.restore()}function m(a,b,c){var d;document.createEvent?(d=document.createEvent("HTMLEvents"),d.initEvent(b,!0,!0)):(d=document.createEventObject(),d.eventType=b),d.eventName=b,d.data=c||{},document.createEvent?a.dispatchEvent(d):a.fireEvent("on"+d.eventType,d)}function n(a){var b,c;return c=1,window.devicePixelRatio&&(b=a.webkitBackingStorePixelRatio||a.mozBackingStorePixelRatio||a.msBackingStorePixelRatio||a.oBackingStorePixelRatio||a.backingStorePixelRatio||1,c*=window.devicePixelRatio/b),c}function o(a){return"vertical"===a.orientation||"vertical-reverse"===a.orientation}function p(a){return"horizontal"===a.orientation||"horizontal-reverse"===a.orientation}function q(a){return"object"==typeof a}function r(a,b){return!b.split(".").every(function(b){return"object"==typeof a&&null!==a&&b in a&&(a=a[b],!0)})}a.prototype.dispose=function(){this.canvas.removeEventListener("mousemove",this.mouseMoveOptions,!1),this.canvas.removeEventListener("mousedown",this.mouseDownOptions,!1)},a.prototype.branch=function(a){if("string"==typeof a){var c=a;a={},a.name=c}a=q(a)?a:{},a.parent=this,a.parentBranch=a.parentBranch||this.HEAD;var d=new b(a);return this.branches.push(d),d},a.prototype.orphanBranch=function(a){if("string"==typeof a){var c=a;a={},a.name=c}a=q(a)?a:{},a.parent=this;var d=new b(a);return this.branches.push(d),d},a.prototype.commit=function(a){return this.HEAD.commit(a),this},a.prototype.tag=function(a){return this.HEAD.tag(a),this},a.prototype.newTemplate=function(a){return"string"==typeof a?(new e).get(a):new e(a)},a.prototype.render=function(){this.scalingFactor=n(this.context);var a={x:Math.abs((this.columnMax+1)*this.template.branch.spacingX)+Math.abs(this.commitOffsetX)+2*this.marginX,y:Math.abs((this.columnMax+1)*this.template.branch.spacingY)+Math.abs(this.commitOffsetY)+2*this.marginY};this.template.commit.message.display&&(a.x+=800),a.x+=this.template.commit.widthExtension,this.canvas.style.width=a.x+"px",this.canvas.style.height=a.y+"px",this.canvas.width=a.x*this.scalingFactor,this.canvas.height=a.y*this.scalingFactor,this.context.clearRect(0,0,this.canvas.width,this.canvas.height),this.context.translate(this.marginX,this.marginY),this.template.commit.spacingY>0&&(this.context.translate(0,this.canvas.height-2*this.marginY),this.offsetY=this.canvas.height-2*this.marginY),this.template.commit.spacingX>0&&(this.context.translate(this.canvas.width-2*this.marginX,0),this.offsetX=this.canvas.width-2*this.marginX),this.context.scale(this.scalingFactor,this.scalingFactor);for(var b,c=this.branches.length-1;b=this.branches[c];c--)b.render();for(var d,e=0;d=this.commits[e];e++)d.render();m(this.canvas,"graph:render",{id:this.elementId})},a.prototype.applyCommits=function(a,b){function c(a){var b=document.getElementById(a),c=b.getBoundingClientRect();return{top:c.top+document.body.scrollTop,left:c.left+document.body.scrollLeft}}for(var d,e=a.offsetX||a.pageX-c(this.elementId).left,f=a.offsetY||a.pageY-c(this.elementId).top,g=0;d=this.commits[g];g++){var h=d.x+(this.offsetX+this.marginX)/this.scalingFactor-e,i=d.y+(this.offsetY+this.marginY)/this.scalingFactor-f;b(d,Math.sqrt(Math.pow(h,2)+Math.pow(i,2))0){this.pushPath({x:this.startPoint.x-this.parentBranch.offsetX+this.offsetX-this.template.commit.spacingX,y:this.startPoint.y-this.parentBranch.offsetY+this.offsetY-this.template.commit.spacingY,type:"join"});var n=i(this.startPoint);n.type="join",this.parentBranch.pushPath(n)}}else k&&(m.type="start");return this.pushPath(m),this.parent.commitOffsetX+=this.template.commit.spacingX*(a.showLabel?2:1),this.parent.commitOffsetY+=this.template.commit.spacingY*(a.showLabel?2:1),null!==l.detail&&o(this.parent)&&(l.detail.style.display="block","vertical-reverse"===this.parent.orientation?this.parent.commitOffsetY+=l.detail.clientHeight:this.parent.commitOffsetY-=l.detail.clientHeight),this.parent.render(),this},b.prototype.tag=function(a){"string"==typeof a&&(a={tag:a}),a=q(a)?a:{};var b=f(this.commits);return q(b)&&(g(b,a),this.parent.render()),this},b.prototype.checkout=function(){this.parent.HEAD=this},b.prototype.delete=function(){this.isDeleted=!0},b.prototype.merge=function(a,c){var d=a||this.parent.HEAD;if(d instanceof b==!1||d===this)return this;var e=this.commits[0];if(!e)return console.log(this.name+" is already up-to-date with "+d.name),this;var g="Merge branch `"+this.name+"` into `"+d.name+"`";if("object"!=typeof c){var j=c;c={},c.message="string"==typeof j?j:g}else c.message=c.message||g;c.type="mergeCommit",c.parentCommit=h(this);var k=e.parentCommit,l=h(d),m=k&&k.sha1===l.sha1;if(c.fastForward&&m){var n=p(this.parent);if(this.color=d.color,n){var o=d.path[1].y;this.path.forEach(function(a){a.y=o})}else{var q=d.path[1].x;this.path.forEach(function(a){a.x=q})}this.commits.forEach(function(a){n?a.y=k.y:a.x=k.x,a.labelColor=k.labelColor,a.messageColor=k.messageColor,a.dotColor=k.dotColor,a.dotStrokeColor=k.dotStrokeColor})}else{d.commit(c);var r=f(d.commits),s={x:this.offsetX+this.template.commit.spacingX*(r.showLabel?3:2)-this.parent.commitOffsetX,y:this.offsetY+this.template.commit.spacingY*(r.showLabel?3:2)-this.parent.commitOffsetY,type:"join"};this.pushPath(i(s));var t={x:r.x,y:r.y,type:"end"};this.pushPath(t),s.type="start",this.pushPath(s)}return this.parent.render(),this.parent.HEAD=d,this},b.prototype.calculColumn=function(){for(var a,b=[],c=0;a=this.parent.branches[c];c++)a.isDeleted||(a.column in b||(b[a.column]=0),b[a.column]++);for(this.column=0;this.column in b&&0!==b[this.column];this.column++);},b.prototype.pushPath=function(a){var b=f(this.path);b?b.x===a.x&&b.y===a.y?"start"!==b.type&&"end"===a.type?b.type="end":"join"===a.type||this.path.push(a):"join"===a.type?(a.x-b.x)*this.template.commit.spacingX<0?this.path.push(a):(a.y-b.y)*this.template.commit.spacingY<0&&this.path.push(a):this.path.push(a):this.path.push(a)},c.prototype.render=function(){var a=this.template.commit.tag.spacingX,b=(this.parent.columnMax+1)*this.template.branch.spacingX+a;if(this.showLabel)if(p(this.parent)&&this.template.branch.labelRotation%180==0){var e=this.y-this.dotSize-j(this.labelFont);l(this.context,this.x,e,this.branch.name,this.labelColor,this.labelFont,this.template.branch.labelRotation,!0)}else l(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,!0);if(this.context.beginPath(),this.context.arc(this.x,this.y,this.dotSize,0,2*Math.PI,!1),this.context.fillStyle=this.dotColor,this.context.strokeStyle=this.dotStrokeColor,this.context.lineWidth=this.dotStrokeWidth,"number"==typeof this.dotStrokeWidth&&this.context.stroke(),this.context.fill(),this.context.closePath(),this.arrowDisplay&&this.parentCommit instanceof c&&this.arrow(),null!==this.tag){b+=new d(this,{color:this.tagColor,font:this.tagFont}).width-a}var f=30;if(null!==this.detail&&o(this.parent)){this.detail.style.left=this.parent.canvas.offsetLeft+b+60+"px";var g=this.parent.canvas.offsetTop+this.y;if("vertical-reverse"===this.parent.orientation){var h=this.parent.canvas.clientHeight-this.detail.clientHeight;this.detail.style.top=g+h-f+"px"}else this.detail.style.top=g+f+"px"}if(this.messageDisplay){var i=this.message;this.messageHashDisplay&&(i=this.sha1+" "+i),this.messageAuthorDisplay&&(i+=this.author?" - "+this.author:""),this.messageBranchDisplay&&(i=(this.branch.name?"["+this.branch.name+"] ":"")+i),this.context.font=this.messageFont,this.context.fillStyle=this.messageColor,this.context.fillText(i,b,this.y+this.dotSize/2)}},c.prototype.arrow=function(){function a(a,b){var c=d?-1:1;return Math.atan2(c*a,c*b)}var b=this.template.arrow.size,c=this.template.arrow.color||this.branch.color,d=this.parent.reverseArrow,e=a(this.parentCommit.y-this.y,this.parentCommit.x-this.x),f=this===this.branch.commits[0];if("mergeCommit"===this.type||f){var g=this.parentCommit.branch.column-this.branch.column,h=this.showLabel?2:1,i=this.template.branch.spacingX*g+this.template.commit.spacingX*h,j=(f||d)&&Math.abs(this.y-this.parentCommit.y)>Math.abs(this.template.commit.spacingY),k=this.x===this.parentCommit.x;o(this.parent)&&(j||k)&&(i=0);var l=this.template.branch.spacingY*g+this.template.commit.spacingY*h,m=(f||d)&&Math.abs(this.x-this.parentCommit.x)>Math.abs(this.template.commit.spacingX),n=this.y===this.parentCommit.y;p(this.parent)&&(m||n)&&(l=0),e=a(l,i),c=this.parentCommit.branch.color}var q=Math.PI/7,r=d?this.parentCommit.x:this.x,s=d?this.parentCommit.y:this.y,t=this.template.commit.dot.size+this.template.arrow.offset,u=t*Math.cos(e)+r,v=t*Math.sin(e)+s,w=(t+b)*Math.cos(e-q)+r,x=(t+b)*Math.sin(e-q)+s,y=(t+b/2)*Math.cos(e)+r,z=(t+b/2)*Math.sin(e)+s,A=(t+b)*Math.cos(e+q)+r,B=(t+b)*Math.sin(e+q)+s;this.context.beginPath(),this.context.fillStyle=c,this.context.moveTo(u,v),this.context.lineTo(w,x),this.context.quadraticCurveTo(y,z,A,B),this.context.lineTo(A,B),this.context.fill()},e.prototype.get=function(a){var b={};switch(a){case"blackarrow":b={branch:{color:"#000000",lineWidth:4,spacingX:50,mergeStyle:"straight",labelRotation:0},commit:{spacingY:-60,dot:{size:12,strokeColor:"#000000",strokeWidth:7},message:{color:"black"}},arrow:{size:16,offset:2.5}};break;case"metro":default:b={colors:["#979797","#008fb5","#f1c109"],branch:{lineWidth:10,spacingX:50,labelRotation:0},commit:{spacingY:-80,dot:{size:14},message:{font:"normal 14pt Arial"}}}}return new e(b)},Array.prototype.every||(Array.prototype.every=function(a,b){var c,d;if(null===this)throw new TypeError("this is null or not defined");var e=Object(this),f=e.length>>>0;if("function"!=typeof a)throw new TypeError;for(arguments.length>1&&(c=b),d=0;d",this.reverseArrow=k(a.reverseArrow,!1),"string"==typeof a.template||q(a.template)?this.template=this.newTemplate(a.template):a.template instanceof e?this.template=a.template:this.template=this.newTemplate("metro"),this.mode=a.mode||null,"compact"===this.mode&&(this.template.commit.message.display=!1),a.orientation){case"vertical-reverse":this.template.commit.spacingY*=-1,this.orientation="vertical-reverse",this.template.branch.labelRotation=r(a,"template.branch.labelRotation")?0:a.template.branch.labelRotation,this.template.commit.tag.spacingY*=-1;break;case"horizontal":this.template.commit.message.display=!1,this.template.commit.spacingX=this.template.commit.spacingY,this.template.branch.spacingY=this.template.branch.spacingX,this.template.commit.spacingY=0,this.template.branch.spacingX=0,this.orientation="horizontal",this.template.branch.labelRotation=r(a,"template.branch.labelRotation")?-90:a.template.branch.labelRotation,this.template.commit.tag.spacingX=-this.template.commit.spacingX,this.template.commit.tag.spacingY=this.template.branch.spacingY;break;case"horizontal-reverse":this.template.commit.message.display=!1,this.template.commit.spacingX=-this.template.commit.spacingY,this.template.branch.spacingY=this.template.branch.spacingX,this.template.commit.spacingY=0,this.template.branch.spacingX=0,this.orientation="horizontal-reverse",this.template.branch.labelRotation=r(a,"template.branch.labelRotation")?90:a.template.branch.labelRotation,this.template.commit.tag.spacingX=-this.template.commit.spacingY,this.template.commit.tag.spacingY=this.template.branch.spacingY;break;default:this.orientation="vertical",this.template.branch.labelRotation=r(a,"template.branch.labelRotation")?0:a.template.branch.labelRotation}this.marginX=this.template.branch.spacingX+2*this.template.commit.dot.size,this.marginY=this.template.branch.spacingY+2*this.template.commit.dot.size,this.offsetX=0,this.offsetY=0,this.canvas=document.getElementById(this.elementId)||a.canvas,this.context=this.canvas.getContext("2d"),this.context.textBaseline="center",this.tooltip=document.createElement("div"),this.tooltip.className="gitgraph-tooltip",this.tooltip.style.position="fixed",this.tooltip.style.display="none",(a.tooltipContainer||document.body).appendChild(this.tooltip),this.HEAD=null,this.branches=[],this.commits=[],this.columnMax=0,this.commitOffsetX=a.initCommitOffsetX||0,this.commitOffsetY=a.initCommitOffsetY||0,this.mouseMoveOptions={handleEvent:this.hover,gitgraph:this},this.canvas.addEventListener("mousemove",this.mouseMoveOptions,!1),this.mouseDownOptions={handleEvent:this.click,gitgraph:this},this.canvas.addEventListener("mousedown",this.mouseDownOptions,!1),window.onresize=this.render.bind(this)}function b(b){if(b.parent instanceof a!=!1){if(b=q(b)?b:{},this.parent=b.parent,b.parentCommit&&b.parentBranch){if(b.parentCommit.branch!==b.parentBranch)return;this.parentCommit=b.parentCommit,this.parentBranch=b.parentBranch}else b.parentCommit?(this.parentCommit=b.parentCommit,this.parentBranch=b.parentCommit.branch):b.parentBranch?(this.parentCommit=h(b.parentBranch),this.parentBranch=b.parentBranch):(this.parentCommit=null,this.parentBranch=null);this.name="string"==typeof b.name?b.name:"no-name",this.commitDefaultOptions=q(b.commitDefaultOptions)?b.commitDefaultOptions:{},this.context=this.parent.context,this.template=this.parent.template,this.lineWidth=b.lineWidth||this.template.branch.lineWidth,this.lineDash=b.lineDash||this.template.branch.lineDash,this.showLabel=k(b.showLabel,this.template.branch.showLabel),this.spacingX=this.template.branch.spacingX,this.spacingY=this.template.branch.spacingY,this.size=0,this.height=0,this.width=0,this.commits=[],this.path=[],"number"==typeof b.column?this.column=b.column:(this.column=0,this.calculColumn()),this.parent.columnMax=this.column>this.parent.columnMax?this.column:this.parent.columnMax,this.offsetX=this.column*this.spacingX,this.offsetY=this.column*this.spacingY,this.parentBranch&&this.parentCommit?this.parentCommit===h(this.parentBranch)&&this.commits.length>0?this.startPoint={x:this.parentBranch.offsetX-this.parent.commitOffsetX+this.template.commit.spacingX,y:this.parentBranch.offsetY-this.parent.commitOffsetY+this.template.commit.spacingY,type:"start"}:this.startPoint={x:this.parentCommit.x,y:this.parentCommit.y,type:"start"}:this.startPoint=null;var c=this.column%this.template.colors.length;this.color=b.color||this.template.branch.color||this.template.colors[c],this.checkout()}}function c(b){b.parent instanceof a!=!1&&(b=q(b)?b:{},this.parent=b.parent,this.template=this.parent.template,this.context=this.parent.context,this.branch=b.branch,this.author=b.author||this.parent.author,this.date=b.date||(new Date).toUTCString(),this.detail=b.detail||null,this.sha1=b.sha1||Math.random(100).toString(16).substring(3,10),this.message=b.message||"He doesn't like George Michael! Boooo!",this.arrowDisplay=b.arrowDisplay,this.messageDisplay=k(b.messageDisplay,this.template.commit.message.display),this.messageAuthorDisplay=k(b.messageAuthorDisplay,this.template.commit.message.displayAuthor),this.messageBranchDisplay=k(b.messageBranchDisplay,this.template.commit.message.displayBranch),this.messageHashDisplay=k(b.messageHashDisplay,this.template.commit.message.displayHash),this.messageColor=b.messageColor||b.color,this.messageFont=b.messageFont||this.template.commit.message.font,this.dotColor=b.dotColor||b.color,this.dotSize=b.dotSize||this.template.commit.dot.size,this.dotStrokeWidth=b.dotStrokeWidth||this.template.commit.dot.strokeWidth,this.dotStrokeColor=b.dotStrokeColor||this.template.commit.dot.strokeColor||b.color,this.lineDash=b.lineDash||this.template.commit.dot.lineDash,this.type=b.type||null,this.tooltipDisplay=k(b.tooltipDisplay,!0),this.onClick=b.onClick||null,this.representedObject=b.representedObject||null,this.parentCommit=b.parentCommit,this.x=b.x,this.y=b.y,this.showLabel=b.showLabel,this.labelColor=b.labelColor||b.color,this.labelFont=b.labelFont||this.template.branch.labelFont,g(this,b),this.parent.commits.push(this))}function d(a,b){if(!q(a))throw new Error("You can't tag a commit that doesn't exist");b=q(b)?b:{},this.color=b.color||a.color,this.font=b.font||a.template.commit.tag.font;var c=a.context.font;a.context.font=this.font;var d=a.context.measureText(a.tag).width;this.width=Math.max(a.template.commit.tag.spacingX,d);var e=0,f=0,g=a.parent.columnMax+1;return p(a.parent)?(e=a.x-a.dotSize/2,f=g*a.template.commit.tag.spacingY-a.template.commit.tag.spacingY/2):(e=g*a.template.commit.tag.spacingX-a.template.commit.tag.spacingX/2+d/2,f=a.y-a.dotSize/2),l(a.context,e,f,a.tag,this.color,this.font,0,a.displayTagBox),a.context.font=c,this}function e(a){a=q(a)?a:{},a.branch=a.branch||{},a.arrow=a.arrow||{},a.commit=a.commit||{},a.commit.dot=a.commit.dot||{},a.commit.tag=a.commit.tag||{},a.commit.message=a.commit.message||{},this.colors=a.colors||["#6963FF","#47E8D4","#6BDB52","#E84BA5","#FFA657"],this.branch={},this.branch.color=a.branch.color||null,this.branch.lineWidth=a.branch.lineWidth||2,this.branch.lineDash=a.branch.lineDash||[],this.branch.showLabel=a.branch.showLabel||!1,this.branch.labelColor=a.branch.labelColor||null,this.branch.labelFont=a.branch.labelFont||"normal 8pt Calibri",this.branch.labelRotation=void 0!==a.branch.labelRotation?a.branch.labelRotation:null,this.branch.mergeStyle=a.branch.mergeStyle||"bezier",this.branch.spacingX="number"==typeof a.branch.spacingX?a.branch.spacingX:20,this.branch.spacingY=a.branch.spacingY||0,this.arrow={},this.arrow.size=a.arrow.size||null,this.arrow.color=a.arrow.color||null,this.arrow.active="number"==typeof this.arrow.size,this.arrow.offset=a.arrow.offset||2,this.commit={},this.commit.spacingX=a.commit.spacingX||0,this.commit.spacingY="number"==typeof a.commit.spacingY?a.commit.spacingY:25,this.commit.widthExtension="number"==typeof a.commit.widthExtension?a.commit.widthExtension:0,this.commit.tooltipHTMLFormatter=a.commit.tooltipHTMLFormatter||null,this.commit.shouldDisplayTooltipsInCompactMode=k(a.commit.shouldDisplayTooltipsInCompactMode,!0),this.commit.color=a.commit.color||null,this.commit.dot={},this.commit.dot.color=a.commit.dot.color||null,this.commit.dot.size=a.commit.dot.size||3,this.commit.dot.strokeWidth=a.commit.dot.strokeWidth||null,this.commit.dot.strokeColor=a.commit.dot.strokeColor||null,this.commit.dot.lineDash=a.commit.dot.lineDash||this.branch.lineDash,this.commit.tag={},this.commit.tag.color=a.commit.tag.color||this.commit.dot.color,this.commit.tag.font=a.commit.tag.font||a.commit.message.font||"normal 10pt Calibri",this.commit.tag.spacingX=this.branch.spacingX,this.commit.tag.spacingY=this.commit.spacingY,this.commit.message={},this.commit.message.display=k(a.commit.message.display,!0),this.commit.message.displayAuthor=k(a.commit.message.displayAuthor,!0),this.commit.message.displayBranch=k(a.commit.message.displayBranch,!0),this.commit.message.displayHash=k(a.commit.message.displayHash,!0),this.commit.message.color=a.commit.message.color||null,this.commit.message.font=a.commit.message.font||"normal 12pt Calibri"}function f(a){return a.slice(-1)[0]}function g(a,b){a.tag=b.tag||null,a.tagColor=b.tagColor||a.messageColor,a.tagFont=b.tagFont||a.template.commit.tag.font,a.displayTagBox=k(b.displayTagBox,!0)}function h(a){return f(a.commits)?f(a.commits):a.parentBranch?h(a.parentBranch):null}function i(a){return JSON.parse(JSON.stringify(a))}function j(a){var b=document.getElementsByTagName("body")[0],c=document.createElement("div"),d=document.createTextNode("Mg");c.appendChild(d),c.setAttribute("style","font: "+a+"; display: inline-block;"),b.appendChild(c);var e=c.offsetHeight;return b.removeChild(c),e}function k(a,b){return"boolean"==typeof a?a:b}function l(a,b,c,d,e,f,g,h){a.save(),a.translate(b,c),a.rotate(g*(Math.PI/180)),a.textAlign="center",a.font=f;var i=a.measureText(d).width,k=j(f);h?(a.beginPath(),a.rect(-(i/2)-4,2-k/2,i+8,k+2),a.fillStyle=e,a.fill(),a.lineWidth=2,a.strokeStyle="black",a.stroke(),a.fillStyle="black"):a.fillStyle=e,a.fillText(d,0,k/2),a.restore()}function m(a,b,c){var d;document.createEvent?(d=document.createEvent("HTMLEvents"),d.initEvent(b,!0,!0)):(d=document.createEventObject(),d.eventType=b),d.eventName=b,d.data=c||{},document.createEvent?a.dispatchEvent(d):a.fireEvent("on"+d.eventType,d)}function n(a){var b,c;return c=1,window.devicePixelRatio&&(b=a.webkitBackingStorePixelRatio||a.mozBackingStorePixelRatio||a.msBackingStorePixelRatio||a.oBackingStorePixelRatio||a.backingStorePixelRatio||1,c*=window.devicePixelRatio/b),c}function o(a){return"vertical"===a.orientation||"vertical-reverse"===a.orientation}function p(a){return"horizontal"===a.orientation||"horizontal-reverse"===a.orientation}function q(a){return"object"==typeof a}function r(a,b){return!b.split(".").every(function(b){return"object"==typeof a&&null!==a&&b in a&&(a=a[b],!0)})}a.prototype.dispose=function(){this.canvas.removeEventListener("mousemove",this.mouseMoveOptions,!1),this.canvas.removeEventListener("mousedown",this.mouseDownOptions,!1)},a.prototype.branch=function(a){if("string"==typeof a){var c=a;a={},a.name=c}a=q(a)?a:{},a.parent=this,a.parentBranch=a.parentBranch||this.HEAD;var d=new b(a);return this.branches.push(d),d},a.prototype.orphanBranch=function(a){if("string"==typeof a){var c=a;a={},a.name=c}a=q(a)?a:{},a.parent=this;var d=new b(a);return this.branches.push(d),d},a.prototype.commit=function(a){return this.HEAD.commit(a),this},a.prototype.tag=function(a){return this.HEAD.tag(a),this},a.prototype.newTemplate=function(a){return"string"==typeof a?(new e).get(a):new e(a)},a.prototype.render=function(){this.scalingFactor=n(this.context);var a={x:Math.abs((this.columnMax+1)*this.template.branch.spacingX)+Math.abs(this.commitOffsetX)+2*this.marginX,y:Math.abs((this.columnMax+1)*this.template.branch.spacingY)+Math.abs(this.commitOffsetY)+2*this.marginY};this.template.commit.message.display&&(a.x+=800),a.x+=this.template.commit.widthExtension,this.canvas.style.width=a.x+"px",this.canvas.style.height=a.y+"px",this.canvas.width=a.x*this.scalingFactor,this.canvas.height=a.y*this.scalingFactor,this.context.clearRect(0,0,this.canvas.width,this.canvas.height),this.context.translate(this.marginX,this.marginY),this.template.commit.spacingY>0&&(this.context.translate(0,this.canvas.height-2*this.marginY),this.offsetY=this.canvas.height-2*this.marginY),this.template.commit.spacingX>0&&(this.context.translate(this.canvas.width-2*this.marginX,0),this.offsetX=this.canvas.width-2*this.marginX),this.context.scale(this.scalingFactor,this.scalingFactor);for(var b,c=this.branches.length-1;b=this.branches[c];c--)b.render();for(var d,e=0;d=this.commits[e];e++)d.render();m(this.canvas,"graph:render",{id:this.elementId})},a.prototype.applyCommits=function(a,b){function c(a){var b=document.getElementById(a),c=b.getBoundingClientRect();return{top:c.top+document.body.scrollTop,left:c.left+document.body.scrollLeft}}for(var d,e=a.offsetX||a.pageX-c(this.elementId).left,f=a.offsetY||a.pageY-c(this.elementId).top,g=0;d=this.commits[g];g++){var h=d.x+(this.offsetX+this.marginX)/this.scalingFactor-e,i=d.y+(this.offsetY+this.marginY)/this.scalingFactor-f;b(d,Math.sqrt(Math.pow(h,2)+Math.pow(i,2))0){this.pushPath({x:this.startPoint.x-this.parentBranch.offsetX+this.offsetX-this.template.commit.spacingX,y:this.startPoint.y-this.parentBranch.offsetY+this.offsetY-this.template.commit.spacingY,type:"join"});var n=i(this.startPoint);n.type="join",this.parentBranch.pushPath(n)}}else k&&(m.type="start");return this.pushPath(m),this.parent.commitOffsetX+=this.template.commit.spacingX*(a.showLabel?2:1),this.parent.commitOffsetY+=this.template.commit.spacingY*(a.showLabel?2:1),null!==l.detail&&o(this.parent)&&(l.detail.style.display="block","vertical-reverse"===this.parent.orientation?this.parent.commitOffsetY+=l.detail.clientHeight:this.parent.commitOffsetY-=l.detail.clientHeight),this.parent.render(),this},b.prototype.tag=function(a){"string"==typeof a&&(a={tag:a}),a=q(a)?a:{};var b=f(this.commits);return q(b)&&(g(b,a),this.parent.render()),this},b.prototype.checkout=function(){this.parent.HEAD=this},b.prototype.delete=function(){this.isDeleted=!0},b.prototype.merge=function(a,c){var d=a||this.parent.HEAD;if(d instanceof b==!1||d===this)return this;var e=this.commits[0];if(!e)return console.log(this.name+" is already up-to-date with "+d.name),this;var g="Merge branch `"+this.name+"` into `"+d.name+"`";if("object"!=typeof c){var j=c;c={},c.message="string"==typeof j?j:g}else c.message=c.message||g;c.type="mergeCommit",c.parentCommit=h(this);var k=e.parentCommit,l=h(d),m=k&&k.sha1===l.sha1;if(c.fastForward&&m){var n=p(this.parent);if(this.color=d.color,n){var o=d.path[1].y;this.path.forEach(function(a){a.y=o})}else{var q=d.path[1].x;this.path.forEach(function(a){a.x=q})}this.commits.forEach(function(a){n?a.y=k.y:a.x=k.x,a.labelColor=k.labelColor,a.messageColor=k.messageColor,a.dotColor=k.dotColor,a.dotStrokeColor=k.dotStrokeColor})}else{d.commit(c);var r=f(d.commits),s={x:this.offsetX+this.template.commit.spacingX*(r.showLabel?3:2)-this.parent.commitOffsetX,y:this.offsetY+this.template.commit.spacingY*(r.showLabel?3:2)-this.parent.commitOffsetY,type:"join"};this.pushPath(i(s));var t={x:r.x,y:r.y,type:"end"};this.pushPath(t),s.type="start",this.pushPath(s)}return this.parent.render(),this.parent.HEAD=d,this},b.prototype.calculColumn=function(){for(var a,b=[],c=0;a=this.parent.branches[c];c++)a.isDeleted||(a.column in b||(b[a.column]=0),b[a.column]++);for(this.column=0;this.column in b&&0!==b[this.column];this.column++);},b.prototype.pushPath=function(a){var b=f(this.path);b?b.x===a.x&&b.y===a.y?"start"!==b.type&&"end"===a.type?b.type="end":"join"===a.type||this.path.push(a):"join"===a.type?(a.x-b.x)*this.template.commit.spacingX<0?this.path.push(a):(a.y-b.y)*this.template.commit.spacingY<0&&this.path.push(a):this.path.push(a):this.path.push(a)},c.prototype.render=function(){var a=this.template.commit.tag.spacingX,b=(this.parent.columnMax+1)*this.template.branch.spacingX+a;if(this.showLabel)if(p(this.parent)&&this.template.branch.labelRotation%180==0){var e=this.y-this.dotSize-j(this.labelFont);l(this.context,this.x,e,this.branch.name,this.labelColor,this.labelFont,this.template.branch.labelRotation,!0)}else l(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,!0);if(this.context.beginPath(),this.context.arc(this.x,this.y,this.dotSize,0,2*Math.PI,!1),this.context.fillStyle=this.dotColor,this.context.strokeStyle=this.dotStrokeColor,this.context.lineWidth=this.dotStrokeWidth,"function"==typeof this.context.setLineDash&&this.context.setLineDash(this.lineDash),"number"==typeof this.dotStrokeWidth&&this.context.stroke(),this.context.fill(),this.context.closePath(),this.arrowDisplay&&this.parentCommit instanceof c&&this.arrow(),null!==this.tag){b+=new d(this,{color:this.tagColor,font:this.tagFont}).width-a}var f=30;if(null!==this.detail&&o(this.parent)){this.detail.style.left=this.parent.canvas.offsetLeft+b+60+"px";var g=this.parent.canvas.offsetTop+this.y;if("vertical-reverse"===this.parent.orientation){var h=this.parent.canvas.clientHeight-this.detail.clientHeight;this.detail.style.top=g+h-f+"px"}else this.detail.style.top=g+f+"px"}if(this.messageDisplay){var i=this.message;this.messageHashDisplay&&(i=this.sha1+" "+i),this.messageAuthorDisplay&&(i+=this.author?" - "+this.author:""),this.messageBranchDisplay&&(i=(this.branch.name?"["+this.branch.name+"] ":"")+i),this.context.font=this.messageFont,this.context.fillStyle=this.messageColor,this.context.fillText(i,b,this.y+this.dotSize/2)}},c.prototype.arrow=function(){function a(a,b){var c=d?-1:1;return Math.atan2(c*a,c*b)}var b=this.template.arrow.size,c=this.template.arrow.color||this.branch.color,d=this.parent.reverseArrow,e=a(this.parentCommit.y-this.y,this.parentCommit.x-this.x),f=this===this.branch.commits[0];if("mergeCommit"===this.type||f){var g=this.parentCommit.branch.column-this.branch.column,h=this.showLabel?2:1,i=this.template.branch.spacingX*g+this.template.commit.spacingX*h,j=(f||d)&&Math.abs(this.y-this.parentCommit.y)>Math.abs(this.template.commit.spacingY),k=this.x===this.parentCommit.x;o(this.parent)&&(j||k)&&(i=0);var l=this.template.branch.spacingY*g+this.template.commit.spacingY*h,m=(f||d)&&Math.abs(this.x-this.parentCommit.x)>Math.abs(this.template.commit.spacingX),n=this.y===this.parentCommit.y;p(this.parent)&&(m||n)&&(l=0),e=a(l,i),c=this.parentCommit.branch.color}var q=Math.PI/7,r=d?this.parentCommit.x:this.x,s=d?this.parentCommit.y:this.y,t=this.template.commit.dot.size+this.template.arrow.offset,u=t*Math.cos(e)+r,v=t*Math.sin(e)+s,w=(t+b)*Math.cos(e-q)+r,x=(t+b)*Math.sin(e-q)+s,y=(t+b/2)*Math.cos(e)+r,z=(t+b/2)*Math.sin(e)+s,A=(t+b)*Math.cos(e+q)+r,B=(t+b)*Math.sin(e+q)+s;this.context.beginPath(),this.context.fillStyle=c,this.context.moveTo(u,v),this.context.lineTo(w,x),this.context.quadraticCurveTo(y,z,A,B),this.context.lineTo(A,B),this.context.fill()},e.prototype.get=function(a){var b={};switch(a){case"blackarrow":b={branch:{color:"#000000",lineWidth:4,spacingX:50,mergeStyle:"straight",labelRotation:0},commit:{spacingY:-60,dot:{size:12,strokeColor:"#000000",strokeWidth:7},message:{color:"black"}},arrow:{size:16,offset:2.5}};break;case"metro":default:b={colors:["#979797","#008fb5","#f1c109"],branch:{lineWidth:10,spacingX:50,labelRotation:0},commit:{spacingY:-80,dot:{size:14},message:{font:"normal 14pt Arial"}}}}return new e(b)},Array.prototype.every||(Array.prototype.every=function(a,b){var c,d;if(null===this)throw new TypeError("this is null or not defined");var e=Object(this),f=e.length>>>0;if("function"!=typeof a)throw new TypeError;for(arguments.length>1&&(c=b),d=0;dProperties + + + lineDash + + + + + +Array.<number> + + + + + + + + + <optional>
+ + + + + + + + + + + + this.template.branch.lineDash + + + + +

Branch line dash segments

+ + + + commitDefaultOptions @@ -364,7 +403,7 @@
Properties
Source:
@@ -519,7 +558,7 @@
Parameters:
Source:
@@ -633,7 +672,7 @@
This:
Source:
@@ -718,7 +757,7 @@
This:
Source:
@@ -928,7 +967,7 @@
Properties
Source:
@@ -1020,7 +1059,7 @@
This:
Source:
@@ -1283,7 +1322,7 @@
Properties
Source:
@@ -1398,7 +1437,7 @@
This:
Source:
@@ -1483,7 +1522,7 @@
This:
Source:
@@ -1792,7 +1831,7 @@
Properties
Source:
@@ -1847,7 +1886,7 @@

Home

Classes

  • diff --git a/docs/Commit.html b/docs/Commit.html index e45486ae..20cc92b2 100644 --- a/docs/Commit.html +++ b/docs/Commit.html @@ -841,6 +841,45 @@
    Properties
    + + + lineDash + + + + + +Array.<number> + + + + + + + + + <optional>
    + + + + + + + + + + + + this.template.commit.dot.lineDash + + + + + + + + + message @@ -1348,7 +1387,7 @@
    Properties
    Source:
    @@ -1451,7 +1490,7 @@
    This:
    Source:
    @@ -1536,7 +1575,7 @@
    This:
    Source:
    @@ -1584,7 +1623,7 @@

    Home

    Classes

    • diff --git a/docs/GitGraph.html b/docs/GitGraph.html index 422b0a2e..4a396bfe 100644 --- a/docs/GitGraph.html +++ b/docs/GitGraph.html @@ -2061,7 +2061,7 @@

      Home

      Classes

      • diff --git a/docs/Tag.html b/docs/Tag.html index 7f8c1be0..05aa5b68 100644 --- a/docs/Tag.html +++ b/docs/Tag.html @@ -294,7 +294,7 @@
        Properties
        Source:
        @@ -374,7 +374,7 @@

        Home

        Classes

        • diff --git a/docs/Template.html b/docs/Template.html index f7b99ac4..12d5956e 100644 --- a/docs/Template.html +++ b/docs/Template.html @@ -352,6 +352,43 @@
          Properties
          + + + branch.lineDash + + + + + +Array.<number> + + + + + + + + + <optional>
          + + + + + + + + + + + + + + +

          Branch line dash segments

          + + + + branch.mergeStyle @@ -763,6 +800,43 @@
          Properties
          + + + commit.dot.lineDash + + + + + +Array.<number> + + + + + + + + + <optional>
          + + + + + + + + + + + + + + +

          Commit dot line dash segments

          + + + + commit.message.color @@ -1106,7 +1180,7 @@
          Properties
          Source:
          @@ -1255,7 +1329,7 @@
          Parameters:
          Source:
          @@ -1325,7 +1399,7 @@

          Home

          Classes

          • diff --git a/docs/gitgraph.js.html b/docs/gitgraph.js.html index 7ce0e6e2..68314b4f 100644 --- a/docs/gitgraph.js.html +++ b/docs/gitgraph.js.html @@ -490,6 +490,7 @@

            Source: gitgraph.js

            * @param {Branch} [options.parentBranch = options.parentCommit.branch] - Parent branch * @param {Commit} [options.parentCommit = _getLast(options.parentBranch.commits)] - Parent commit * @param {string} [options.name = "no-name"] - Branch name + * @param {number[]} [options.lineDash = this.template.branch.lineDash] - Branch line dash segments * @param {object} [options.commitDefaultOptions = {}] - Default options for commits * * @this Branch @@ -633,19 +634,12 @@

            Source: gitgraph.js

            this.context.lineWidth = this.lineWidth; this.context.strokeStyle = this.color; - var prevLineDash; - if (this.context.setLineDash !== undefined) { - prevLineDash = this.context.getLineDash(); + if (typeof this.context.setLineDash === "function") { this.context.setLineDash(this.lineDash); } this.context.stroke(); this.context.closePath(); - - //Restore previous line dash setting, if any - if (prevLineDash !== undefined) { - this.context.setLineDash(prevLineDash); - } }; /** @@ -1077,6 +1071,7 @@

            Source: gitgraph.js

            * @param {number} [options.dotSize = this.template.commit.dot.size] - Dot size * @param {number} [options.dotStrokeWidth = this.template.commit.dot.strokeWidth] - Dot stroke width * @param {string} [options.dotStrokeColor = this.template.commit.dot.strokeColor] + * @param {number[]} [options.lineDash = this.template.commit.dot.lineDash] * * @param {string} [options.message = "He doesn't like George Michael! Boooo!"] - Commit message * @param {string} [options.messageColor = options.color] - Specific message color @@ -1123,6 +1118,7 @@

            Source: gitgraph.js

            this.dotSize = options.dotSize || this.template.commit.dot.size; this.dotStrokeWidth = options.dotStrokeWidth || this.template.commit.dot.strokeWidth; this.dotStrokeColor = options.dotStrokeColor || this.template.commit.dot.strokeColor || options.color; + this.lineDash = options.lineDash || this.template.commit.dot.lineDash; this.type = options.type || null; this.tooltipDisplay = _booleanOptionOr(options.tooltipDisplay, true); this.onClick = options.onClick || null; @@ -1149,7 +1145,6 @@

            Source: gitgraph.js

            // Label if (this.showLabel) { - /* * For cases where we want a 0 or 180 degree label rotation in horizontal mode, * we need to modify the position of the label to sit centrally above the commit dot. @@ -1189,7 +1184,11 @@

            Source: gitgraph.js

            this.context.strokeStyle = this.dotStrokeColor; this.context.lineWidth = this.dotStrokeWidth; - if (typeof (this.dotStrokeWidth) === "number") { + if (typeof this.context.setLineDash === "function") { + this.context.setLineDash(this.lineDash); + } + + if (typeof this.dotStrokeWidth === "number") { this.context.stroke(); } @@ -1390,6 +1389,7 @@

            Source: gitgraph.js

            * @param {number} [options.arrow.offset] - Arrow offset * @param {string} [options.branch.color] - Branch color * @param {number} [options.branch.lineWidth] - Branch line width + * @param {number[]} [options.branch.lineDash] - Branch line dash segments * @param {string} [options.branch.mergeStyle = ("bezier"|"straight")] - Branch merge style * @param {number} [options.branch.spacingX] - Space between branches * @param {number} [options.branch.spacingY] - Space between branches @@ -1401,6 +1401,7 @@

            Source: gitgraph.js

            * @param {number} [options.commit.dot.size] - Commit dot size * @param {number} [options.commit.dot.strokeWidth] - Commit dot stroke width * @param {string} [options.commit.dot.strokeColor] - Commit dot stroke color + * @param {number[]} [options.commit.dot.lineDash] - Commit dot line dash segments * @param {string} [options.commit.message.color] - Commit message color * @param {boolean} [options.commit.message.display] - Commit display policy * @param {boolean} [options.commit.message.displayAuthor] - Commit message author policy @@ -1474,6 +1475,7 @@

            Source: gitgraph.js

            this.commit.dot.size = options.commit.dot.size || 3; this.commit.dot.strokeWidth = options.commit.dot.strokeWidth || null; this.commit.dot.strokeColor = options.commit.dot.strokeColor || null; + this.commit.dot.lineDash = options.commit.dot.lineDash || this.branch.lineDash; this.commit.tag = {}; this.commit.tag.color = options.commit.tag.color || this.commit.dot.color; @@ -1872,7 +1874,7 @@

            Home

            Classes

            • diff --git a/docs/global.html b/docs/global.html index ed812544..db26b62b 100644 --- a/docs/global.html +++ b/docs/global.html @@ -1170,7 +1170,7 @@
              Properties:
              Source:
              @@ -1514,7 +1514,7 @@

              Home

              Classes

              • diff --git a/docs/index.html b/docs/index.html index a16ce0de..f1c86501 100644 --- a/docs/index.html +++ b/docs/index.html @@ -115,7 +115,7 @@

                Home

                Classes

                • diff --git a/package.json b/package.json index 78b739c7..47b388fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gitgraph.js", - "version": "1.10.1", + "version": "1.11.0", "author": "Nicolas Carlo ", "description": "A JavaScript library to draw pretty git graphs in the browser", "contributors": [