diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-11 03:08:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-11 03:08:50 +0300 |
commit | ced6c9ae9a9a80c884cafbea9c717b578dfac326 (patch) | |
tree | 7cb0e78e0639df4b2b79be94ddae77c304bd3357 /app/assets/javascripts/batch_comments | |
parent | 02c3b2af448be6a5004e8d833cbcbf8e5f185210 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/batch_comments')
-rw-r--r-- | app/assets/javascripts/batch_comments/components/draft_note.vue | 8 | ||||
-rw-r--r-- | app/assets/javascripts/batch_comments/components/preview_item.vue | 15 |
2 files changed, 10 insertions, 13 deletions
diff --git a/app/assets/javascripts/batch_comments/components/draft_note.vue b/app/assets/javascripts/batch_comments/components/draft_note.vue index 5564bca6df0..b480cf098f2 100644 --- a/app/assets/javascripts/batch_comments/components/draft_note.vue +++ b/app/assets/javascripts/batch_comments/components/draft_note.vue @@ -3,7 +3,6 @@ import { mapActions, mapGetters, mapState } from 'vuex'; import { GlButton } from '@gitlab/ui'; import NoteableNote from '~/notes/components/noteable_note.vue'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import PublishButton from './publish_button.vue'; export default { @@ -12,7 +11,6 @@ export default { PublishButton, GlButton, }, - mixins: [glFeatureFlagsMixin()], props: { draft: { type: Object, @@ -63,14 +61,14 @@ export default { this.isEditingDraft = false; }, handleMouseEnter(draft) { - if (this.glFeatures.multilineComments && draft.position) { + if (draft.position) { this.setSelectedCommentPositionHover(draft.position.line_range); } }, handleMouseLeave(draft) { - // Even though position isn't used here we still don't want to unecessarily call a mutation + // Even though position isn't used here we still don't want to unnecessarily call a mutation // The lack of position tells us that highlighting is irrelevant in this context - if (this.glFeatures.multilineComments && draft.position) { + if (draft.position) { this.setSelectedCommentPositionHover(); } }, diff --git a/app/assets/javascripts/batch_comments/components/preview_item.vue b/app/assets/javascripts/batch_comments/components/preview_item.vue index 589734df795..7f3892ae066 100644 --- a/app/assets/javascripts/batch_comments/components/preview_item.vue +++ b/app/assets/javascripts/batch_comments/components/preview_item.vue @@ -3,7 +3,6 @@ import { mapGetters } from 'vuex'; import { GlSprintf, GlIcon } from '@gitlab/ui'; import { IMAGE_DIFF_POSITION_TYPE } from '~/diffs/constants'; import { sprintf, __ } from '~/locale'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { getStartLineNumber, getEndLineNumber, @@ -16,7 +15,7 @@ export default { GlIcon, GlSprintf, }, - mixins: [resolvedStatusMixin, glFeatureFlagsMixin()], + mixins: [resolvedStatusMixin], props: { draft: { type: Object, @@ -71,6 +70,10 @@ export default { return this.draft.position || this.discussion.position; }, startLineNumber() { + if (this.position?.position_type === IMAGE_DIFF_POSITION_TYPE) { + // eslint-disable-next-line @gitlab/require-i18n-strings + return `${this.position.x}x ${this.position.y}y`; + } return getStartLineNumber(this.position?.line_range); }, endLineNumber() { @@ -90,16 +93,12 @@ export default { <span> <span class="review-preview-item-header"> <gl-icon class="flex-shrink-0" :name="iconName" /> - <span - class="bold text-nowrap" - :class="{ 'gl-align-items-center': glFeatures.multilineComments }" - > + <span class="bold text-nowrap gl-align-items-center"> <span class="review-preview-item-header-text block-truncated"> {{ titleText }} </span> <template v-if="showLinePosition"> - <template v-if="!glFeatures.multilineComments">:{{ linePosition }}</template> - <template v-else-if="startLineNumber === endLineNumber"> + <template v-if="startLineNumber === endLineNumber"> :<span :class="getLineClasses(startLineNumber)">{{ startLineNumber }}</span> </template> <gl-sprintf v-else :message="__(':%{startLine} to %{endLine}')"> |