From 54c4eb950b787e395f9532b5c4ad254724798d7b Mon Sep 17 00:00:00 2001
From: Jelle Versele <jelle.versele@internetarchitects.be>
Date: Mon, 24 Aug 2015 14:45:49 +0200
Subject: 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]
---
 js/src/tooltip.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/src/tooltip.js')

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)
-- 
cgit v1.2.3