diff options
Diffstat (limited to 'assets/javascripts/bootstrap/popover.js')
-rw-r--r-- | assets/javascripts/bootstrap/popover.js | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/assets/javascripts/bootstrap/popover.js b/assets/javascripts/bootstrap/popover.js index 9e7b6e8..baf36af 100644 --- a/assets/javascripts/bootstrap/popover.js +++ b/assets/javascripts/bootstrap/popover.js @@ -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(); } |