mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-06 21:56:42 +02:00
Code Issues Releases Wiki Activity

Tooltip/Popover: add underscore prefix to protected functions

Browse Source
This commit is contained in:
GeoSot
2021-11-29 16:25:12 +02:00
committed by XhmikosR
parent bd79d69a73
commit 385fea49e8
4 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/popover.js
View File

@@ -73,14 +73,14 @@ class Popover extends Tooltip {
}
// Overrides
isWithContent() {
return this.getTitle() || this._getContent()
_isWithContent() {
return this._getTitle() || this._getContent()
}
// Private
_getContentForTemplate() {
return {
[SELECTOR_TITLE]: this.getTitle(),
[SELECTOR_TITLE]: this._getTitle(),
[SELECTOR_CONTENT]: this._getContent()
}
}

20
js/src/tooltip.js
View File

@@ -181,7 +181,7 @@ class Tooltip extends BaseComponent {
context._leave()
}
} else {
if (this.getTipElement().classList.contains(CLASS_NAME_SHOW)) {
if (this._getTipElement().classList.contains(CLASS_NAME_SHOW)) {
this._leave()
return
}
@@ -208,7 +208,7 @@ class Tooltip extends BaseComponent {
throw new Error('Please use show on visible elements')
}
if (!(this.isWithContent() && this._isEnabled)) {
if (!(this._isWithContent() && this._isEnabled)) {
return
}
@@ -222,7 +222,7 @@ class Tooltip extends BaseComponent {
return
}
const tip = this.getTipElement()
const tip = this._getTipElement()
this._element.setAttribute('aria-describedby', tip.getAttribute('id'))
@@ -279,7 +279,7 @@ class Tooltip extends BaseComponent {
return
}
const tip = this.getTipElement()
const tip = this._getTipElement()
tip.classList.remove(CLASS_NAME_SHOW)
// If this is a touch-enabled device we remove the extra
@@ -320,11 +320,11 @@ class Tooltip extends BaseComponent {
}
// Protected
isWithContent() {
return Boolean(this.getTitle())
_isWithContent() {
return Boolean(this._getTitle())
}
getTipElement() {
_getTipElement() {
if (!this.tip) {
this.tip = this._createTipElement(this._getContentForTemplate())
}
@@ -389,11 +389,11 @@ class Tooltip extends BaseComponent {
_getContentForTemplate() {
return {
[SELECTOR_TOOLTIP_INNER]: this.getTitle()
[SELECTOR_TOOLTIP_INNER]: this._getTitle()
}
}
getTitle() {
_getTitle() {
return this._resolvePossibleFunction(this._config.title) || this._element.getAttribute('title')
}
@@ -518,7 +518,7 @@ class Tooltip extends BaseComponent {
}
_enter() {
if (this.getTipElement().classList.contains(CLASS_NAME_SHOW) || this._isHovered) {
if (this._getTipElement().classList.contains(CLASS_NAME_SHOW) || this._isHovered) {
this._isHovered = true
return
}