summaryrefslogtreecommitdiffstats
path: root/app/views/repositories
diff options
context:
space:
mode:
authorEtienne Massip <etienne.massip@gmail.com>2012-02-04 14:02:31 +0000
committerEtienne Massip <etienne.massip@gmail.com>2012-02-04 14:02:31 +0000
commitb9c26d6ddcd3b2afa91637d0f81738e7d2e6c17a (patch)
tree57f5e7cf2635d624410bf30a5ca44f179c6d61ba /app/views/repositories
parentbe050be5e5efb06910c8027703ee5dd4ddccf56f (diff)
downloadredmine-b9c26d6ddcd3b2afa91637d0f81738e7d2e6c17a.tar.gz
redmine-b9c26d6ddcd3b2afa91637d0f81738e7d2e6c17a.zip
Revision graph code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8773 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/repositories')
-rw-r--r--app/views/repositories/_revision_graph.html.erb17
-rw-r--r--app/views/repositories/_revisions.html.erb18
2 files changed, 17 insertions, 18 deletions
diff --git a/app/views/repositories/_revision_graph.html.erb b/app/views/repositories/_revision_graph.html.erb
index 6dcaa3f2d..5b0ea73de 100644
--- a/app/views/repositories/_revision_graph.html.erb
+++ b/app/views/repositories/_revision_graph.html.erb
@@ -1,13 +1,12 @@
-<%= javascript_include_tag "raphael.js" %>
-<script type="text/javascript" charset="utf-8">
- var chunk = {commits:<%= commits.values.to_json.html_safe %>}
-</script>
-<%= javascript_include_tag "revision_graph.js" %>
+<%= javascript_include_tag 'raphael.js' %>
+<%= javascript_include_tag 'revision_graph.js' %>
-<script type="text/javascript">
- Event.observe(window,"load", function(){
- branchGraph(document.getElementById("holder"));
- })
+<script type="text/javascript" charset="utf-8">
+ Event.observe(window, 'load', function(){
+ branchGraph(
+ document.getElementById("holder"),
+ <%= commits.to_json.html_safe %>);
+ });
</script>
<div id="holder" class="graph"></div>
diff --git a/app/views/repositories/_revisions.html.erb b/app/views/repositories/_revisions.html.erb
index d9dfaf2b9..77744dae1 100644
--- a/app/views/repositories/_revisions.html.erb
+++ b/app/views/repositories/_revisions.html.erb
@@ -24,18 +24,18 @@
<% 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,
- href_base
- )
+ revisions,
+ @repository.branches) do |scmid|
+ url_for(
+ :controller => 'repositories',
+ :action => 'revision',
+ :id => project,
+ :repository_id => @repository.identifier_param,
+ :rev => scmid)
+ end
} %>
</td>
<% end %>