summaryrefslogtreecommitdiff
path: root/app/views/projects/graphs
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/projects/graphs')
-rw-r--r--app/views/projects/graphs/show.html.haml29
-rw-r--r--app/views/projects/graphs/show.js.haml19
2 files changed, 15 insertions, 33 deletions
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index 8e4548f26d0..c2878e13e7c 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -3,15 +3,10 @@
%h3.page-title
%i.icon-spinner.icon-spin
Building repository graph.
- %p Please wait a moment, this page will automatically refresh when ready.
+ %p.slead Please wait a moment, this page will automatically refresh when ready.
-.stat-graph
+.stat-graph.hide
.header.clearfix
- .pull-right
- %select
- %option{:value => "commits"} Commits
- %option{:value => "additions"} Additions
- %option{:value => "deletions"} Deletions
%h3#date_header.page-title
%p.light
Commits to #{@project.default_branch}, excluding merge commits. Limited by 6,000 commits
@@ -21,15 +16,21 @@
#contributors.clearfix
%ol.contributors-list.clearfix
-:javascript
- $(".stat-graph").hide();
- $.ajax({
+
+:coffeescript
+ $.ajax
type: "GET",
url: location.href,
- complete: function() {
+ success: (data) ->
+ graph = new ContributorsStatGraph()
+ graph.init(data)
+
+ $("#brush_change").change ->
+ graph.change_date_header()
+ graph.redraw_authors()
+
$(".stat-graph").fadeIn();
$(".loading-graph").hide();
- },
- dataType: "script"
- });
+ dataType: "json"
+
diff --git a/app/views/projects/graphs/show.js.haml b/app/views/projects/graphs/show.js.haml
deleted file mode 100644
index dcf6cacdceb..00000000000
--- a/app/views/projects/graphs/show.js.haml
+++ /dev/null
@@ -1,19 +0,0 @@
-- if @success
- :plain
- controller = new ContributorsStatGraph
- controller.init(#{@log})
-
- $("select").change( function () {
- var field = $(this).val()
- controller.set_current_field(field)
- controller.redraw_master()
- controller.redraw_authors()
- })
-
- $("#brush_change").change( function () {
- controller.change_date_header()
- controller.redraw_authors()
- })
-- else
- :plain
- $('.stat-graph').replaceWith('<div class="alert alert-danger">Failed to load graph</div>')