From 3a45d6fcebf8453e099643e942eb1a8fbd4d6b7d Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Thu, 27 Aug 2015 13:38:33 +0100
Subject: rake update

---
 assets/javascripts/bootstrap/popover.js | 6 +++---
 assets/javascripts/bootstrap/tooltip.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'assets/javascripts/bootstrap')

diff --git a/assets/javascripts/bootstrap/popover.js b/assets/javascripts/bootstrap/popover.js
index 5e057c0..9e7b6e8 100644
--- a/assets/javascripts/bootstrap/popover.js
+++ b/assets/javascripts/bootstrap/popover.js
@@ -104,10 +104,10 @@ var Popover = (function ($) {
         var tip = this.getTipElement();
         var title = this.getTitle();
         var content = this._getContent();
-        var titleElement = $(tip).find(Selector.TITLE)[0];
+        var $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/assets/javascripts/bootstrap/tooltip.js b/assets/javascripts/bootstrap/tooltip.js
index a1bd768..fd542f2 100644
--- a/assets/javascripts/bootstrap/tooltip.js
+++ b/assets/javascripts/bootstrap/tooltip.js
@@ -331,9 +331,9 @@ var Tooltip = (function ($) {
       value: function setContent() {
         var tip = this.getTipElement();
         var title = this.getTitle();
-        var method = this.config.html ? 'innerHTML' : 'innerText';
+        var 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).removeClass(ClassName.IN);
 
-- 
cgit v1.2.3