Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-13 16:56:00 +01:00
Code Issues Packages Projects Releases Activity

Revision Graph and Table should work with vertical-align: middle (#22278).

Browse Source 
Patch by Gregor Schmidt.

git-svn-id: http://svn.redmine.org/redmine/trunk@15299 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2016-04-03 12:29:15 +00:00
parent 8e2482d2c1
commit 0ef6c949d1
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/javascripts/revision_graph.js
View File

@@ -24,6 +24,18 @@ function drawRevisionGraph(holder, commits_hash, graph_space) {
graph_right_side = graph_x_offset + (graph_space + 1) * XSTEP, graph_right_side = graph_x_offset + (graph_space + 1) * XSTEP,
graph_bottom = commit_table_rows.last().position().top + commit_table_rows.last().height() - graph_y_offset; graph_bottom = commit_table_rows.last().position().top + commit_table_rows.last().height() - graph_y_offset;
var yForRow = function (index, commit) {
var row = commit_table_rows.eq(index);
switch (row.find("td:first").css("vertical-align")) {
case "middle":
return row.position().top + (row.height() / 2) - graph_y_offset;
default:
return row.position().top + - graph_y_offset + CIRCLE_INROW_OFFSET;
}
};
revisionGraph.setSize(graph_right_side, graph_bottom); revisionGraph.setSize(graph_right_side, graph_bottom);
// init colors // init colors
@@ -41,7 +53,7 @@ function drawRevisionGraph(holder, commits_hash, graph_space) {
if (!commit.hasOwnProperty("space")) if (!commit.hasOwnProperty("space"))
commit.space = 0; commit.space = 0;
y = commit_table_rows.eq(max_rdmid - commit.rdmid).position().top - graph_y_offset + CIRCLE_INROW_OFFSET; y = yForRow(max_rdmid - commit.rdmid);
x = graph_x_offset + XSTEP / 2 + XSTEP * commit.space; x = graph_x_offset + XSTEP / 2 + XSTEP * commit.space;
revisionGraph.circle(x, y, 3) revisionGraph.circle(x, y, 3)
.attr({ .attr({
@@ -55,7 +67,7 @@ function drawRevisionGraph(holder, commits_hash, graph_space) {
if (!parent_commit.hasOwnProperty("space")) if (!parent_commit.hasOwnProperty("space"))
parent_commit.space = 0; parent_commit.space = 0;
parent_y = commit_table_rows.eq(max_rdmid - parent_commit.rdmid).position().top - graph_y_offset + CIRCLE_INROW_OFFSET; parent_y = yForRow(max_rdmid - parent_commit.rdmid);
parent_x = graph_x_offset + XSTEP / 2 + XSTEP * parent_commit.space; parent_x = graph_x_offset + XSTEP / 2 + XSTEP * parent_commit.space;
if (parent_commit.space == commit.space) { if (parent_commit.space == commit.space) {
// vertical path // vertical path