jro_apps/redmine Commit - r8653:b9c26d6ddcd3

Revision graph code cleanup....

Etienne Massip -

r8653:b9c26d6ddcd3

parent child

Context file:

r8653:b9c26d6ddcd3

Collapse all files

app/helpers/repositories_helper.rb +47 -42

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'iconv'
             require 'redmine/codeset_util'
             module RepositoriesHelper
               def format_revision(revision)
                 if revision.respond_to? :format_identifier
                   revision.format_identifier
                 else
                   revision.to_s
                 end
               end
               def truncate_at_line_break(text, length = 255)
                 if text
                   text.gsub(%r{^(.{#{length}}[^\n]*)\n.+$}m, '\\1...')
                 end
               end
               def render_properties(properties)
                 unless properties.nil? || properties.empty?
                   content = ''
                   properties.keys.sort.each do |property|
                     content << content_tag('li', "<b>#{h property}</b>: <span>#{h properties[property]}</span>".html_safe)
                   end
                   content_tag('ul', content.html_safe, :class => 'properties')
                 end
               end
               def render_changeset_changes
                 changes = @changeset.changes.find(:all, :limit => 1000, :order => 'path').collect do |change|
                   case change.action
                   when 'A'
                     # Detects moved/copied files
                     if !change.from_path.blank?
                       change.action =
                          @changeset.changes.detect {|c| c.action == 'D' && c.path == change.from_path} ? 'R' : 'C'
                     end
                     change
                   when 'D'
                     @changeset.changes.detect {|c| c.from_path == change.path} ? nil : change
                   else
                     change
                   end
                 end.compact
                 tree = { }
                 changes.each do |change|
                   p = tree
                   dirs = change.path.to_s.split('/').select {|d| !d.blank?}
                   path = ''
                   dirs.each do |dir|
                     path += '/' + dir
                     p[:s] ||= {}
                     p = p[:s]
                     p[path] ||= {}
                     p = p[path]
                   end
                   p[:c] = change
                 end
                 render_changes_tree(tree[:s])
               end
               def render_changes_tree(tree)
                 return '' if tree.nil?
                 output = ''
                 output << '<ul>'
                 tree.keys.sort.each do |file|
                   style = 'change'
                   text = File.basename(h(file))
                   if s = tree[file][:s]
                     style << ' folder'
                     path_param = to_path_param(@repository.relative_path(file))
                     text = link_to(h(text), :controller => 'repositories',
                                          :action => 'show',
                                          :id => @project,
                                          :repository_id => @repository.identifier_param,
                                          :path => path_param,
                                          :rev => @changeset.identifier)
                     output << "<li class='#{style}'>#{text}"
                     output << render_changes_tree(s)
                     output << "</li>"
                   elsif c = tree[file][:c]
                     style << " change-#{c.action}"
                     path_param = to_path_param(@repository.relative_path(c.path))
                     text = link_to(h(text), :controller => 'repositories',
                                          :action => 'entry',
                                          :id => @project,
                                          :repository_id => @repository.identifier_param,
                                          :path => path_param,
                                          :rev => @changeset.identifier) unless c.action == 'D'
                     text << " - #{h(c.revision)}" unless c.revision.blank?
                     text << ' ('.html_safe + link_to(l(:label_diff), :controller => 'repositories',
                                                    :action => 'diff',
                                                    :id => @project,
                                                    :repository_id => @repository.identifier_param,
                                                    :path => path_param,
                                                    :rev => @changeset.identifier) + ') '.html_safe if c.action == 'M'
                     text << ' '.html_safe + content_tag('span', h(c.from_path), :class => 'copied-from') unless c.from_path.blank?
                     output << "<li class='#{style}'>#{text}</li>"
                   end
                 end
                 output << '</ul>'
                 output.html_safe
               end
               def repository_field_tags(form, repository)
                 method = repository.class.name.demodulize.underscore + "_field_tags"
                 if repository.is_a?(Repository) &&
                     respond_to?(method) && method != 'repository_field_tags'
                   send(method, form, repository)
                 end
               end
               def scm_select_tag(repository)
                 scm_options = [["--- #{l(:actionview_instancetag_blank_option)} ---", '']]
                 Redmine::Scm::Base.all.each do |scm|
                 if Setting.enabled_scm.include?(scm) ||
                       (repository && repository.class.name.demodulize == scm)
                     scm_options << ["Repository::#{scm}".constantize.scm_name, scm]
                   end
                 end
                 select_tag('repository_scm',
                            options_for_select(scm_options, repository.class.name.demodulize),
                            :disabled => (repository && !repository.new_record?),
                            :onchange => remote_function(
                              :url => new_project_repository_path(@project),
                              :method => :get,
                              :update => 'content',
                              :with   => "Form.serialize(this.form)")
                          )
               end
               def with_leading_slash(path)
                 path.to_s.starts_with?('/') ? path : "/#{path}"
               end
               def without_leading_slash(path)
                 path.gsub(%r{^/+}, '')
               end
               def subversion_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :size => 60, :required => true,
                                    :disabled => (repository && !repository.root_url.blank?)) +
                                    '<br />'.html_safe +
                                    '(file:///, http://, https://, svn://, svn+[tunnelscheme]://)') +
                   content_tag('p', form.text_field(:login, :size => 30)) +
                   content_tag('p', form.password_field(
                                         :password, :size => 30, :name => 'ignore',
                                         :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
                                         :onfocus => "this.value=''; this.name='repository[password]';",
                                         :onchange => "this.name='repository[password]';"))
               end
               def darcs_field_tags(form, repository)
                 content_tag('p', form.text_field(
                                  :url, :label => l(:field_path_to_repository),
                                  :size => 60, :required => true,
                                  :disabled => (repository && !repository.new_record?))) +
                 content_tag('p', form.select(
                                  :log_encoding, [nil] + Setting::ENCODINGS,
                                  :label => l(:field_commit_logs_encoding), :required => true))
               end
               def mercurial_field_tags(form, repository)
                 content_tag('p', form.text_field(
                                    :url, :label => l(:field_path_to_repository),
                                    :size => 60, :required => true,
                                    :disabled => (repository && !repository.root_url.blank?)
                                      ) +
                                  '<br />'.html_safe + l(:text_mercurial_repository_note)) +
                 content_tag('p', form.select(
                                     :path_encoding, [nil] + Setting::ENCODINGS,
                                     :label => l(:field_scm_path_encoding)
                                     ) +
                                  '<br />'.html_safe + l(:text_scm_path_encoding_note))
               end
               def git_field_tags(form, repository)
                 content_tag('p', form.text_field(
                                    :url, :label => l(:field_path_to_repository),
                                    :size => 60, :required => true,
                                    :disabled => (repository && !repository.root_url.blank?)
                                      ) +
                                   '<br />'.html_safe +
                                   l(:text_git_repository_note)) +
                 content_tag('p', form.select(
                                     :path_encoding, [nil] + Setting::ENCODINGS,
                                     :label => l(:field_scm_path_encoding)
                                     ) +
                                  '<br />'.html_safe + l(:text_scm_path_encoding_note)) +
                 content_tag('p', form.check_box(
                                     :extra_report_last_commit,
                                     :label => l(:label_git_report_last_commit)
                                      ))
               end
               def cvs_field_tags(form, repository)
                 content_tag('p', form.text_field(
                                  :root_url,
                                  :label => l(:field_cvsroot),
                                  :size => 60, :required => true,
                                  :disabled => !repository.new_record?)) +
                 content_tag('p', form.text_field(
                                  :url,
                                  :label => l(:field_cvs_module),
                                  :size => 30, :required => true,
                                  :disabled => !repository.new_record?)) +
                 content_tag('p', form.select(
                                  :log_encoding, [nil] + Setting::ENCODINGS,
                                  :label => l(:field_commit_logs_encoding), :required => true)) +
                 content_tag('p', form.select(
                                     :path_encoding, [nil] + Setting::ENCODINGS,
                                     :label => l(:field_scm_path_encoding)
                                     ) +
                                  '<br />'.html_safe + l(:text_scm_path_encoding_note))
               end
               def bazaar_field_tags(form, repository)
                 content_tag('p', form.text_field(
                                  :url, :label => l(:field_path_to_repository),
                                  :size => 60, :required => true,
                                  :disabled => (repository && !repository.new_record?))) +
                 content_tag('p', form.select(
                                  :log_encoding, [nil] + Setting::ENCODINGS,
                                  :label => l(:field_commit_logs_encoding), :required => true))
               end
               def filesystem_field_tags(form, repository)
                 content_tag('p', form.text_field(
                                  :url, :label => l(:field_root_directory),
                                  :size => 60, :required => true,
                                  :disabled => (repository && !repository.root_url.blank?))) +
                 content_tag('p', form.select(
                                     :path_encoding, [nil] + Setting::ENCODINGS,
                                     :label => l(:field_scm_path_encoding)
                                     ) +
                                  '<br />'.html_safe + l(:text_scm_path_encoding_note))
               end
-              def index_commits(commits, heads, href_proc = nil)
+              def index_commits(commits, heads)
                 return nil if commits.nil? or commits.first.parents.nil?
-                map  = {}
-                commit_hashes = []
                 refs_map = {}
-                href_proc ||= Proc.new {|x|x}
+                heads.each do |head|
-                heads.each{|r| refs_map[r.scmid] ||= []; refs_map[r.scmid] << r}
+                  refs_map[head.scmid] ||= []
-                commits.reverse.each_with_index do |c, i|
+                  refs_map[head.scmid] << head
-                  h = {}
+                end
-                  h[:parents] = c.parents.collect do |p|
-                    [p.scmid, 0, 0]
+                commits_by_scmid = {}
-                  end
+                commits.reverse.each_with_index do |commit, commit_index|
-                  h[:rdmid] = i
-                  h[:space] = 0
+                  commits_by_scmid[commit.scmid] = {
-                  h[:refs]  = refs_map[c.scmid].join(" ") if refs_map.include? c.scmid
+                    :parent_scmids => commit.parents.collect { |parent| parent.scmid },
-                  h[:scmid] = c.scmid
+                    :rdmid => commit_index,
-                  h[:href]  = href_proc.call(c.scmid)
+                    :space => 0,
-                  commit_hashes << h
+                    :refs  => refs_map.include?(commit.scmid) ? refs_map[commit.scmid].join(" ") : nil,
-                  map[c.scmid] = h
+                    :scmid => commit.scmid,
-                end
+                    :href  => block_given? ? yield(commit.scmid) : commit.scmid
-                heads.sort! do |a,b|
-                  a.to_s <=> b.to_s
+                end
-                end
-                j = 0
+                heads.sort! { |head1, head2| head1.to_s <=> head2.to_s }
-                heads.each do |h|
-                  if map.include? h.scmid then
+                mark_index = 0
-                    j = mark_chain(j += 1, map[h.scmid], map)
+                heads.each do |head|
+                  if commits_by_scmid.include? head.scmid
+                    mark_index = mark_chain(mark_index += 1, commits_by_scmid[head.scmid], commits_by_scmid)
                   end
                 end
                 # when no head matched anything use first commit
-                if j == 0 then
+                if mark_index == 0
-                   mark_chain(j += 1, map.values.first, map)
+                   mark_chain(mark_index += 1, commits_by_scmid.values.first, commits_by_scmid)
                 end
-                map
+                commits_by_scmid
               end
-              def mark_chain(mark, commit, map)
+              def mark_chain(mark_index, commit, commits_by_scmid)
-                stack = [[mark, commit]]
-                markmax = mark
+                stack = [[mark_index, commit]]
+                mark_max_index = mark_index
                 until stack.empty?
-                  current = stack.pop
+                  mark_index, commit = stack.pop
-                  m, commit = current
+                  commit[:space] = mark_index if commit[:space] == 0
-                  commit[:space] = m  if commit[:space] == 0
-                  m1 = m - 1
+                  mark_index -=1
-                  commit[:parents].each_with_index do |p, i|
+                  commit[:parent_scmids].each_with_index do |parent_scmid, parent_index|
-                    psha = p[0]
-                    if map.include? psha  and  map[psha][:space] == 0 then
+                    parent_commit = commits_by_scmid[parent_scmid]
-                      stack << [m1 += 1, map[psha]] if i == 0
-                      stack = [[m1 += 1, map[psha]]] + stack if i > 0
+                    if parent_commit and parent_commit[:space] == 0
+                      stack.unshift [mark_index += 1, parent_commit]
                     end
                   end
-                  markmax = m1 if markmax < m1
+                  mark_max_index = mark_index if mark_max_index < mark_index
                 end
-                markmax
+                mark_max_index
               end
             end

app/views/repositories/_revision_graph.html.erb +8 -9

@@ -1,13 +1,12
1	<%= javascript_include_tag ~~"raphael.js"~~ %>	1	<%= javascript_include_tag 'raphael.js' %>
2	<script type="text/javascript" charset="utf-8">	2	<%= javascript_include_tag 'revision_graph.js' %>
3	var chunk = {commits:<%= commits.values.to_json.html_safe %>}
4	</script>
5	<%= javascript_include_tag "revision_graph.js" %>
6		3
7	<script type="text/javascript">	4	<script type="text/javascript" charset="utf-8">
8	Event.observe(window,~~"load"~~, function(){	5	Event.observe(window, 'load', function(){
9	branchGraph(document.getElementById("holder"));	6	branchGraph(
10	})	7	document.getElementById("holder"),
		8	<%= commits.to_json.html_safe %>);
		9	});
11	</script>	10	</script>
12		11
13	<div id="holder" class="graph"></div>	12	<div id="holder" class="graph"></div>

app/views/repositories/_revisions.html.erb +8 -8

             <% show_revision_graph = ( @repository.supports_revision_graph? && path.blank? ) %>
             <% form_tag(
                   {:controller => 'repositories', :action => 'diff', :id => @project,
                    :repository_id => @repository.identifier_param, :path => to_path_param(path)},
                   :method => :get
                  ) do %>
             <table class="list changesets">
             <thead><tr>
             <% if show_revision_graph %>
               <th></th>
             <% end %>
             <th>#</th>
             <th></th>
             <th></th>
             <th><%= l(:label_date) %></th>
             <th><%= l(:field_author) %></th>
             <th><%= l(:field_comments) %></th>
             </tr></thead>
             <tbody>
             <% show_diff = revisions.size > 1 %>
             <% line_num = 1 %>
             <% revisions.each do |changeset| %>
             <tr class="changeset <%= cycle 'odd', 'even' %>">
             <% if show_revision_graph %>
               <% if line_num == 1 %>
                 <td class="revision_graph" rowspan="<%= revisions.size %>">
-                  <% href_base = Proc.new {|x| url_for(:controller => 'repositories',
-                                                       :action => 'revision',
-                                                       :id => project,
-                                                       :repository_id => @repository.identifier_param,
-                                                       :rev => x) } %>
                   <%= render :partial => 'revision_graph',
                              :locals => {
                                 :commits => index_commits(
                                              revisions,
-                                                     @repository.branches,
+                                             @repository.branches) do |scmid|
-                                                     href_base
+                                                 url_for(
+                                                   :controller => 'repositories',
+                                                   :action => 'revision',
+                                                   :id => project,
+                                                   :repository_id => @repository.identifier_param,
+                                                   :rev => scmid)
+                                            end
                                 } %>
                 </td>
               <% end %>
             <% end %>
             <td class="id"><%= link_to_revision(changeset, @repository) %></td>
             <td class="checkbox"><%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td>
             <td class="checkbox"><%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
             <td class="committed_on"><%= format_time(changeset.committed_on) %></td>
             <td class="author"><%= h truncate(changeset.author.to_s, :length => 30) %></td>
             <% if show_revision_graph %>
               <td class="comments_nowrap">
                 <%= textilizable(truncate(truncate_at_line_break(changeset.comments, 0), :length => 90)) %>
               </td>
             <% else %>
               <td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td>
             <% end %>
             </tr>
             <% line_num += 1 %>
             <% end %>
             </tbody>
             </table>
             <%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %>
             <% end %>

public/javascripts/revision_graph.js +85 -158

@@ -1,172 +1,99
1	var commits = chunk.commits,
2	comms = {},
3	pixelsX = [],
4	pixelsY = [],
5	mmax = Math.max,
6	max_rdmid = 0,
7	max_space = 0,
8	parents = {};
9	for (var i = 0, ii = commits.length; i < ii; i++) {
10	for (var j = 0, jj = commits[i].parents.length; j < jj; j++) {
11	parents[commits[i].parents[j][0]] = true;
12	}
13	max_rdmid = Math.max(max_rdmid, commits[i].rdmid);
14	max_space = Math.max(max_space, commits[i].space);
15	}
16		1
17	for (i = 0; i < ii; i++) {	2	function branchGraph(holder, commits_hash) {
18	if (commits[i].scmid in parents) {	3
19	commits[i].isParent = true;	4	var LEFT_PADDING = 3,
20	}	5	TOP_PADDING = 10,
21	comms[commits[i].scmid] = commits[i];	6	XSTEP = YSTEP = 20;
22	}	7
23	var colors = ["#000"];	8	var commits_by_scmid = $H(commits_hash),
		9	commits = commits_by_scmid.values();
		10
		11	// init max dimensions
		12	var max_rdmid = max_space = 0;
		13	commits.each(function(commit) {
		14
		15	max_rdmid = Math.max(max_rdmid, commit.rdmid);
		16	max_space = Math.max(max_space, commit.space);
		17	});
		18
		19	var graph_height = max_rdmid * YSTEP + YSTEP,
		20	graph_width = max_space * XSTEP + XSTEP;
		21
		22	// init colors
		23	var colors = ['#000'];
24	for (var k = 0; k < max_space; k++) {	24	for (var k = 0; k < max_space; k++) {
25	colors.push(Raphael.getColor());	25	colors.push(Raphael.getColor());
26	}	26	}
27		27
28	function branchGraph(holder) {	28	// create graph
29	var xstep = 20, ystep = 20;	29	var graph = Raphael(holder, graph_width, graph_height),
30	var ch, cw;	30	top = graph.set();
31	cw = max_space * xstep + xstep;	31
32	ch = max_rdmid * ystep + ystep;	32	var parent_commit;
33	var r = Raphael("holder", cw, ch),	33	var x, y, parent_x, parent_y;
34	top = r.set();	34	var path, longrefs, shortrefs, label, labelBBox;
35	var cuday = 0, cumonth = "";	35
36		36	commits.each(function(commit) {
37	for (i = 0; i < ii; i++) {	37
38	var x, y;	38	y = TOP_PADDING + YSTEP *(max_rdmid - commit.rdmid);
39	y = 10 + ystep *(max_rdmid - commits[i].rdmid);	39	x = LEFT_PADDING + XSTEP * commit.space;
40	x = 3 + xstep * commits[i].space;	40
41	var stroke = "none";	41	graph.circle(x, y, 3).attr({fill: colors[commit.space], stroke: 'none'});
42	r.circle(x, y, 3).attr({fill: colors[commits[i].space], stroke: stroke});	42
43	if (commits[i].refs != null && commits[i].refs != "") {	43	// title
44	var longrefs = commits[i].refs	44	if (commit.refs != null && commit.refs != '') {
45	~~var~~ ~~shortrefs~~ = commits[i].refs;	45	longrefs = commit.refs;
46	if (shortrefs.length > 15) {	46	shortrefs = longrefs.length > 15 ? longrefs.substr(0, 13) + '...' : longrefs;
47	shortrefs = shortrefs.substr(0,13) + "...";	47
48	}	48	label = graph.text(x + 5, y + 5, shortrefs)
49	var t = r.text(x+5,y+5,shortrefs).attr({font: "12px Fontin-Sans, Arial", fill: "#666",	49	.attr({
50	title: longrefs, cursor: "pointer", rotation: "0"});	50	font: '12px Fontin-Sans, Arial',
		51	fill: '#666',
		52	title: longrefs,
		53	cursor: 'pointer',
		54	rotation: '0'});
51		55
52	~~var~~ ~~textb~~ox = t.getBBox();	56	labelBBox = label.getBBox();
53	t.translate(~~textb~~ox.width / 2, ~~textb~~ox.height / -3);	57	label.translate(labelBBox.width / 2, -labelBBox.height / 3);
54	}	58	}
55	for (var j = 0, jj = commits[i].parents.length; j < jj; j++) {	59
56	var c = comms[commits[i].parents[j][0]];	60	// paths to parents
57	var p,arrow;	61	commit.parent_scmids.each(function(parent_scmid) {
58	if (c) {	62	parent_commit = commits_by_scmid.get(parent_scmid);
59	var cy, cx;	63
60	cy = 10 + ystep * (max_rdmid - c.rdmid),	64	if (parent_commit) {
61	cx = 3 + xstep * c.space;	65	parent_y = TOP_PADDING + YSTEP * (max_rdmid - parent_commit.rdmid);
62		66	parent_x = LEFT_PADDING + XSTEP * parent_commit.space;
63	if (c.space == commits[i].space) {	67
64	p = r.path("M" + x + "," + y + "L" + cx + "," + cy);	68	if (parent_commit.space == commit.space) {
		69	// vertical path
		70	path = graph.path([
		71	'M', x, y,
		72	'V', parent_y]);
65	} else {	73	} else {
66	p = r.path(["M", x, y, "C",x,y,x, y+(cy-y)/2,x+(cx-x)/2, y+(cy-y)/2,	74	// path to a commit in a different branch (Bezier curve)
67	"C", x+(cx-x)/2,y+(cy-y)/2, cx, cy-(cy-y)/2, cx, cy]);	75	path = graph.path([
		76	'M', x, y,
		77	'C', x, y, x, y + (parent_y - y) / 2, x + (parent_x - x) / 2, y + (parent_y - y) / 2,
		78	'C', x + (parent_x - x) / 2, y + (parent_y - y) / 2, parent_x, parent_y-(parent_y-y)/2, parent_x, parent_y]);
68	}	79	}
69	} else {	80	} else {
70	p = r.path("M" + x + "," + y + "L" + x + "," + ch);	81	// vertical path ending at the bottom of the graph
71	}	82	path = graph.path([
72	p.attr({stroke: colors[commits[i].space], "stroke-width": 1.5});	83	'M', x, y,
		84	'V', graph_height]);
73	}	85	}
74	(function (c, x, y) {	86	path.attr({stroke: colors[commit.space], "stroke-width": 1.5});
75	top.push(r.circle(x, y, 10).attr({fill: "#000", opacity: 0,	87	});
76	cursor: "pointer", href: commits[i].href})
77	.hover(function () {}, function () {})
78	);
79	}(commits[i], x, y));
80	}
81	top.toFront();
82	var hw = holder.offsetWidth,
83	hh = holder.offsetHeight,
84	drag,
85	dragger = function (e) {
86	if (drag) {
87	e = e \|\| window.event;
88	holder.scrollLeft = drag.sl - (e.clientX - drag.x);
89	holder.scrollTop = drag.st - (e.clientY - drag.y);
90	}
91	};
92	holder.onmousedown = function (e) {
93	e = e \|\| window.event;
94	drag = {x: e.clientX, y: e.clientY, st: holder.scrollTop, sl: holder.scrollLeft};
95	document.onmousemove = dragger;
96	};
97	document.onmouseup = function () {
98	drag = false;
99	document.onmousemove = null;
100	};
101	holder.scrollLeft = cw;
102	};
103		88
104	Raphael.fn.popupit = function (x, y, set, dir, size) {	89	top.push(graph.circle(x, y, 10)
105	dir = dir == null ? 2 : dir;	90	.attr({
106	size = size \|\| 5;	91	fill: '#000',
107	x = Math.round(x);	92	opacity: 0,
108	y = Math.round(y);	93	cursor: 'pointer',
109	var bb = set.getBBox(),	94	href: commit.href})
110	w = Math.round(bb.width / 2),	95	.hover(function () {}, function () {}));
111	h = Math.round(bb.height / 2),	96	});
112	dx = [0, w + size * 2, 0, -w - size * 2],
113	dy = [-h * 2 - size * 3, -h - size, 0, -h - size],
114	p = ["M", x - dx[dir], y - dy[dir], "l", -size, (dir == 2) * -size, -mmax(w - size, 0),
115	0, "a", size, size, 0, 0, 1, -size, -size,
116	"l", 0, -mmax(h - size, 0), (dir == 3) * -size, -size, (dir == 3) * size, -size, 0,
117	-mmax(h - size, 0), "a", size, size, 0, 0, 1, size, -size,
118	"l", mmax(w - size, 0), 0, size, !dir * -size, size, !dir * size, mmax(w - size, 0),
119	0, "a", size, size, 0, 0, 1, size, size,
120	"l", 0, mmax(h - size, 0), (dir == 1) * size, size, (dir == 1) * -size, size, 0,
121	mmax(h - size, 0), "a", size, size, 0, 0, 1, -size, size,
122	"l", -mmax(w - size, 0), 0, "z"].join(","),
123	xy = [{x: x, y: y + size * 2 + h},
124	{x: x - size * 2 - w, y: y},
125	{x: x, y: y - size * 2 - h},
126	{x: x + size * 2 + w, y: y}]
127	[dir];
128	set.translate(xy.x - w - bb.x, xy.y - h - bb.y);
129	return this.set(this.path(p).attr({fill: "#234", stroke: "none"})
130	.insertBefore(set.node ? set : set[0]), set);
131	};
132		97
133	Raphael.fn.popup = function (x, y, text, dir, size) {	98	top.toFront();
134	dir = dir == null ? 2 : dir > 3 ? 3 : dir;
135	size = size \|\| 5;
136	text = text \|\| "$9.99";
137	var res = this.set(),
138	d = 3;
139	res.push(this.path().attr({fill: "#000", stroke: "#000"}));
140	res.push(this.text(x, y, text).attr(this.g.txtattr).attr({fill: "#fff", "font-family": "Helvetica, Arial"}));
141	res.update = function (X, Y, withAnimation) {
142	X = X \|\| x;
143	Y = Y \|\| y;
144	var bb = this[1].getBBox(),
145	w = bb.width / 2,
146	h = bb.height / 2,
147	dx = [0, w + size * 2, 0, -w - size * 2],
148	dy = [-h * 2 - size * 3, -h - size, 0, -h - size],
149	p = ["M", X - dx[dir], Y - dy[dir], "l", -size, (dir == 2) * -size,
150	-mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, -size, -size,
151	"l", 0, -mmax(h - size, 0), (dir == 3) * -size, -size, (dir == 3) * size, -size,
152	0, -mmax(h - size, 0), "a", size, size, 0, 0, 1, size, -size,
153	"l", mmax(w - size, 0), 0, size, !dir * -size, size, !dir * size, mmax(w - size, 0),
154	0, "a", size, size, 0, 0, 1, size, size,
155	"l", 0, mmax(h - size, 0), (dir == 1) * size, size, (dir == 1) * -size, size, 0,
156	mmax(h - size, 0), "a", size, size, 0, 0, 1, -size, size,
157	"l", -mmax(w - size, 0), 0, "z"].join(","),
158	xy = [{x: X, y: Y + size * 2 + h},
159	{x: X - size * 2 - w, y: Y},
160	{x: X, y: Y - size * 2 - h},
161	{x: X + size * 2 + w, y: Y}]
162	[dir];
163	xy.path = p;
164	if (withAnimation) {
165	this.animate(xy, 500, ">");
166	} else {
167	this.attr(xy);
168	}
169	return this;
170	};
171	return res.update(x, y);
172	};	99	};

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages