diff options
| -rw-r--r-- | app/assets/javascripts/notes.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/notes_spec.js | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 7f163e7e0e8..b111c117556 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -415,7 +415,7 @@ export default class Notes { this.note_ids.push(noteEntity.id); form = $form || $(`.js-discussion-note-form[data-discussion-id="${noteEntity.discussion_id}"]`); - row = form.length ? form.closest('tr') : $(`#${noteEntity.discussion_line_code}`); + row = (form.length || !noteEntity.discussion_line_code) ? form.closest('tr') : $(`#${noteEntity.discussion_line_code}`); if (noteEntity.on_image) { row = form; diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js index 8514c7ac5a1..d7aa7a3d9e6 100644 --- a/spec/javascripts/notes_spec.js +++ b/spec/javascripts/notes_spec.js @@ -380,13 +380,9 @@ import '~/notes'; document.body.appendChild(line); $form.closest.and.returnValues($form); - spyOn(document, 'getElementById').and.callThrough(); - spyOn($.fn, 'after').and.callThrough(); Notes.prototype.renderDiscussionNote.call(notes, note, $form); - expect(document.getElementById).toHaveBeenCalledWith(note.discussion_line_code); - expect($.fn.after).toHaveBeenCalled(); expect(line.nextSibling.outerHTML).toEqual(note.diff_discussion_html); }); }); |