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

Inline diff_notes_reply_button partial

Browse source
This commit is contained in:
Riyad Preukschas 2012-11-17 20:34:52 +01:00
parent 3bc507e5c5
commit 6d5c29dc2b
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/views/notes/_create_diff_note.js.haml
View file

@ -11,8 +11,7 @@
// find the commented line ...
var trEl = $(".#{note.line_code}").parent();
// ... and insert the note and the reply button after it
trEl.after("#{escape_javascript(render "notes/diff_notes_reply_button", note: note)}");
trEl.after("#{escape_javascript(render "notes/diff_note", note: note)}");
trEl.after("#{escape_javascript(render "notes/diff_notes_with_reply", notes: [note])}");
} else {
// instert new note before reply button
trRpl.before("#{escape_javascript(render "notes/diff_note", note: note)}");

10
app/views/notes/_diff_notes_reply_button.html.haml
View file

@ -1,10 +0,0 @@
%tr.line_notes_row.reply
%td{colspan: 3}
= link_to "javascript:;",
class: "line_note_reply_link js-note-add-to-diff-line",
data: { line_code: note.line_code,
noteable_type: note.noteable_type,
noteable_id: note.noteable_id },
title: "Add a comment to this line" do
%i.icon-comment
Reply

14
app/views/notes/_diff_notes_with_reply.html.haml
View file

@ -1,3 +1,15 @@
- notes.each do |note|
= render "notes/diff_note", note: note
= render "notes/diff_notes_reply_button", note: notes.first
-# reply button
- note = notes.first # example note
%tr.line_notes_row.reply
%td{colspan: 3}
= link_to "javascript:;",
class: "line_note_reply_link js-note-add-to-diff-line",
data: { line_code: note.line_code,
noteable_type: note.noteable_type,
noteable_id: note.noteable_id },
title: "Add a comment to this line" do
%i.icon-comment
Reply