From 6e732ace2cbb4beff58da86d95e59eeae8410391 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Sun, 30 Aug 2015 00:01:30 +0300
Subject: Run `grunt`.

[ci skip]
---
 docs/dist/js/umd/tooltip.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/dist/js/umd/tooltip.js')

diff --git a/docs/dist/js/umd/tooltip.js b/docs/dist/js/umd/tooltip.js
index 307474d49..8b75867a2 100644
--- a/docs/dist/js/umd/tooltip.js
+++ b/docs/dist/js/umd/tooltip.js
@@ -348,9 +348,9 @@
         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


From f0840c893bafdc9f8cc1adb90ef1282e4618bbd3 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Sun, 30 Aug 2015 00:03:55 +0300
Subject: Run `grunt`.

---
 docs/dist/js/umd/tooltip.js | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

(limited to 'docs/dist/js/umd/tooltip.js')

diff --git a/docs/dist/js/umd/tooltip.js b/docs/dist/js/umd/tooltip.js
index 8b75867a2..96fefe749 100644
--- a/docs/dist/js/umd/tooltip.js
+++ b/docs/dist/js/umd/tooltip.js
@@ -60,7 +60,7 @@
     var DefaultType = {
       animation: 'boolean',
       template: 'string',
-      title: '(string|function)',
+      title: '(string|element|function)',
       trigger: 'string',
       delay: '(number|object)',
       html: 'boolean',
@@ -346,16 +346,31 @@
       }, {
         key: 'setContent',
         value: function setContent() {
-          var tip = this.getTipElement();
-          var title = this.getTitle();
-          var method = this.config.html ? 'html' : 'text';
+          var $tip = $(this.getTipElement());
 
-          $(tip).find(Selector.TOOLTIP_INNER)[method](title);
+          this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle());
 
-          $(tip).removeClass(ClassName.FADE).removeClass(ClassName.IN);
+          $tip.removeClass(ClassName.FADE).removeClass(ClassName.IN);
 
           this.cleanupTether();
         }
+      }, {
+        key: 'setElementContent',
+        value: function setElementContent($element, content) {
+          var html = this.config.html;
+          if (typeof content === 'object' && (content.nodeType || content.jquery)) {
+            // content is a DOM node or a jQuery
+            if (html) {
+              if (!$(content).parent().is($element)) {
+                $element.empty().append(content);
+              }
+            } else {
+              $element.text($(content).text());
+            }
+          } else {
+            $element[html ? 'html' : 'text'](content);
+          }
+        }
       }, {
         key: 'getTitle',
         value: function getTitle() {
-- 
cgit v1.2.3