aboutsummaryrefslogtreecommitdiff
path: root/docs/dist/js/bootstrap.js
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2015-08-30 00:01:30 +0300
committerXhmikosR <[email protected]>2015-08-30 00:01:30 +0300
commit6e732ace2cbb4beff58da86d95e59eeae8410391 (patch)
tree3be66a658df69b4cba5bcbb23b884adb1f53f3b3 /docs/dist/js/bootstrap.js
parent647ad1cbed3936d950a1cc7f540d63b61972d4ef (diff)
downloadbootstrap-6e732ace2cbb4beff58da86d95e59eeae8410391.tar.xz
bootstrap-6e732ace2cbb4beff58da86d95e59eeae8410391.zip
Run `grunt`.
[ci skip]
Diffstat (limited to 'docs/dist/js/bootstrap.js')
-rw-r--r--docs/dist/js/bootstrap.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js
index 7d51c641c..bb5199178 100644
--- a/docs/dist/js/bootstrap.js
+++ b/docs/dist/js/bootstrap.js
@@ -3054,9 +3054,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);
@@ -3418,10 +3418,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