marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-21 16:29:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Show commit msg if available in BT orientation

Browse Source
This commit is contained in:
Raghu Rajagopalan
2016-04-27 09:47:39 +05:30
parent 4e26b8e645
commit 1d8d42ad08
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/diagrams/gitGraph/gitGraphRenderer.js
View File

@@ -49,7 +49,7 @@ function svgCreateDefs(svg) {
.attr('class', 'node-label') .attr('class', 'node-label')
.attr('requiredFeatures', 'http://www.w3.org/TR/SVG11/feature#Extensibility') .attr('requiredFeatures', 'http://www.w3.org/TR/SVG11/feature#Extensibility')
.append('xhtml:p') .append('xhtml:p')
.html('a big chunk of text that should wrap'); .html('');
} }
@@ -191,17 +191,23 @@ function renderCommitHistory(svg, commitid, branches, direction) {
.attr('stroke', config.nodeStrokeColor) .attr('stroke', config.nodeStrokeColor)
.attr('stroke-width', config.nodeStrokeWidth); .attr('stroke-width', config.nodeStrokeWidth);
svg.select('#node-' + commit.id + ' p')
.text(commit.id);
var branch = _.find(branches, ['commit', commit]); var branch = _.find(branches, ['commit', commit]);
if (branch) { if (branch) {
log.debug('found branch ', branch.name); log.debug('found branch ', branch.name);
// don't try to select foreignObject - doesn't work.
// instead select by class name and it works.
svg.select('#node-' + commit.id + ' p') svg.select('#node-' + commit.id + ' p')
.append('xhtml:span')
.attr('class', 'branch-label')
.text(branch.name + ', ');
}
svg.select('#node-' + commit.id + ' p')
.append('xhtml:span') .append('xhtml:span')
.attr('class', 'branch-label') .attr('class', 'commit-id')
.text( ' ' + branch.name); .text(commit.id);
if (commit.message !== '' && direction === 'BT') {
svg.select('#node-' + commit.id + ' p')
.append('xhtml:span')
.attr('class', 'commit-msg')
.text( ', ' + commit.message);
} }
commitid = commit.parent commitid = commit.parent
} while (commitid && allCommitsDict[commitid]); } while (commitid && allCommitsDict[commitid]);
@@ -249,6 +255,7 @@ exports.draw = function(txt, id, ver) {
var branches = db.getBranchesAsObjArray(); var branches = db.getBranchesAsObjArray();
if (direction === 'BT') { if (direction === 'BT') {
config.nodeLabel.x = branches.length * config.branchOffset; config.nodeLabel.x = branches.length * config.branchOffset;
config.nodeLabel.width = '100%';
config.nodeLabel.y = -1 * 2* config.nodeRadius; config.nodeLabel.y = -1 * 2* config.nodeRadius;
} }
var svg = d3.select('#' + id); var svg = d3.select('#' + id);