Fix pager loading on every page in application

Dmitriy Zaporozhets
1 parent abc2bdc3
Showing 4 changed files with 4 additions and 24 deletions Show diff stats
app/assets/javascripts/dashboard.js.coffee
app/views/dashboard/index.html.haml
app/views/keys/create.js.haml
app/views/keys/new.js.haml
-$ ->
-  dashboardPage()
-
-dashboardPage = ->
+window.dashboardPage = ->
   Pager.init 20, true
   $(".event_filter_link").bind "click", (event) ->
     event.preventDefault()
@@ -7,3 +7,6 @@
  
 - else
   = render "zero_authorized_projects"
+
+:javascript
+  dashboardPage();
@@ -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'))}");
@@ -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
-  });
1		-$ ->
2		- dashboardPage()
3		-
4		-dashboardPage = ->
	1	+window.dashboardPage = ->
5	2	Pager.init 20, true
6	3	$(".event_filter_link").bind "click", (event) ->
7	4	event.preventDefault()
...	...
...	...	@@ -7,3 +7,6 @@
7	7
8	8	- else
9	9	= render "zero_authorized_projects"
	10	+
	11	+:javascript
	12	+ dashboardPage();
...	...
...	...	@@ -1,9 +0,0 @@
1		-- if @key.valid?
2		- :plain
3		- $("#new_key_dialog").dialog("close");
4		- $("#keys-table .data").append("#{escape_javascript(render(partial: 'show', locals: {key: @key}))}");
5		- $("#no_ssh_key_defined").hide();
6		-- else
7		- :plain
8		- $("#new_key_dialog").empty();
9		- $("#new_key_dialog").append("#{escape_javascript(render('form'))}");
...	...	@@ -1,11 +0,0 @@
1		-:plain
2		- var new_key_dialog = $("<div id='new_key_dialog'></div>");
3		- new_key_dialog.html("#{escape_javascript(render('form'))}");
4		- $(new_key_dialog).dialog({
5		- width: 350,
6		- resizable: false,
7		- draggable: false,
8		- title: "Add new public key",
9		- close: function(event, ui) { $("#new_key_dialog").remove();},
10		- modal: true
11		- });