diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/assets/javascripts/tooltips | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
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'), |