mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-21 21:40:48 +00:00
Code Issues Projects Releases Wiki Activity

Tooltip: merge isAnimated checks

Browse Source
This commit is contained in:
GeoSot 2021-11-26 02:15:24 +02:00 committed by XhmikosR
parent 53c77c0203
commit 3baeb0a5c1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/tooltip.js
View File

@ -271,8 +271,7 @@ class Tooltip extends BaseComponent {
}
}
const isAnimated = this.tip.classList.contains(CLASS_NAME_FADE)
this._queueCallback(complete, this.tip, isAnimated)
this._queueCallback(complete, this.tip, this._isAnimated())
}
hide() {
@ -315,8 +314,7 @@ class Tooltip extends BaseComponent {
this._activeTrigger[TRIGGER_FOCUS] = false
this._activeTrigger[TRIGGER_HOVER] = false
const isAnimated = this.tip.classList.contains(CLASS_NAME_FADE)
this._queueCallback(complete, this.tip, isAnimated)
this._queueCallback(complete, this.tip, this._isAnimated())
this._hoverState = ''
}
@ -355,7 +353,7 @@ class Tooltip extends BaseComponent {
tip.setAttribute('id', tipId)
if (this._config.animation) {
if (this._isAnimated()) {
tip.classList.add(CLASS_NAME_FADE)
}
@ -409,6 +407,10 @@ class Tooltip extends BaseComponent {
return context || this.constructor.getOrCreateInstance(event.delegateTarget, this._getDelegateConfig())
}
_isAnimated() {
return this._config.animation || (this.tip && this.tip.classList.contains(CLASS_NAME_FADE))
}
_getOffset() {
const { offset } = this._config