From 8fb70d924dbb089fdac89125664e3aa73212d8fc Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Fri, 14 Sep 2012 05:00:21 +0200 Subject: [PATCH] Rename 'notes/create_*' partials --- app/views/notes/_create_common.js.haml | 13 ------------- app/views/notes/_create_common_note.js.haml | 13 +++++++++++++ app/views/notes/_create_line.js.haml | 19 ------------------- app/views/notes/_create_per_line_note.js.haml | 19 +++++++++++++++++++ app/views/notes/create.js.haml | 4 ++-- 5 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 app/views/notes/_create_common.js.haml create mode 100644 app/views/notes/_create_common_note.js.haml delete mode 100644 app/views/notes/_create_line.js.haml create mode 100644 app/views/notes/_create_per_line_note.js.haml diff --git a/app/views/notes/_create_common.js.haml b/app/views/notes/_create_common.js.haml deleted file mode 100644 index 0a00bd4..0000000 --- a/app/views/notes/_create_common.js.haml +++ /dev/null @@ -1,13 +0,0 @@ -- if note.valid? - :plain - $(".note-form-holder .error").remove(); - $('.note-form-holder textarea').val(""); - $('.note-form-holder #preview-link').text('Preview'); - $('.note-form-holder #preview-note').hide(); - $('.note-form-holder').show(); - NoteList.appendNewNote(#{note.id}, "#{escape_javascript(render "notes/show", note: note)}"); - -- else - :plain - $(".note-form-holder").replaceWith("#{escape_javascript(render 'form')}"); - diff --git a/app/views/notes/_create_common_note.js.haml b/app/views/notes/_create_common_note.js.haml new file mode 100644 index 0000000..0a00bd4 --- /dev/null +++ b/app/views/notes/_create_common_note.js.haml @@ -0,0 +1,13 @@ +- if note.valid? + :plain + $(".note-form-holder .error").remove(); + $('.note-form-holder textarea').val(""); + $('.note-form-holder #preview-link').text('Preview'); + $('.note-form-holder #preview-note').hide(); + $('.note-form-holder').show(); + NoteList.appendNewNote(#{note.id}, "#{escape_javascript(render "notes/show", note: note)}"); + +- else + :plain + $(".note-form-holder").replaceWith("#{escape_javascript(render 'form')}"); + diff --git a/app/views/notes/_create_line.js.haml b/app/views/notes/_create_line.js.haml deleted file mode 100644 index ab862b2..0000000 --- a/app/views/notes/_create_line.js.haml +++ /dev/null @@ -1,19 +0,0 @@ -- if note.valid? - :plain - // hide and reset the form - $(".per_line_form").hide(); - $('.line-note-form-holder textarea').val(""); - - // find the reply button for this line - // (might not be there if this is the first note) - var trRpl = $("a.line_note_reply_link[data-line-code='#{note.line_code}']").closest("tr"); - if (trRpl.size() == 0) { - // 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/reply_button", line_code: note.line_code)}"); - trEl.after("#{escape_javascript(render "notes/per_line_show", note: note)}"); - } else { - // instert new note before reply button - trRpl.before("#{escape_javascript(render "notes/per_line_show", note: note)}"); - } diff --git a/app/views/notes/_create_per_line_note.js.haml b/app/views/notes/_create_per_line_note.js.haml new file mode 100644 index 0000000..ab862b2 --- /dev/null +++ b/app/views/notes/_create_per_line_note.js.haml @@ -0,0 +1,19 @@ +- if note.valid? + :plain + // hide and reset the form + $(".per_line_form").hide(); + $('.line-note-form-holder textarea').val(""); + + // find the reply button for this line + // (might not be there if this is the first note) + var trRpl = $("a.line_note_reply_link[data-line-code='#{note.line_code}']").closest("tr"); + if (trRpl.size() == 0) { + // 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/reply_button", line_code: note.line_code)}"); + trEl.after("#{escape_javascript(render "notes/per_line_show", note: note)}"); + } else { + // instert new note before reply button + trRpl.before("#{escape_javascript(render "notes/per_line_show", note: note)}"); + } diff --git a/app/views/notes/create.js.haml b/app/views/notes/create.js.haml index 8f631f3..0386659 100644 --- a/app/views/notes/create.js.haml +++ b/app/views/notes/create.js.haml @@ -1,7 +1,7 @@ - if @note.line_code - = render "create_line", note: @note + = render "create_per_line_note", note: @note - else - = render "create_common", note: @note + = render "create_common_note", note: @note -# Enable submit button :plain -- libgit2 0.21.2