Commit 54c4eb95 authored by Jelle Versele's avatar Jelle Versele Committed by Chris Rebert

fixes #17097: Go back to using jQuery's text and html methods since innerText...

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]
parent 6d42a230
...@@ -116,12 +116,12 @@ const Popover = (($) => { ...@@ -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
......
...@@ -358,9 +358,9 @@ const Tooltip = (($) => { ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment