diff options
| author | Jelle Versele <[email protected]> | 2015-08-24 14:45:49 +0200 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-08-26 01:00:46 -0700 |
| commit | 54c4eb950b787e395f9532b5c4ad254724798d7b (patch) | |
| tree | f3ef66888159843516fd40eba9ec875460eebd4f /js/src/tooltip.js | |
| parent | 6d42a23039be9c2c440a8ada5c809d3f186d356a (diff) | |
| download | bootstrap-54c4eb950b787e395f9532b5c4ad254724798d7b.tar.xz bootstrap-54c4eb950b787e395f9532b5c4ad254724798d7b.zip | |
fixes #17097: Go back to using jQuery's text and html methods since innerText is nonstandard and not present in Firefox
Closes #17272 by merging a tweaked version of it.
[skip validator]
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) |