Fix pager loading on every page in application

4 files changed, 4 insertions, 24 deletions

diff --git a/app/assets/javascripts/dashboard.js.coffee b/app/assets/javascripts/dashboard.js.coffee
index b0ae6bf8a02..f15d09dd475 100644
--- a/app/assets/javascripts/dashboard.js.coffee
+++ b/app/assets/javascripts/dashboard.js.coffee
@@ -1,7 +1,4 @@
-$ ->
-  dashboardPage()
-
-dashboardPage = ->
+window.dashboardPage = ->
   Pager.init 20, true
   $(".event_filter_link").bind "click", (event) ->
     event.preventDefault()
diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml
index abbe3101fc3..1a66ba4fb37 100644
--- a/app/views/dashboard/index.html.haml
+++ b/app/views/dashboard/index.html.haml
@@ -7,3 +7,6 @@
 
 - else
   = render "zero_authorized_projects"
+
+:javascript
+  dashboardPage();
diff --git a/app/views/keys/create.js.haml b/app/views/keys/create.js.haml
deleted file mode 100644
index 1dccf6fdb91..00000000000
--- a/app/views/keys/create.js.haml
+++ /dev/null
@@ -1,9 +0,0 @@
-- if @key.valid?
-  :plain
-    $("#new_key_dialog").dialog("close");
-    $("#keys-table .data").append("#{escape_javascript(render(partial: 'show', locals: {key: @key}))}");
-    $("#no_ssh_key_defined").hide();
-- else
-  :plain
-    $("#new_key_dialog").empty();
-    $("#new_key_dialog").append("#{escape_javascript(render('form'))}");
diff --git a/app/views/keys/new.js.haml b/app/views/keys/new.js.haml
deleted file mode 100644
index 86e9db030c5..00000000000
--- a/app/views/keys/new.js.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-:plain
-  var new_key_dialog = $("<div id='new_key_dialog'></div>");
-  new_key_dialog.html("#{escape_javascript(render('form'))}");
-  $(new_key_dialog).dialog({
-    width: 350,
-    resizable: false,
-    draggable: false,
-    title: "Add new public key",
-    close: function(event, ui) { $("#new_key_dialog").remove();},
-    modal: true
-  });