diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-22 00:09:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-22 00:09:00 +0300 |
| commit | 3b6bc9a3af9bf34d709cd3f6de6b495b630f159d (patch) | |
| tree | 810f9603d961812ca84cad8821f63e3c9c3bca66 /app/assets/javascripts/tooltips | |
| parent | 72c5d10ab9786a311515ff53e69c9638b85025de (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/tooltips')
| -rw-r--r-- | app/assets/javascripts/tooltips/components/tooltips.vue | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/tooltips/index.js | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/tooltips/components/tooltips.vue b/app/assets/javascripts/tooltips/components/tooltips.vue index 8307f878def..05927006ea6 100644 --- a/app/assets/javascripts/tooltips/components/tooltips.vue +++ b/app/assets/javascripts/tooltips/components/tooltips.vue @@ -108,6 +108,7 @@ export default { :container="tooltip.container" :boundary="tooltip.boundary" :disabled="tooltip.disabled" + :show="tooltip.show" > <span v-if="tooltip.html" v-safe-html="tooltip.title"></span> <span v-else>{{ tooltip.title }}</span> diff --git a/app/assets/javascripts/tooltips/index.js b/app/assets/javascripts/tooltips/index.js index 9f5dce4183c..f7cad6639ae 100644 --- a/app/assets/javascripts/tooltips/index.js +++ b/app/assets/javascripts/tooltips/index.js @@ -96,6 +96,12 @@ export const initTooltips = (config = {}) => { return invokeBootstrapApi(document.body, config); }; +export const add = (elements, config = {}) => { + if (isGlTooltipsEnabled()) { + return addTooltips(elements, config); + } + return invokeBootstrapApi(elements, config); +}; export const dispose = tooltipApiInvoker({ glHandler: element => tooltipsApp().dispose(element), bsHandler: elements => invokeBootstrapApi(elements, 'dispose'), |