deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Reply button, Comments for Merge Request diff

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-02-24 22:19:47 +02:00
parent 215a01f63c
commit d41d8ffb02
13 changed files with 53 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/views/merge_requests/show.html.haml
View file

@ -64,9 +64,6 @@
.merge-request-notes
.merge_request_notes= render "notes/notes", :tid => @merge_request.id, :tt => "merge_request"
.loading{ :style => "display:none;"}
%center= image_tag "ajax-loader.gif"
.clear
.merge-request-diffs
@ -75,3 +72,15 @@
$(function(){
MergeRequest.init();
})
= render "notes/per_line_form"
:javascript
$(document).ready(function(){
$(".line_note_link, .line_note_reply_link").live("click", function(e) {
var form = $(".per_line_form");
$(this).parent().parent().after(form);
form.find("#note_line_code").val($(this).attr("line_code"));
form.show();
return false;
});
});