mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-25 04:51:39 +02:00
Code Issues Releases Wiki Activity

Run grunt.

Browse Source
This commit is contained in:
XhmikosR
2015-08-30 00:03:55 +03:00
parent a3d0a2c045
commit f0840c893b
22 changed files with 148 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/dist/popover.js vendored
View File

@@ -37,7 +37,7 @@ var Popover = (function ($) {
});
var DefaultType = $.extend({}, Tooltip.DefaultType, {
content: '(string|function)'
content: '(string|element|function)'
});
var ClassName = {
@@ -101,19 +101,13 @@ var Popover = (function ($) {
}, {
key: 'setContent',
value: function setContent() {
var tip = this.getTipElement();
var title = this.getTitle();
var content = this._getContent();
var $titleElement = $(tip).find(Selector.TITLE);
if ($titleElement) {
$titleElement[this.config.html ? 'html' : 'text'](title);
}
var $tip = $(this.getTipElement());
// we use append for html objects to maintain js events
$(tip).find(Selector.CONTENT).children().detach().end()[this.config.html ? typeof content === 'string' ? 'html' : 'append' : 'text'](content);
this.setElementContent($tip.find(Selector.TITLE), this.getTitle());
this.setElementContent($tip.find(Selector.CONTENT), this._getContent());
$(tip).removeClass(ClassName.FADE).removeClass(ClassName.IN);
$tip.removeClass(ClassName.FADE).removeClass(ClassName.IN);
this.cleanupTether();
}