0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00

grunt babel:dev

This commit is contained in:
Chris Rebert 2015-08-26 01:27:45 -07:00
parent 3de3dac0b0
commit d06f79e2f7
4 changed files with 7 additions and 7 deletions

6
js/dist/popover.js vendored
View File

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

File diff suppressed because one or more lines are too long

4
js/dist/tooltip.js vendored
View File

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

File diff suppressed because one or more lines are too long