Commit 37771eb4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'bug/pager_load' of dev.gitlabhq.com:gitlab/gitlabhq

parents eadad855 dd20da1b
$ -> window.dashboardPage = ->
dashboardPage()
dashboardPage = ->
Pager.init 20, true Pager.init 20, true
$(".event_filter_link").bind "click", (event) -> $(".event_filter_link").bind "click", (event) ->
event.preventDefault() event.preventDefault()
......
...@@ -7,3 +7,6 @@ ...@@ -7,3 +7,6 @@
- else - else
= render "zero_authorized_projects" = render "zero_authorized_projects"
:javascript
dashboardPage();
- 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'))}");
: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
});
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment