Commit 03239dd4 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch '229023-migrate-sidebar-epic-tooltip' into 'master'

Migrate epic sidebar tooltip to GlTooltip

See merge request gitlab-org/gitlab!45392
parents 3c506f6a 10639925
---
title: Replace tooltip with GLTooltip in epic sidebar datepicker
merge_request: 45392
author:
type: other
<script> <script>
import { uniqueId } from 'lodash'; import { uniqueId } from 'lodash';
import { GlLoadingIcon, GlButton, GlIcon } from '@gitlab/ui'; import { GlLoadingIcon, GlButton, GlIcon, GlTooltipDirective } from '@gitlab/ui';
import { __, s__ } from '~/locale'; import { __, s__ } from '~/locale';
import { dateInWords } from '~/lib/utils/datetime_utility'; import { dateInWords } from '~/lib/utils/datetime_utility';
import tooltip from '~/vue_shared/directives/tooltip';
import popover from '~/vue_shared/directives/popover'; import popover from '~/vue_shared/directives/popover';
import DatePicker from '~/vue_shared/components/pikaday.vue'; import DatePicker from '~/vue_shared/components/pikaday.vue';
import CollapsedCalendarIcon from '~/vue_shared/components/sidebar/collapsed_calendar_icon.vue'; import CollapsedCalendarIcon from '~/vue_shared/components/sidebar/collapsed_calendar_icon.vue';
...@@ -16,7 +15,7 @@ const pickerLabel = __('Fixed date'); ...@@ -16,7 +15,7 @@ const pickerLabel = __('Fixed date');
export default { export default {
directives: { directives: {
tooltip, GlTooltip: GlTooltipDirective,
popover, popover,
}, },
components: { components: {
...@@ -268,12 +267,10 @@ export default { ...@@ -268,12 +267,10 @@ export default {
</span> </span>
</div> </div>
<abbr <abbr
v-tooltip v-gl-tooltip.bottom.html
:title="dateFromMilestonesTooltip" :title="dateFromMilestonesTooltip"
:class="{ 'is-option-selected': !selectedDateIsFixed }" :class="{ 'is-option-selected': !selectedDateIsFixed }"
class="value-type-dynamic text-secondary d-flex gl-mt-3" class="value-type-dynamic text-secondary d-flex gl-mt-3"
data-placement="bottom"
data-html="true"
> >
<input <input
v-if="canUpdate" v-if="canUpdate"
......
...@@ -77,10 +77,7 @@ exports[`SidebarDatePicker renders expected template 1`] = ` ...@@ -77,10 +77,7 @@ exports[`SidebarDatePicker renders expected template 1`] = `
<abbr <abbr
class="value-type-dynamic text-secondary d-flex gl-mt-3" class="value-type-dynamic text-secondary d-flex gl-mt-3"
data-html="true" title="Select an issue with milestone to set date"
data-original-title="Select an issue with milestone to set date"
data-placement="bottom"
title=""
> >
<input <input
name="datetype_test" name="datetype_test"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment