From: Jelle Versele <jelle.versele@internetarchitects.be>
Date: Mon, 24 Aug 2015 12:45:49 +0000 (+0200)
Subject: fixes #17097: Go back to using jQuery's text and html methods since innerText is... 
X-Git-Tag: v4.0.0-alpha.2~399^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54c4eb950b787e395f9532b5c4ad254724798d7b;p=thirdparty%2Fbootstrap.git

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]
---

diff --git a/js/src/popover.js b/js/src/popover.js
index 30c0e4acb2..99e48e64f9 100644
--- a/js/src/popover.js
+++ b/js/src/popover.js
@@ -116,12 +116,12 @@ const Popover = (($) => {
       let tip          = this.getTipElement()
       let title        = this.getTitle()
       let content      = this._getContent()
-      let titleElement = $(tip).find(Selector.TITLE)[0]
+      let $titleElement = $(tip).find(Selector.TITLE)
 
-      if (titleElement) {
-        titleElement[
-          this.config.html ? 'innerHTML' : 'innerText'
-        ] = title
+      if ($titleElement) {
+        $titleElement[
+          this.config.html ? 'html' : 'text'
+        ](title)
       }
 
       // we use append for html objects to maintain js events
diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index a65caf26e9..aa5c739457 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)