diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-11-17 15:09:22 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-11-17 15:09:22 +0000 |
| commit | df0110ba81a86b3e066c8b703e1c26d6d05a75da (patch) | |
| tree | ffebbd5ff5812ebaccbed116319a413345a2f1ba /app/assets | |
| parent | 1c040b3f0a3ecb18fc8fdea3cf99b70edad8d873 (diff) | |
| parent | c8e53d4467e1e8cce4db04aafba00d55f014e283 (diff) | |
| download | gitlab-ce-df0110ba81a86b3e066c8b703e1c26d6d05a75da.tar.gz | |
Merge branch 'rs-revert-gh-9820' into 'master'
Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"
This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing
changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a.
Reverts https://github.com/gitlabhq/gitlabhq/pull/9820
See merge request !1804
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index b0682f16845..ea75c656bcc 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -29,6 +29,7 @@ class @Notes $(document).on "ajax:success", "form.edit_note", @updateNote # Edit note link + $(document).on "click", ".js-note-edit", @showEditForm $(document).on "click", ".note-edit-cancel", @cancelEdit # Reopen and close actions for Issue/MR combined with note form submit @@ -66,6 +67,7 @@ class @Notes $(document).off "ajax:success", ".js-main-target-form" $(document).off "ajax:success", ".js-discussion-note-form" $(document).off "ajax:success", "form.edit_note" + $(document).off "click", ".js-note-edit" $(document).off "click", ".note-edit-cancel" $(document).off "click", ".js-note-delete" $(document).off "click", ".js-note-attachment-delete" @@ -285,14 +287,13 @@ class @Notes Adds a hidden div with the original content of the note to fill the edit note form with if the user cancels ### - showEditForm: (note, formHTML) -> - nodeText = note.find(".note-text"); - nodeText.hide() - note.find('.note-edit-form').remove() - nodeText.after(formHTML) + showEditForm: (e) -> + e.preventDefault() + note = $(this).closest(".note") note.find(".note-body > .note-text").hide() note.find(".note-header").hide() - form = note.find(".note-edit-form") + base_form = note.find(".note-edit-form") + form = base_form.clone().insertAfter(base_form) form.addClass('current-note-edit-form gfm-form') form.find('.div-dropzone').remove() |