Commit dd79368b authored by Brandon Labuschagne's avatar Brandon Labuschagne

Merge branch...

Merge branch '228989-replace-vue_shared-tooltip-with-gitlab-ui-s-tooltip-in-app-assets-javascripts-ide-components' into 'master'

Replace vue_shared with GitLab UI tooltip in scroll_button.vue

See merge request gitlab-org/gitlab!44539
parents 3de5016f 619351e0
<script> <script>
import { GlIcon } from '@gitlab/ui'; import { GlIcon, GlTooltipDirective } from '@gitlab/ui';
import { __ } from '../../../../locale'; import { __ } from '../../../../locale';
import tooltip from '../../../../vue_shared/directives/tooltip';
const directions = { const directions = {
up: 'up', up: 'up',
...@@ -10,7 +9,7 @@ const directions = { ...@@ -10,7 +9,7 @@ const directions = {
export default { export default {
directives: { directives: {
tooltip, GlTooltip: GlTooltipDirective,
}, },
components: { components: {
GlIcon, GlIcon,
...@@ -46,7 +45,7 @@ export default { ...@@ -46,7 +45,7 @@ export default {
<template> <template>
<div <div
v-tooltip v-gl-tooltip
:title="tooltipTitle" :title="tooltipTitle"
class="controllers-buttons" class="controllers-buttons"
data-container="body" data-container="body"
......
...@@ -31,7 +31,7 @@ describe('IDE job log scroll button', () => { ...@@ -31,7 +31,7 @@ describe('IDE job log scroll button', () => {
}); });
it('returns proper title', () => { it('returns proper title', () => {
expect(wrapper.attributes('data-original-title')).toBe(title); expect(wrapper.attributes('title')).toBe(title);
}); });
}); });
......
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