rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

use one private method to resolve string or function

Browse Source
This commit is contained in:
GeoSot 2021-06-10 10:55:34 +03:00 committed by XhmikosR
parent 3716603dbc
commit a97fd1cd24
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/popover.js
View File

@ -124,7 +124,7 @@ class Popover extends Tooltip {
// Private
_getContent() {
return this._element.getAttribute('data-bs-content') || this._config.content
return this._resolvePossibleFunction(this._config.content)
}
_getBasicClassPrefix() {

21
js/src/tooltip.js
View File

@ -17,10 +17,7 @@ import {
noop,
typeCheckConfig
} from './util/index'
import {
DefaultAllowlist,
sanitizeHtml
} from './util/sanitizer'
import { DefaultAllowlist, sanitizeHtml } from './util/sanitizer'
import Data from './dom/data'
import EventHandler from './dom/event-handler'
import Manipulator from './dom/manipulator'
@ -272,7 +269,7 @@ class Tooltip extends BaseComponent {
tip.classList.add(CLASS_NAME_SHOW)
const customClass = typeof this._config.customClass === 'function' ? this._config.customClass() : this._config.customClass
const customClass = this._resolvePossibleFunction(this._config.customClass)
if (customClass) {
tip.classList.add(...customClass.split(' '))
}
@ -413,15 +410,9 @@ class Tooltip extends BaseComponent {
}
getTitle() {
let title = this._element.getAttribute('data-bs-original-title')
const title = this._element.getAttribute('data-bs-original-title') || this._config.title
if (!title) {
title = typeof this._config.title === 'function' ?
this._config.title.call(this._element) :
this._config.title
}
return title
return this._resolvePossibleFunction(title)
}
updateAttachment(attachment) {
@ -456,6 +447,10 @@ class Tooltip extends BaseComponent {
return offset
}
_resolvePossibleFunction(content) {
return typeof content === 'function' ? content.call(this._element) : content
}
_getPopperConfig(attachment) {
const defaultBsPopperConfig = {
placement: attachment,