Don’t depend on unique class.

2 files changed, 5 insertions, 5 deletions

diff --git a/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6 b/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
index 9c2dc158a14..a0c859ab7f6 100644
--- a/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
+++ b/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
@@ -56,7 +56,7 @@
         }
 
         if (nextUnresolvedDiscussionId) {
-          $.scrollTo(`.${nextUnresolvedDiscussionId}`, {
+          $.scrollTo(`.discussion[data-discussion-id="${nextUnresolvedDiscussionId}"]`, {
             offset: -($('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight())
           });
         }
diff --git a/app/assets/javascripts/diff_notes/services/resolve.js.es6 b/app/assets/javascripts/diff_notes/services/resolve.js.es6
index 64d44085a64..50392e76fbe 100644
--- a/app/assets/javascripts/diff_notes/services/resolve.js.es6
+++ b/app/assets/javascripts/diff_notes/services/resolve.js.es6
@@ -83,13 +83,13 @@
     }
 
     updateUpdatedHtml(discussionId, data) {
-      const $discussionHeadline = $(`.${discussionId} .js-discussion-headline`);
+      const $discussionHeadline = $(`.discussion[data-discussion-id="${discussionId}"] .js-discussion-headline`);
 
-      if (data.updated_html) {
+      if (data.discussion_headline_html) {
         if ($discussionHeadline.length) {
-          $discussionHeadline.replaceWith(data.updated_html);
+          $discussionHeadline.replaceWith(data.discussion_headline_html);
         } else {
-          $(`.${discussionId} .discussion-header`).append(data.updated_html);
+          $(`.discussion[data-discussion-id="${discussionId}"] .discussion-header`).append(data.discussion_headline_html);
         }
       } else {
          $discussionHeadline.remove();