summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-11-22 00:42:55 +0100
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-03 22:51:56 +0100
commit918dc873768359cbb7de5e83bc900fb0dacce938 (patch)
tree9b9159fbd4e7b3d7faa69af415863a09028b402d
parentfac4e3f2e5ea62ed4b92722f5eb1a650ccccf4b1 (diff)
downloadgitlab-ce-918dc873768359cbb7de5e83bc900fb0dacce938.tar.gz
Move code for appending a discussion note to notes JS
-rw-r--r--app/assets/javascripts/notes.js14
-rw-r--r--app/views/notes/_create_discussion_note.js.haml14
2 files changed, 17 insertions, 11 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 7f4bd330839..fec91c1fdb5 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -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).
*
diff --git a/app/views/notes/_create_discussion_note.js.haml b/app/views/notes/_create_discussion_note.js.haml
index 968ef0cfbee..91ba8593d45 100644
--- a/app/views/notes/_create_discussion_note.js.haml
+++ b/app/views/notes/_create_discussion_note.js.haml
@@ -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)}");