rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-26 23:54:23 +01:00
Code Issues Actions Packages Releases Activity

fixes #17097: Go back to using jQuery's text and html methods since innerText is nonstandard and not present in Firefox

Browse Source 
Closes #17272 by merging a tweaked version of it.

[skip validator]
This commit is contained in:
Jelle Versele 2015-08-24 14:45:49 +02:00 committed by Chris Rebert
parent 6d42a23039
commit 54c4eb950b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/popover.js
View File

@ -116,12 +116,12 @@ const Popover = (($) => {
let tip = this.getTipElement() let tip = this.getTipElement()
let title = this.getTitle() let title = this.getTitle()
let content = this._getContent() let content = this._getContent()
let titleElement = $(tip).find(Selector.TITLE)[0] let $titleElement = $(tip).find(Selector.TITLE)
if (titleElement) { if ($titleElement) {
titleElement[ $titleElement[
this.config.html ? 'innerHTML' : 'innerText' this.config.html ? 'html' : 'text'
] = title ](title)
} }
// we use append for html objects to maintain js events // we use append for html objects to maintain js events

4
js/src/tooltip.js
View File

@ -358,9 +358,9 @@ const Tooltip = (($) => {
setContent() { setContent() {
let tip = this.getTipElement() let tip = this.getTipElement()
let title = this.getTitle() 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) $(tip)
.removeClass(ClassName.FADE) .removeClass(ClassName.FADE)