##// END OF EJS Templates
Added missing local variable declaration....
Etienne Massip -
r9652:897e83a55637
parent child
Show More
@@ -1,101 +1,102
1 1 var revisionGraph = null;
2 2
3 3 function drawRevisionGraph(holder, commits_hash, graph_space) {
4 4
5 5 var XSTEP = 20,
6 6 CIRCLE_INROW_OFFSET = 10;
7 7
8 8 var commits_by_scmid = $H(commits_hash),
9 9 commits = commits_by_scmid.values();
10 10
11 11 var max_rdmid = commits.length - 1;
12 12
13 13 var commit_table_rows = $$('table.changesets tr.changeset');
14 14
15 15 // create graph
16 16 if(revisionGraph != null)
17 17 revisionGraph.clear();
18 18 else
19 19 revisionGraph = Raphael(holder);
20 20
21 21 var top = revisionGraph.set();
22 22
23 23 // init dimensions
24 24 var graph_x_offset = Element.select(commit_table_rows.first(),'td').first().getLayout().get('left') - $(holder).getLayout().get('left'),
25 25 graph_y_offset = $(holder).getLayout().get('top'),
26 26 graph_right_side = graph_x_offset + (graph_space + 1) * XSTEP,
27 27 graph_bottom = commit_table_rows.last().getLayout().get('top') + commit_table_rows.last().getLayout().get('height') - graph_y_offset;
28 28
29 29 revisionGraph.setSize(graph_right_side, graph_bottom);
30 30
31 31 // init colors
32 32 var colors = [];
33 33 Raphael.getColor.reset();
34 34 for (var k = 0; k <= graph_space; k++) {
35 35 colors.push(Raphael.getColor());
36 36 }
37 37
38 38 var parent_commit;
39 39 var x, y, parent_x, parent_y;
40 40 var path, title;
41 var revision_dot_overlay;
41 42
42 43 commits.each(function(commit) {
43 44
44 45 y = commit_table_rows[max_rdmid - commit.rdmid].getLayout().get('top') - graph_y_offset + CIRCLE_INROW_OFFSET;
45 46 x = graph_x_offset + XSTEP / 2 + XSTEP * commit.space;
46 47
47 48 revisionGraph.circle(x, y, 3)
48 49 .attr({
49 50 fill: colors[commit.space],
50 51 stroke: 'none',
51 52 }).toFront();
52 53
53 54 // paths to parents
54 55 commit.parent_scmids.each(function(parent_scmid) {
55 56 parent_commit = commits_by_scmid.get(parent_scmid);
56 57
57 58 if (parent_commit) {
58 59 parent_y = commit_table_rows[max_rdmid - parent_commit.rdmid].getLayout().get('top') - graph_y_offset + CIRCLE_INROW_OFFSET;
59 60 parent_x = graph_x_offset + XSTEP / 2 + XSTEP * parent_commit.space;
60 61
61 62 if (parent_commit.space == commit.space) {
62 63 // vertical path
63 64 path = revisionGraph.path([
64 65 'M', x, y,
65 66 'V', parent_y]);
66 67 } else {
67 68 // path to a commit in a different branch (Bezier curve)
68 69 path = revisionGraph.path([
69 70 'M', x, y,
70 71 'C', x, y, x, y + (parent_y - y) / 2, x + (parent_x - x) / 2, y + (parent_y - y) / 2,
71 72 'C', x + (parent_x - x) / 2, y + (parent_y - y) / 2, parent_x, parent_y-(parent_y-y)/2, parent_x, parent_y]);
72 73 }
73 74 } else {
74 75 // vertical path ending at the bottom of the revisionGraph
75 76 path = revisionGraph.path([
76 77 'M', x, y,
77 78 'V', graph_bottom]);
78 79 }
79 80 path.attr({stroke: colors[commit.space], "stroke-width": 1.5}).toBack();
80 81 });
81 82
82 83 revision_dot_overlay = revisionGraph.circle(x, y, 10);
83 84 revision_dot_overlay
84 85 .attr({
85 86 fill: '#000',
86 87 opacity: 0,
87 88 cursor: 'pointer',
88 89 href: commit.href
89 90 });
90 91
91 92 if(commit.refs != null && commit.refs.length > 0) {
92 93 title = document.createElementNS(revisionGraph.canvas.namespaceURI, 'title');
93 94 title.appendChild(document.createTextNode(commit.refs));
94 95 revision_dot_overlay.node.appendChild(title);
95 96 }
96 97
97 98 top.push(revision_dot_overlay);
98 99 });
99 100
100 101 top.toFront();
101 102 };
General Comments 0
You need to be logged in to leave comments. Login now