diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-02 15:11:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-02 15:11:04 +0300 |
| commit | ed509186782d16d2bbcb34ac73303e8cb3a9d5a2 (patch) | |
| tree | 4ab3bbb33b37e9e4c0f73627617ea6b0c7d0d7f7 /app/assets/javascripts/notes | |
| parent | 44837830832a41a6fe6360aca18e50826c723fd1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
3 files changed, 19 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_notes.vue b/app/assets/javascripts/notes/components/discussion_notes.vue index 2dbc9b10836..3e8cddc3174 100644 --- a/app/assets/javascripts/notes/components/discussion_notes.vue +++ b/app/assets/javascripts/notes/components/discussion_notes.vue @@ -52,6 +52,11 @@ export default { required: false, default: false, }, + shouldScrollToNote: { + type: Boolean, + required: false, + default: true, + }, }, computed: { ...mapGetters(['userCanReply']), @@ -133,6 +138,7 @@ export default { :discussion-root="true" :discussion-resolve-path="discussion.resolve_path" :is-overview-tab="isOverviewTab" + :should-scroll-to-note="shouldScrollToNote" @handleDeleteNote="$emit('deleteNote')" @startReplying="$emit('startReplying')" > @@ -183,6 +189,7 @@ export default { :discussion-root="index === 0" :discussion-resolve-path="discussion.resolve_path" :is-overview-tab="isOverviewTab" + :should-scroll-to-note="shouldScrollToNote" @handleDeleteNote="$emit('deleteNote')" > <template #avatar-badge> diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index 50d166b6db5..b668d6ec182 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -73,6 +73,11 @@ export default { required: false, default: false, }, + shouldScrollToNote: { + type: Boolean, + required: false, + default: true, + }, }, data() { return { @@ -288,6 +293,7 @@ export default { :line="line" :should-group-replies="shouldGroupReplies" :is-overview-tab="isOverviewTab" + :should-scroll-to-note="shouldScrollToNote" @startReplying="showReplyForm" @deleteNote="deleteNoteHandler" > diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue index c4b3111b919..8ce0c2f8648 100644 --- a/app/assets/javascripts/notes/components/noteable_note.vue +++ b/app/assets/javascripts/notes/components/noteable_note.vue @@ -91,6 +91,11 @@ export default { required: false, default: false, }, + shouldScrollToNote: { + type: Boolean, + required: false, + default: true, + }, }, data() { return { @@ -222,7 +227,7 @@ export default { }, mounted() { - if (this.isTarget) { + if (this.isTarget && this.shouldScrollToNote) { this.scrollToNoteIfNeeded($(this.$el)); } }, |