Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoSot <geo.sotis@gmail.com>2021-08-03 11:59:33 +0300
committerGitHub <noreply@github.com>2021-08-03 11:59:33 +0300
commita6a2d1e2df4f97486d1715a709f40f85193c4ef6 (patch)
treefc73eb520b8c4c28e5801cef0820e062d96ed115 /js/src/tooltip.js
parent23fd488c380c347a3d0121a49b6285bdd65418a2 (diff)
Regression on tooltip template creation process. (#34628)
* Regression on tooltip template creation process. * check if template content does not exist, or given argument is empty * call `setContent()` once.
Diffstat (limited to 'js/src/tooltip.js')
-rw-r--r--js/src/tooltip.js9
1 files changed, 4 insertions, 5 deletions
diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index f932a9ff99..2632e46e00 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -243,8 +243,6 @@ class Tooltip extends BaseComponent {
tip.setAttribute('id', tipId)
this._element.setAttribute('aria-describedby', tipId)
- this.setContent()
-
if (this._config.animation) {
tip.classList.add(CLASS_NAME_FADE)
}
@@ -371,20 +369,21 @@ class Tooltip extends BaseComponent {
element.innerHTML = this._config.template
const tip = element.children[0]
+ this.setContent(tip)
tip.classList.remove(CLASS_NAME_FADE, CLASS_NAME_SHOW)
this.tip = tip
return this.tip
}
- setContent() {
- const tip = this.getTipElement()
+ setContent(tip) {
this._sanitizeAndSetContent(tip, this.getTitle(), SELECTOR_TOOLTIP_INNER)
}
_sanitizeAndSetContent(template, content, selector) {
const templateElement = SelectorEngine.findOne(selector, template)
- if (!content) {
+
+ if (!content && templateElement) {
templateElement.remove()
return
}