diff options
| author | Johann-S <[email protected]> | 2017-11-07 08:18:52 +0100 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2017-11-07 09:18:52 +0200 |
| commit | 26dc17bcd23fd2f5fd762c5cb73c6a670bd5f897 (patch) | |
| tree | 93738278018f147b14719225a3e3d8aaf060d652 /js/src | |
| parent | b42a38b886e1e1063fc9acf474e58b43e0160829 (diff) | |
| download | bootstrap-26dc17bcd23fd2f5fd762c5cb73c6a670bd5f897.tar.xz bootstrap-26dc17bcd23fd2f5fd762c5cb73c6a670bd5f897.zip | |
Popover - call `content` once if it's a function. (#24690)
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/popover.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/js/src/popover.js b/js/src/popover.js index 4fb96a792..5534f4441 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -124,7 +124,11 @@ const Popover = (($) => { // we use append for html objects to maintain js events this.setElementContent($tip.find(Selector.TITLE), this.getTitle()) - this.setElementContent($tip.find(Selector.CONTENT), this._getContent()) + let content = this._getContent() + if (typeof content === 'function') { + content = content.call(this.element) + } + this.setElementContent($tip.find(Selector.CONTENT), content) $tip.removeClass(`${ClassName.FADE} ${ClassName.SHOW}`) } @@ -133,9 +137,7 @@ const Popover = (($) => { _getContent() { return this.element.getAttribute('data-content') - || (typeof this.config.content === 'function' ? - this.config.content.call(this.element) : - this.config.content) + || this.config.content } _cleanTipClass() { |