diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-08-13 08:58:03 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-08-13 08:58:03 +0000 |
commit | 632d3a94124a62c4bf0af7ef762accd620738025 (patch) | |
tree | 19a048cb56d4cde9fc04e8e6ccc57b46dc13e4b6 /app/assets/javascripts/ide | |
parent | 7167e3991f5225a25c8eaf0cc87f2aa36b796e07 (diff) | |
parent | dcec09073666a10f5a0c857f5060ec30b9a0235b (diff) | |
download | gitlab-ce-632d3a94124a62c4bf0af7ef762accd620738025.tar.gz |
Merge branch 'ide-header-buttons-tooltip' into 'master'
Added tooltips to tree list header buttons in Web IDE
Closes #50141
See merge request gitlab-org/gitlab-ce!21138
Diffstat (limited to 'app/assets/javascripts/ide')
-rw-r--r-- | app/assets/javascripts/ide/components/new_dropdown/button.vue | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/components/new_dropdown/button.vue b/app/assets/javascripts/ide/components/new_dropdown/button.vue index ff114e47741..aa5fce59dbf 100644 --- a/app/assets/javascripts/ide/components/new_dropdown/button.vue +++ b/app/assets/javascripts/ide/components/new_dropdown/button.vue @@ -1,7 +1,11 @@ <script> import Icon from '~/vue_shared/components/icon.vue'; +import tooltip from '~/vue_shared/directives/tooltip'; export default { + directives: { + tooltip, + }, components: { Icon, }, @@ -26,6 +30,11 @@ export default { default: true, }, }, + computed: { + tooltipTitle() { + return this.showLabel ? '' : this.label; + }, + }, methods: { clicked() { this.$emit('click'); @@ -36,7 +45,9 @@ export default { <template> <button + v-tooltip :aria-label="label" + :title="tooltipTitle" type="button" class="btn-blank" @click.stop.prevent="clicked" |