Commit 65e5a79c authored by Clement Ho's avatar Clement Ho

Merge branch '51259-gitlab-ui-replacement' into 'master'

Updates clipboard button with gitlab-ui

See merge request gitlab-org/gitlab-ce!22923
parents d5027d77 9d45332f
...@@ -12,20 +12,18 @@ ...@@ -12,20 +12,18 @@
* css-class="btn-transparent" * css-class="btn-transparent"
* /> * />
*/ */
import tooltip from '../directives/tooltip'; import { GlButton, GlTooltipDirective } from '@gitlab-org/gitlab-ui';
import Icon from '../components/icon.vue'; import Icon from '../components/icon.vue';
export default { export default {
name: 'ClipboardButton', name: 'ClipboardButton',
directives: { directives: {
tooltip, GlTooltip: GlTooltipDirective,
}, },
components: { components: {
GlButton,
Icon, Icon,
}, },
props: { props: {
text: { text: {
type: String, type: String,
...@@ -68,16 +66,12 @@ export default { ...@@ -68,16 +66,12 @@ export default {
</script> </script>
<template> <template>
<button <gl-button
v-tooltip v-gl-tooltip="{ placement: tooltipPlacement, container: tooltipContainer }"
:class="cssClass" :class="cssClass"
:title="title" :title="title"
:data-clipboard-text="clipboardText" :data-clipboard-text="clipboardText"
:data-container="tooltipContainer"
:data-placement="tooltipPlacement"
type="button"
class="btn"
> >
<icon name="duplicate" /> <icon name="duplicate" />
</button> </gl-button>
</template> </template>
...@@ -27,8 +27,6 @@ describe('clipboard button', () => { ...@@ -27,8 +27,6 @@ describe('clipboard button', () => {
it('should have a tooltip with default values', () => { it('should have a tooltip with default values', () => {
expect(vm.$el.getAttribute('data-original-title')).toEqual('Copy this value into Clipboard!'); expect(vm.$el.getAttribute('data-original-title')).toEqual('Copy this value into Clipboard!');
expect(vm.$el.getAttribute('data-placement')).toEqual('top');
expect(vm.$el.getAttribute('data-container')).toEqual(null);
}); });
it('should render provided classname', () => { it('should render provided classname', () => {
......
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