diff options
| author | J2TeaM <[email protected]> | 2016-09-07 10:09:54 +0700 |
|---|---|---|
| committer | J2TeaM <[email protected]> | 2016-09-07 10:09:54 +0700 |
| commit | 4f520c7ff301ce42f01e32bd77606ce94384cd13 (patch) | |
| tree | 8247c873f6166a195887f632a805149bfbdcb55b | |
| parent | 4f5a7c96e73071d2d75a0fa135797c9ee15969ed (diff) | |
| download | bootstrap-4f520c7ff301ce42f01e32bd77606ce94384cd13.tar.xz bootstrap-4f520c7ff301ce42f01e32bd77606ce94384cd13.zip | |
Merge #20563 and #20567
| -rw-r--r-- | js/src/popover.js | 4 | ||||
| -rw-r--r-- | js/src/tooltip.js | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/js/src/popover.js b/js/src/popover.js index 7ea560812..eae17f1d3 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -119,9 +119,7 @@ const Popover = (($) => { this.setElementContent($tip.find(Selector.TITLE), this.getTitle()) this.setElementContent($tip.find(Selector.CONTENT), this._getContent()) - $tip - .removeClass(ClassName.FADE) - .removeClass(ClassName.IN) + $tip.removeClass(`${ClassName.FADE} ${ClassName.IN}`) this.cleanupTether() } diff --git a/js/src/tooltip.js b/js/src/tooltip.js index 08daae2f2..e0691f14c 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -371,9 +371,7 @@ const Tooltip = (($) => { this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle()) - $tip - .removeClass(ClassName.FADE) - .removeClass(ClassName.IN) + $tip.removeClass(`${ClassName.FADE} ${ClassName.IN}`) this.cleanupTether() } |