diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-06-20 00:18:27 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-06-20 00:31:21 -0500 |
| commit | f7ad9e5abbfd0916a4f93e22d97cbdac17c46986 (patch) | |
| tree | 9ab2f5fec18cad9f67b6eacb63a9e9baf566d731 /app/assets/javascripts/notes.js | |
| parent | 1c64fa08aeab7e56a4bef7da24840b12eb03b9ac (diff) | |
| download | gitlab-ce-f7ad9e5abbfd0916a4f93e22d97cbdac17c46986.tar.gz | |
Fix MR "Changes" diff note up arrow to edit last note33868-fix-mr-changes-diff-note-up-arrow-editing
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33868
While in a MR "Changes" tab looking at some diff note discussions.
Clicking reply and pressing the up-arrow should edit your last comment in
that discussion.
I suspect this regressed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11173/diffs#f4bb984ec495c5cb58516785c62978f5209c39b4_179_178
where we changed the selector
Diffstat (limited to 'app/assets/javascripts/notes.js')
| -rw-r--r-- | app/assets/javascripts/notes.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index f12a35f0485..ab6322a613e 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -187,7 +187,7 @@ const normalizeNewlines = function(str) { if ($textarea.val() !== '') { return; } - myLastNote = $(`li.note[data-author-id='${gon.current_user_id}'][data-editable]:last`, $textarea.closest('.note, #notes')); + myLastNote = $(`li.note[data-author-id='${gon.current_user_id}'][data-editable]:last`, $textarea.closest('.note, .notes_holder, #notes')); if (myLastNote.length) { myLastNoteEditBtn = myLastNote.find('.js-note-edit'); return myLastNoteEditBtn.trigger('click', [true, myLastNote]); |