mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-26 13:29:06 +02:00
Code Issues Releases Wiki Activity

Run grunt.

Browse Source 
[ci skip]
This commit is contained in:
XhmikosR
2015-08-30 00:01:30 +03:00
parent 647ad1cbed
commit 6e732ace2c
15 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/dist/js/bootstrap.js
View File

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