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

Move code for appending a discussion note to notes JS

Browse source
This commit is contained in:
Riyad Preukschas 2012-11-22 00:42:55 +01:00
parent fac4e3f2e5
commit 918dc87376
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/assets/javascripts/notes.js
View file

@ -377,6 +377,20 @@ var NoteList = {
this.updateVotes();
},
appendNewDiscussionNote: function(discussionId, diffRowHtml, noteHtml) {
// is this the first note of discussion?
var row = $("form[rel='"+discussionId+"']").closest("tr");
if (row.is(".js-temp-notes-holder")) {
// insert the note and the reply button after it
row.after(diffRowHtml);
// will be added again below
row.next().find(".note").remove();
}
// append new note to all matching discussions
$(".notes[rel='"+discussionId+"']").append(noteHtml);
},
/**
* Recalculates the votes and updates them (if they are displayed at all).
*

14
app/views/notes/_create_discussion_note.js.haml
View file

@ -1,13 +1,5 @@
- if note.valid?
:plain
// is this the first note of discussion?
var row = $("form[rel='#{note.discussion_id}']").closest("tr");
if (row.is(".js-temp-notes-holder")) {
// insert the note and the reply button after it
row.after("#{escape_javascript(render "notes/diff_notes_with_reply", notes: [note])}");
// will be added again below
row.next().find(".note").remove();
}
// append new note to all discussions
$(".notes[rel='#{note.discussion_id}']").append("#{escape_javascript(render "notes/note", note: note)}");
NoteList.appendNewDiscussionNote("#{note.discussion_id}",
"#{escape_javascript(render "notes/diff_notes_with_reply", notes: [note])}",
"#{escape_javascript(render "notes/note", note: note)}");