The commit is marked and displayed in the center.
This commit is contained in:
parent
7812cb77c8
commit
1e907498a9
2 changed files with 17 additions and 7 deletions
|
@ -14,6 +14,7 @@
|
|||
branch_graph = new BranchGraph($("#holder"), {
|
||||
url: '#{project_graph_path(@project, @ref, format: :json)}',
|
||||
commit_url: '#{project_commit_path(@project, 'ae45ca32').gsub("ae45ca32", "%s")}',
|
||||
ref: '#{@ref}'
|
||||
ref: '#{@ref}',
|
||||
commit_id: '#{@commit && @commit.id}'
|
||||
});
|
||||
});
|
||||
|
|
21
vendor/assets/javascripts/branch-graph.js
vendored
21
vendor/assets/javascripts/branch-graph.js
vendored
|
@ -161,14 +161,23 @@
|
|||
|
||||
if (this.commits[i].refs) {
|
||||
this.appendLabel(x, y, this.commits[i].refs);
|
||||
|
||||
// The main branch is displayed in the center.
|
||||
re = new RegExp('(^| )' + this.options.ref + '( |$)');
|
||||
if (this.commits[i].refs.match(re)) {
|
||||
scrollLeft = x - graphWidth / 2;
|
||||
}
|
||||
}
|
||||
|
||||
// mark commit and displayed in the center
|
||||
if (this.commits[i].id == this.options.commit_id) {
|
||||
r.path([
|
||||
'M', x, y - 5,
|
||||
'L', x + 4, y - 15,
|
||||
'L', x - 4, y - 15,
|
||||
'Z'
|
||||
]).attr({
|
||||
"fill": "#000",
|
||||
"fill-opacity": .7,
|
||||
"stroke": "none"
|
||||
});
|
||||
scrollLeft = x - graphWidth / 2;
|
||||
}
|
||||
|
||||
this.appendAnchor(top, this.commits[i], x, y);
|
||||
}
|
||||
top.toFront();
|
||||
|
|
Loading…
Reference in a new issue