diff options
author | Simon Knox <simon@gitlab.com> | 2018-09-10 21:44:44 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-09-10 21:44:44 +0000 |
commit | a2f03fdc96bed7084ad620f635ddc3705684fbc7 (patch) | |
tree | 99965b0b2dd2c68bb75cfd2153c0b9c123c5a9c4 /app/assets/javascripts | |
parent | ebd8931e2bb4c81e65bbfa2045831387ebea45ea (diff) | |
download | gitlab-ce-a2f03fdc96bed7084ad620f635ddc3705684fbc7.tar.gz |
add tooltip directive from gitlab-ui
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/commons/gitlab_ui.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/diffs/components/diff_gutter_avatars.vue | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/assets/javascripts/commons/gitlab_ui.js b/app/assets/javascripts/commons/gitlab_ui.js index ee274058e0f..14c2db24205 100644 --- a/app/assets/javascripts/commons/gitlab_ui.js +++ b/app/assets/javascripts/commons/gitlab_ui.js @@ -3,8 +3,10 @@ import progressBar from '@gitlab-org/gitlab-ui/dist/components/base/progress_bar import modal from '@gitlab-org/gitlab-ui/dist/components/base/modal'; import dModal from '@gitlab-org/gitlab-ui/dist/directives/modal'; +import dTooltip from '@gitlab-org/gitlab-ui/dist/directives/tooltip'; Vue.component('gl-progress-bar', progressBar); Vue.component('gl-ui-modal', modal); Vue.directive('gl-modal', dModal); +Vue.directive('gl-tooltip', dTooltip); diff --git a/app/assets/javascripts/diffs/components/diff_gutter_avatars.vue b/app/assets/javascripts/diffs/components/diff_gutter_avatars.vue index 7e50a0aed84..a02c41f39ab 100644 --- a/app/assets/javascripts/diffs/components/diff_gutter_avatars.vue +++ b/app/assets/javascripts/diffs/components/diff_gutter_avatars.vue @@ -1,15 +1,11 @@ <script> import { mapActions } from 'vuex'; import Icon from '~/vue_shared/components/icon.vue'; -import tooltip from '~/vue_shared/directives/tooltip'; import { pluralize, truncate } from '~/lib/utils/text_utility'; import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue'; import { COUNT_OF_AVATARS_IN_GUTTER, LENGTH_OF_AVATAR_TOOLTIP } from '../constants'; export default { - directives: { - tooltip, - }, components: { Icon, UserAvatarImage, @@ -91,10 +87,10 @@ export default { @click.native="toggleDiscussions" /> <span - v-tooltip + v-gl-tooltip v-if="moreText" :title="moreText" - class="diff-comments-more-count has-tooltip js-diff-comment-avatar js-diff-comment-plus" + class="diff-comments-more-count js-diff-comment-avatar js-diff-comment-plus" data-container="body" data-placement="top" role="button" |