annotate .svn/pristine/7d/7d3cbe14fc84c9fc42efa7908095cf2d1fad9643.svn-base @ 1524:82fac3dcf466 redmine-2.5-integration

Fix failure to interpret Javascript when autocompleting members for project
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Thu, 11 Sep 2014 10:24:38 +0100
parents 261b3d9a4903
children
rev   line source
Chris@1464 1 var revisionGraph = null;
Chris@1464 2
Chris@1464 3 function drawRevisionGraph(holder, commits_hash, graph_space) {
Chris@1464 4 var XSTEP = 20,
Chris@1464 5 CIRCLE_INROW_OFFSET = 10;
Chris@1464 6 var commits_by_scmid = commits_hash,
Chris@1464 7 commits = $.map(commits_by_scmid, function(val,i){return val;});
Chris@1464 8 var max_rdmid = commits.length - 1;
Chris@1464 9 var commit_table_rows = $('table.changesets tr.changeset');
Chris@1464 10
Chris@1464 11 // create graph
Chris@1464 12 if(revisionGraph != null)
Chris@1464 13 revisionGraph.clear();
Chris@1464 14 else
Chris@1464 15 revisionGraph = Raphael(holder);
Chris@1464 16
Chris@1464 17 var top = revisionGraph.set();
Chris@1464 18 // init dimensions
Chris@1464 19 var graph_x_offset = commit_table_rows.first().find('td').first().position().left - $(holder).position().left,
Chris@1464 20 graph_y_offset = $(holder).position().top,
Chris@1464 21 graph_right_side = graph_x_offset + (graph_space + 1) * XSTEP,
Chris@1464 22 graph_bottom = commit_table_rows.last().position().top + commit_table_rows.last().height() - graph_y_offset;
Chris@1464 23
Chris@1464 24 revisionGraph.setSize(graph_right_side, graph_bottom);
Chris@1464 25
Chris@1464 26 // init colors
Chris@1464 27 var colors = [];
Chris@1464 28 Raphael.getColor.reset();
Chris@1464 29 for (var k = 0; k <= graph_space; k++) {
Chris@1464 30 colors.push(Raphael.getColor());
Chris@1464 31 }
Chris@1464 32
Chris@1464 33 var parent_commit;
Chris@1464 34 var x, y, parent_x, parent_y;
Chris@1464 35 var path, title;
Chris@1464 36 var revision_dot_overlay;
Chris@1464 37 $.each(commits, function(index, commit) {
Chris@1464 38 if (!commit.hasOwnProperty("space"))
Chris@1464 39 commit.space = 0;
Chris@1464 40
Chris@1464 41 y = commit_table_rows.eq(max_rdmid - commit.rdmid).position().top - graph_y_offset + CIRCLE_INROW_OFFSET;
Chris@1464 42 x = graph_x_offset + XSTEP / 2 + XSTEP * commit.space;
Chris@1464 43 revisionGraph.circle(x, y, 3)
Chris@1464 44 .attr({
Chris@1464 45 fill: colors[commit.space],
Chris@1464 46 stroke: 'none'
Chris@1464 47 }).toFront();
Chris@1464 48 // paths to parents
Chris@1464 49 $.each(commit.parent_scmids, function(index, parent_scmid) {
Chris@1464 50 parent_commit = commits_by_scmid[parent_scmid];
Chris@1464 51 if (parent_commit) {
Chris@1464 52 if (!parent_commit.hasOwnProperty("space"))
Chris@1464 53 parent_commit.space = 0;
Chris@1464 54
Chris@1464 55 parent_y = commit_table_rows.eq(max_rdmid - parent_commit.rdmid).position().top - graph_y_offset + CIRCLE_INROW_OFFSET;
Chris@1464 56 parent_x = graph_x_offset + XSTEP / 2 + XSTEP * parent_commit.space;
Chris@1464 57 if (parent_commit.space == commit.space) {
Chris@1464 58 // vertical path
Chris@1464 59 path = revisionGraph.path([
Chris@1464 60 'M', x, y,
Chris@1464 61 'V', parent_y]);
Chris@1464 62 } else {
Chris@1464 63 // path to a commit in a different branch (Bezier curve)
Chris@1464 64 path = revisionGraph.path([
Chris@1464 65 'M', x, y,
Chris@1464 66 'C', x, y, x, y + (parent_y - y) / 2, x + (parent_x - x) / 2, y + (parent_y - y) / 2,
Chris@1464 67 'C', x + (parent_x - x) / 2, y + (parent_y - y) / 2, parent_x, parent_y-(parent_y-y)/2, parent_x, parent_y]);
Chris@1464 68 }
Chris@1464 69 } else {
Chris@1464 70 // vertical path ending at the bottom of the revisionGraph
Chris@1464 71 path = revisionGraph.path([
Chris@1464 72 'M', x, y,
Chris@1464 73 'V', graph_bottom]);
Chris@1464 74 }
Chris@1464 75 path.attr({stroke: colors[commit.space], "stroke-width": 1.5}).toBack();
Chris@1464 76 });
Chris@1464 77 revision_dot_overlay = revisionGraph.circle(x, y, 10);
Chris@1464 78 revision_dot_overlay
Chris@1464 79 .attr({
Chris@1464 80 fill: '#000',
Chris@1464 81 opacity: 0,
Chris@1464 82 cursor: 'pointer',
Chris@1464 83 href: commit.href
Chris@1464 84 });
Chris@1464 85
Chris@1464 86 if(commit.refs != null && commit.refs.length > 0) {
Chris@1464 87 title = document.createElementNS(revisionGraph.canvas.namespaceURI, 'title');
Chris@1464 88 title.appendChild(document.createTextNode(commit.refs));
Chris@1464 89 revision_dot_overlay.node.appendChild(title);
Chris@1464 90 }
Chris@1464 91 top.push(revision_dot_overlay);
Chris@1464 92 });
Chris@1464 93 top.toFront();
Chris@1464 94 };