Commit 001cb5aa authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'gl-ui-tooltip-2' into 'master'

Remove gitlab-ui's tooltip from global

See merge request gitlab-org/gitlab-ce!22814
parents 3429d357 701f0f5e
import Vue from 'vue'; import Vue from 'vue';
import { GlLoadingIcon, GlTooltipDirective } from '@gitlab-org/gitlab-ui'; import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
Vue.component('gl-loading-icon', GlLoadingIcon); Vue.component('gl-loading-icon', GlLoadingIcon);
Vue.directive('gl-tooltip', GlTooltipDirective);
...@@ -3,6 +3,7 @@ import { mapActions } from 'vuex'; ...@@ -3,6 +3,7 @@ import { mapActions } from 'vuex';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import { pluralize, truncate } from '~/lib/utils/text_utility'; import { pluralize, truncate } from '~/lib/utils/text_utility';
import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue'; import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue';
import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
import { COUNT_OF_AVATARS_IN_GUTTER, LENGTH_OF_AVATAR_TOOLTIP } from '../constants'; import { COUNT_OF_AVATARS_IN_GUTTER, LENGTH_OF_AVATAR_TOOLTIP } from '../constants';
export default { export default {
...@@ -10,6 +11,9 @@ export default { ...@@ -10,6 +11,9 @@ export default {
Icon, Icon,
UserAvatarImage, UserAvatarImage,
}, },
directives: {
GlTooltip: GlTooltipDirective,
},
props: { props: {
discussions: { discussions: {
type: Array, type: Array,
......
...@@ -5,7 +5,7 @@ import Icon from '~/vue_shared/components/icon.vue'; ...@@ -5,7 +5,7 @@ import Icon from '~/vue_shared/components/icon.vue';
import GfmAutoComplete from '~/gfm_auto_complete'; import GfmAutoComplete from '~/gfm_auto_complete';
import { __, s__ } from '~/locale'; import { __, s__ } from '~/locale';
import Api from '~/api'; import Api from '~/api';
import { GlModal } from '@gitlab-org/gitlab-ui'; import { GlModal, GlTooltipDirective } from '@gitlab-org/gitlab-ui';
import eventHub from './event_hub'; import eventHub from './event_hub';
import EmojiMenuInModal from './emoji_menu_in_modal'; import EmojiMenuInModal from './emoji_menu_in_modal';
...@@ -16,6 +16,9 @@ export default { ...@@ -16,6 +16,9 @@ export default {
Icon, Icon,
GlModal, GlModal,
}, },
directives: {
GlTooltip: GlTooltipDirective,
},
props: { props: {
currentEmoji: { currentEmoji: {
type: String, type: String,
......
<script> <script>
import { calculateRemainingMilliseconds, formatTime } from '~/lib/utils/datetime_utility'; import { calculateRemainingMilliseconds, formatTime } from '~/lib/utils/datetime_utility';
import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
/** /**
* Counts down to a given end date. * Counts down to a given end date.
*/ */
export default { export default {
directives: {
GlTooltip: GlTooltipDirective,
},
props: { props: {
endDateString: { endDateString: {
type: String, type: String,
......
---
title: Remove gitlab-ui's tooltip from global
merge_request:
author:
type: performance
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