Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 9 deletions

diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue
index c3e87c3678f..826e7e5a3d0 100644
--- a/app/assets/javascripts/notes/components/noteable_note.vue
+++ b/app/assets/javascripts/notes/components/noteable_note.vue
@@ -1,12 +1,12 @@
 <script>
 import { GlSprintf, GlAvatarLink, GlAvatar } from '@gitlab/ui';
+import $ from 'jquery';
 import { escape, isEmpty } from 'lodash';
 import { mapGetters, mapActions } from 'vuex';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal';
 import { INLINE_DIFF_LINES_KEY } from '~/diffs/constants';
 import { createAlert } from '~/flash';
-import { isInViewport, scrollToElement } from '~/lib/utils/common_utils';
 import { HTTP_STATUS_GONE } from '~/lib/utils/http_status';
 import { ignoreWhilePending } from '~/lib/utils/ignore_while_pending';
 import { truncateSha } from '~/lib/utils/text_utility';
@@ -223,14 +223,14 @@ export default {
       if (noteId === this.note.id) {
         this.isEditing = true;
         this.setSelectedCommentPositionHover();
-        this.scrollToNoteIfNeeded(this.$el);
+        this.scrollToNoteIfNeeded($(this.$el));
       }
     });
   },
 
   mounted() {
     if (this.isTarget && this.shouldScrollToNote) {
-      this.scrollToNoteIfNeeded(this.$el);
+      this.scrollToNoteIfNeeded($(this.$el));
     }
   },
 
@@ -240,15 +240,11 @@ export default {
       'removeNote',
       'updateNote',
       'toggleResolveNote',
+      'scrollToNoteIfNeeded',
       'updateAssignees',
       'setSelectedCommentPositionHover',
       'updateDiscussionPosition',
     ]),
-    scrollToNoteIfNeeded(el) {
-      if (!isInViewport(el)) {
-        scrollToElement(el);
-      }
-    },
     editHandler() {
       this.isEditing = true;
       this.setSelectedCommentPositionHover();
diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js
index a527936063a..d290a8ccb84 100644
--- a/app/assets/javascripts/notes/stores/actions.js
+++ b/app/assets/javascripts/notes/stores/actions.js
@@ -11,7 +11,7 @@ import { confidentialWidget } from '~/sidebar/components/confidential/sidebar_co
 import updateIssueLockMutation from '~/sidebar/queries/update_issue_lock.mutation.graphql';
 import updateMergeRequestLockMutation from '~/sidebar/queries/update_merge_request_lock.mutation.graphql';
 import loadAwardsHandler from '~/awards_handler';
-import { isInMRPage } from '~/lib/utils/common_utils';
+import { isInViewport, scrollToElement, isInMRPage } from '~/lib/utils/common_utils';
 import Poll from '~/lib/utils/poll';
 import { create } from '~/lib/utils/recurrence';
 import { mergeUrlParams } from '~/lib/utils/url_utility';
@@ -681,6 +681,12 @@ export const toggleAwardRequest = ({ dispatch }, data) => {
   });
 };
 
+export const scrollToNoteIfNeeded = (context, el) => {
+  if (!isInViewport(el[0])) {
+    scrollToElement(el);
+  }
+};
+
 export const fetchDiscussionDiffLines = ({ commit }, discussion) =>
   axios.get(discussion.truncated_diff_lines_path).then(({ data }) => {
     commit(types.SET_DISCUSSION_DIFF_LINES, {