Commit 4b2ecbc4 authored by Koen Punt's avatar Koen Punt

Updated branch-graph, abstracted some code in seperate functions

Removed unused Raphael.fn.popup
parent e1282d50
...@@ -54,12 +54,12 @@ class ProjectsController < ProjectResourceController ...@@ -54,12 +54,12 @@ class ProjectsController < ProjectResourceController
respond_to do |format| respond_to do |format|
format.html do format.html do
unless @project.empty_repo? unless @project.empty_repo?
@last_push = current_user.recent_push(@project.id) @last_push = current_user.recent_push(@project.id)
render :show render :show
else else
render "projects/empty" render "projects/empty"
end end
end end
format.js format.js
end end
...@@ -83,19 +83,13 @@ class ProjectsController < ProjectResourceController ...@@ -83,19 +83,13 @@ class ProjectsController < ProjectResourceController
end end
def graph def graph
respond_to do |format| respond_to do |format|
format.html format.html
format.json do format.json do
graph = Gitlab::Graph::JsonBuilder.new(project) graph = Gitlab::Graph::JsonBuilder.new(project)
#@days_json, @commits_json = graph.days_json, graph.commits_json render :json => graph.to_json
render :text => graph.to_json
end end
end end
end end
def destroy def destroy
......
...@@ -9,5 +9,8 @@ ...@@ -9,5 +9,8 @@
:javascript :javascript
var branch_graph; var branch_graph;
$(function(){ $(function(){
branch_graph = new BranchGraph($("#holder"), '#{url_for :controller => 'projects', :action => 'graph'}'); branch_graph = new BranchGraph($("#holder"), {
url: '#{url_for controller: 'projects', action: 'graph', format: :json}',
commit_url: '#{url_for controller: 'projects', action: 'show'}/commits/%s'
});
}); });
...@@ -18,11 +18,11 @@ module Gitlab ...@@ -18,11 +18,11 @@ module Gitlab
@days = index_commits @days = index_commits
end end
def to_json def to_json(*args)
{ {
days: @days.compact.map { |d| [d.day, d.strftime("%b")] }, days: @days.compact.map { |d| [d.day, d.strftime("%b")] },
commits: @commits.map(&:to_graph_hash) commits: @commits.map(&:to_graph_hash)
}.to_json }.to_json(*args)
end end
protected protected
......
!function(){ !function(){
var BranchGraph = function(element, url){ var BranchGraph = function(element, options){
this.element = element; this.element = element;
this.url = url; this.options = options;
this.comms = {}; this.preparedCommits = {};
this.mtime = 0; this.mtime = 0;
this.mspace = 0; this.mspace = 0;
this.parents = {}; this.parents = {};
...@@ -15,67 +15,83 @@ ...@@ -15,67 +15,83 @@
BranchGraph.prototype.load = function(){ BranchGraph.prototype.load = function(){
$.ajax({ $.ajax({
url: this.url, url: this.options.url,
method: 'get', method: 'get',
dataType: 'json', dataType: 'json',
success: $.proxy(function(data){ success: $.proxy(function(data){
$('.loading', this.element).hide(); $('.loading', this.element).hide();
this.prepareData(data.days, data.commits); this.prepareData(data.days, data.commits);
this.buildGraph(this.element.get(0)); this.buildGraph();
}, this) }, this)
}); });
}, };
BranchGraph.prototype.prepareData = function(days, commits){ BranchGraph.prototype.prepareData = function(days, commits){
this.days = days; this.days = days;
this.dayCount = days.length;
this.commits = commits; this.commits = commits;
ii = this.commits.length; this.commitCount = commits.length;
for (var i = 0; i < ii; i++) {
for (var j = 0, jj = this.commits[i].parents.length; j < jj; j++) { this.collectParents();
this.parents[this.commits[i].parents[j][0]] = true;
}
this.mtime = Math.max(this.mtime, this.commits[i].time);
this.mspace = Math.max(this.mspace, this.commits[i].space);
}
this.mtime += 4; this.mtime += 4;
this.mspace += 10; this.mspace += 10;
for (i = 0; i < ii; i++) { for (var i = 0; i < this.commitCount; i++) {
if (this.commits[i].id in this.parents) { if (this.commits[i].id in this.parents) {
this.commits[i].isParent = true; this.commits[i].isParent = true;
} }
this.comms[this.commits[i].id] = this.commits[i]; this.preparedCommits[this.commits[i].id] = this.commits[i];
} }
this.collectColors();
};
BranchGraph.prototype.collectParents = function(){
for (var i = 0; i < this.commitCount; i++) {
for (var j = 0, jj = this.commits[i].parents.length; j < jj; j++) {
this.parents[this.commits[i].parents[j][0]] = true;
}
this.mtime = Math.max(this.mtime, this.commits[i].time);
this.mspace = Math.max(this.mspace, this.commits[i].space);
}
};
BranchGraph.prototype.collectColors = function(){
for (var k = 0; k < this.mspace; k++) { for (var k = 0; k < this.mspace; k++) {
this.colors.push(Raphael.getColor()); this.colors.push(Raphael.getColor());
} }
}; };
BranchGraph.prototype.buildGraph = function(holder){ BranchGraph.prototype.buildGraph = function(){
var ch = this.mspace * 20 + 20 var graphWidth = $(this.element).width()
, cw = this.mtime * 20 + 20 , ch = this.mspace * 20 + 20
, r = Raphael(holder, cw, ch) , cw = Math.max(graphWidth, this.mtime * 20 + 20)
, r = Raphael(this.element.get(0), cw, ch)
, top = r.set() , top = r.set()
, cuday = 0 , cuday = 0
, cumonth = "" , cumonth = ""
, r; , offsetX = 20
, offsetY = 60
, barWidth = Math.max(graphWidth, this.dayCount * 20 + 80);
this.raphael = r; this.raphael = r;
r.rect(0, 0, this.days.length * 20 + 80, 30).attr({fill: "#222"}); r.rect(0, 0, barWidth, 20).attr({fill: "#222"});
r.rect(0, 30, this.days.length * 20 + 80, 20).attr({fill: "#444"}); r.rect(0, 20, barWidth, 20).attr({fill: "#444"});
for (mm = 0; mm < this.days.length; mm++) { for (mm = 0; mm < this.dayCount; mm++) {
if(this.days[mm] != null){ if(this.days[mm] != null){
if(cuday != this.days[mm][0]){ if(cuday != this.days[mm][0]){
r.text(10 + mm * 20, 40, this.days[mm][0]).attr({ // Dates
font: "14px Fontin-Sans, Arial", r.text(offsetX + mm * 20, 31, this.days[mm][0]).attr({
font: "12px Monaco, Arial",
fill: "#DDD" fill: "#DDD"
}); });
cuday = this.days[mm][0]; cuday = this.days[mm][0];
} }
if(cumonth != this.days[mm][1]){ if(cumonth != this.days[mm][1]){
r.text(10 + mm * 20, 15, this.days[mm][1]).attr({ // Months
font: "14px Fontin-Sans, Arial", r.text(offsetX + mm * 20, 11, this.days[mm][1]).attr({
font: "12px Monaco, Arial",
fill: "#EEE" fill: "#EEE"
}); });
cumonth = this.days[mm][1]; cumonth = this.days[mm][1];
...@@ -83,9 +99,9 @@ ...@@ -83,9 +99,9 @@
} }
} }
for (i = 0; i < ii; i++) { for (i = 0; i < this.commitCount; i++) {
var x = 10 + 20 * this.commits[i].time var x = offsetX + 20 * this.commits[i].time
, y = 70 + 20 * this.commits[i].space; , y = offsetY + 20 * this.commits[i].space;
r.circle(x, y, 3).attr({ r.circle(x, y, 3).attr({
fill: this.colors[this.commits[i].space], fill: this.colors[this.commits[i].space],
stroke: "none" stroke: "none"
...@@ -96,22 +112,28 @@ ...@@ -96,22 +112,28 @@
if (shortrefs.length > 15){ if (shortrefs.length > 15){
shortrefs = shortrefs.substr(0,13) + "..."; shortrefs = shortrefs.substr(0,13) + "...";
} }
var t = r.text(x+5, y+5, shortrefs).attr({ var t = r.text(x+5, y+8, shortrefs).attr({
font: "12px Fontin-Sans, Arial", fill: "#666", font: "12px Monaco, Arial",
title: longrefs, cursor: "pointer", rotation: "90" fill: "#666",
title: longrefs,
cursor: "pointer",
rotation: "90"
}); });
var textbox = t.getBBox(); var textbox = t.getBBox();
t.translate(textbox.height/-4, textbox.width/2); t.translate(textbox.height/-4, textbox.width/2);
} }
var c;
for (var j = 0, jj = this.commits[i].parents.length; j < jj; j++) { for (var j = 0, jj = this.commits[i].parents.length; j < jj; j++) {
var c = this.comms[this.commits[i].parents[j][0]]; c = this.preparedCommits[this.commits[i].parents[j][0]];
if (c) { if (c) {
var cx = 10 + 20 * c.time var cx = offsetX + 20 * c.time
, cy = 70 + 20 * c.space; , cy = offsetY + 20 * c.space;
if (c.space == this.commits[i].space) { if (c.space == this.commits[i].space) {
r.path("M" + (x - 5) + "," + (y + .0001) + "L" + (15 + 20 * c.time) + "," + (y + .0001)) r.path([
.attr({ "M", x, y,
"L", x - 20 * (c.time + 1), y
]).attr({
stroke: this.colors[c.space], stroke: this.colors[c.space],
"stroke-width": 2 "stroke-width": 2
}); });
...@@ -134,130 +156,100 @@ ...@@ -134,130 +156,100 @@
this.appendAnchor(top, this.commits[i], x, y); this.appendAnchor(top, this.commits[i], x, y);
} }
top.toFront(); top.toFront();
var hw = holder.offsetWidth this.element.scrollLeft(cw);
, hh = holder.offsetHeight this.bindEvents();
, v = r.rect(hw - 8, 0, 4, Math.pow(hh, 2) / ch, 2).attr({ };
fill: "#000",
opacity: 0 BranchGraph.prototype.bindEvents = function(){
}) var drag = {}
, h = r.rect(0, hh - 8, Math.pow(hw, 2) / cw, 4, 2).attr({ , element = this.element;
fill: "#000",
opacity: 0
})
, bars = r.set(v, h)
, drag
, dragger = function (event) {
if (drag) {
event = event || window.event;
holder.scrollLeft = drag.sl - (event.clientX - drag.x);
holder.scrollTop = drag.st - (event.clientY - drag.y);
}
};
holder.onmousedown = function (event) {
event = event || window.event;
drag = {
x: event.clientX,
y: event.clientY,
st: holder.scrollTop,
sl: holder.scrollLeft
};
document.onmousemove = dragger;
bars.animate({opacity: .5}, 300);
};
document.onmouseup = function () {
drag = false;
document.onmousemove = null;
bars.animate({opacity: 0}, 300);
};
$(window).on('keydown', function(event){ var dragger = function(event){
if(event.keyCode == 37){ element.scrollLeft(drag.sl - (event.clientX - drag.x));
holder.scrollLeft -= 50; element.scrollTop(drag.st - (event.clientY - drag.y));
};
element.on({
mousedown: function (event) {
drag = {
x: event.clientX,
y: event.clientY,
st: element.scrollTop(),
sl: element.scrollLeft()
};
$(window).on('mousemove', dragger);
} }
if(event.keyCode == 39){ });
// right $(window).on({
holder.scrollLeft += 50; mouseup: function(){
//bars.animate({opacity: 0}, 300);
$(window).off('mousemove', dragger);
},
keydown: function(event){
if(event.keyCode == 37){
// left
element.scrollLeft( element.scrollLeft() - 50);
}
if(event.keyCode == 38){
// top
element.scrollTop( element.scrollTop() - 50);
}
if(event.keyCode == 39){
// right
element.scrollLeft( element.scrollLeft() + 50);
}
if(event.keyCode == 40){
// bottom
element.scrollTop( element.scrollTop() + 50);
}
} }
}); });
holder.scrollLeft = cw;
}; };
BranchGraph.prototype.appendAnchor = function(top, c, x, y) { BranchGraph.prototype.appendAnchor = function(top, c, x, y) {
var r = this.raphael; var r = this.raphael
top.push(r.circle(x, y, 10).attr({ , options = this.options
, anchor;
anchor = r.circle(x, y, 10).attr({
fill: "#000", fill: "#000",
opacity: 0, opacity: 0,
cursor: "pointer" cursor: "pointer"
}) })
.click(function(){ .click(function(){
location.href = location.href.replace("graph", "commits/" + c.id); window.location = options.commit_url.replace('%s', c.id);
}) })
.hover(function () { .hover(function(){
// Create empty node to convert entities to character var text = r.text(100, 100, c.author + "\n \n" + c.id + "\n \n" + c.message).attr({
var s = r.text(100, 100, c.author + "\n \n" + c.id + "\n \n" + c.message).attr({
fill: "#fff" fill: "#fff"
}); });
this.popup = r.popupit(x, y + 5, s, 0); this.popup = r.tooltip(x, y + 5, text, 0);
top.push(this.popup.insertBefore(this)); top.push(this.popup.insertBefore(this));
}, function () { }, function(){
this.popup && this.popup.remove() && delete this.popup; this.popup && this.popup.remove() && delete this.popup;
})); });
top.push(anchor);
}; };
this.BranchGraph = BranchGraph; this.BranchGraph = BranchGraph;
}(this); }(this);
Raphael.fn.popupit = function (x, y, set, dir, size) { Raphael.fn.tooltip = function (x, y, set, dir, size) {
dir = dir == null ? 2 : dir; dir = dir == null ? 2 : dir;
size = size || 5; size = size || 5;
x = Math.round(x); x = Math.round(x);
y = Math.round(y); y = Math.round(y);
var mmax = Math.max, var mmax = Math.max
bb = set.getBBox(), , bb = set.getBBox()
w = Math.round(bb.width / 2), , w = Math.round(bb.width / 2)
h = Math.round(bb.height / 2), , h = Math.round(bb.height / 2)
dx = [0, w + size * 2, 0, -w - size * 2], , dx = [0, w + size * 2, 0, -w - size * 2]
dy = [-h * 2 - size * 3, -h - size, 0, -h - size], , dy = [-h * 2 - size * 3, -h - size, 0, -h - size]
p = ["M", x - dx[dir], y - dy[dir], "l", -size, (dir == 2) * -size, -mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, -size, -size, , p = ["M", x - dx[dir], y - dy[dir], "l", -size, (dir == 2) * -size, -mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, -size, -size,
"l", 0, -mmax(h - size, 0), (dir == 3) * -size, -size, (dir == 3) * size, -size, 0, -mmax(h - size, 0), "a", size, size, 0, 0, 1, size, -size, "l", 0, -mmax(h - size, 0), (dir == 3) * -size, -size, (dir == 3) * size, -size, 0, -mmax(h - size, 0), "a", size, size, 0, 0, 1, size, -size,
"l", mmax(w - size, 0), 0, size, !dir * -size, size, !dir * size, mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, size, size, "l", mmax(w - size, 0), 0, size, !dir * -size, size, !dir * size, mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, size, size,
"l", 0, mmax(h - size, 0), (dir == 1) * size, size, (dir == 1) * -size, size, 0, mmax(h - size, 0), "a", size, size, 0, 0, 1, -size, size, "l", 0, mmax(h - size, 0), (dir == 1) * size, size, (dir == 1) * -size, size, 0, mmax(h - size, 0), "a", size, size, 0, 0, 1, -size, size,
"l", -mmax(w - size, 0), 0, "z"].join(","), "l", -mmax(w - size, 0), 0, "z"].join(",")
xy = [{x: x, y: y + size * 2 + h}, {x: x - size * 2 - w, y: y}, {x: x, y: y - size * 2 - h}, {x: x + size * 2 + w, y: y}][dir]; , xy = [{x: x, y: y + size * 2 + h}, {x: x - size * 2 - w, y: y}, {x: x, y: y - size * 2 - h}, {x: x + size * 2 + w, y: y}][dir];
set.translate(xy.x - w - bb.x, xy.y - h - bb.y); set.translate(xy.x - w - bb.x, xy.y - h - bb.y);
return this.set(this.path(p).attr({fill: "#234", stroke: "none"}).insertBefore(set.node ? set : set[0]), set); return this.set(this.path(p).attr({fill: "#234", stroke: "none"}).insertBefore(set.node ? set : set[0]), set);
}; };
Raphael.fn.popup = function (x, y, text, dir, size) { \ No newline at end of file
dir = dir == null ? 2 : dir > 3 ? 3 : dir;
size = size || 5;
text = text || "$9.99";
var res = this.set(),
d = 3;
res.push(this.path().attr({fill: "#000", stroke: "#000"}));
res.push(this.text(x, y, text).attr(this.g.txtattr).attr({fill: "#fff", "font-family": "Helvetica, Arial"}));
res.update = function (X, Y, withAnimation) {
X = X || x;
Y = Y || y;
var bb = this[1].getBBox(),
w = bb.width / 2,
h = bb.height / 2,
dx = [0, w + size * 2, 0, -w - size * 2],
dy = [-h * 2 - size * 3, -h - size, 0, -h - size],
p = ["M", X - dx[dir], Y - dy[dir], "l", -size, (dir == 2) * -size, -mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, -size, -size,
"l", 0, -mmax(h - size, 0), (dir == 3) * -size, -size, (dir == 3) * size, -size, 0, -mmax(h - size, 0), "a", size, size, 0, 0, 1, size, -size,
"l", mmax(w - size, 0), 0, size, !dir * -size, size, !dir * size, mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, size, size,
"l", 0, mmax(h - size, 0), (dir == 1) * size, size, (dir == 1) * -size, size, 0, mmax(h - size, 0), "a", size, size, 0, 0, 1, -size, size,
"l", -mmax(w - size, 0), 0, "z"].join(","),
xy = [{x: X, y: Y + size * 2 + h}, {x: X - size * 2 - w, y: Y}, {x: X, y: Y - size * 2 - h}, {x: X + size * 2 + w, y: Y}][dir];
xy.path = p;
if (withAnimation) {
this.animate(xy, 500, ">");
} else {
this.attr(xy);
}
return this;
};
return res.update(x, y);
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment