Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-rubygem.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Mazovetskiy <glex.spb@gmail.com>2015-08-27 15:38:33 +0300
committerGleb Mazovetskiy <glex.spb@gmail.com>2015-08-27 15:38:33 +0300
commit3a45d6fcebf8453e099643e942eb1a8fbd4d6b7d (patch)
treea0d42d8093646572abc6accffa4181cf0d9ce3e0 /assets/javascripts/bootstrap
parentc89f51062ac526958654dd143d3bebe1fc0669bd (diff)
rake update
Diffstat (limited to 'assets/javascripts/bootstrap')
-rw-r--r--assets/javascripts/bootstrap/popover.js6
-rw-r--r--assets/javascripts/bootstrap/tooltip.js4
2 files changed, 5 insertions, 5 deletions
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);