diff options
| author | David Baughman <[email protected]> | 2015-08-27 13:41:24 -0700 |
|---|---|---|
| committer | David Baughman <[email protected]> | 2015-08-27 13:41:24 -0700 |
| commit | e481c8fff268a1cce1fe0d60dc85d4f6b85e855e (patch) | |
| tree | 361d07f1cbe685332826d6cb6b291243a939df30 /js/src/tooltip.js | |
| parent | 026682bf0dc828d8d689cb01e623eb311de0c013 (diff) | |
| parent | 232469549c9a9b6082b311f568556d99ea03af2f (diff) | |
| download | bootstrap-e481c8fff268a1cce1fe0d60dc85d4f6b85e855e.tar.xz bootstrap-e481c8fff268a1cce1fe0d60dc85d4f6b85e855e.zip | |
Merge branch 'v4-dev' into v4-media-breakpoint-between
Diffstat (limited to 'js/src/tooltip.js')
| -rw-r--r-- | js/src/tooltip.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/src/tooltip.js b/js/src/tooltip.js index a65caf26e..aa5c73945 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -358,9 +358,9 @@ const Tooltip = (($) => { setContent() { let tip = this.getTipElement() let title = this.getTitle() - let method = this.config.html ? 'innerHTML' : 'innerText' + let method = this.config.html ? 'html' : 'text' - $(tip).find(Selector.TOOLTIP_INNER)[0][method] = title + $(tip).find(Selector.TOOLTIP_INNER)[method](title) $(tip) .removeClass(ClassName.FADE) |