diff options
| author | Mark Otto <[email protected]> | 2012-12-02 01:32:13 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-02 01:32:13 -0800 |
| commit | 85c57c6ba895d39bad648903f8a085d336d256ea (patch) | |
| tree | 0de3e3af5099a5f379112b40252f52ec3ce8d640 | |
| parent | e8b3c36068e854bfa4f45bcb02257358e79fdd93 (diff) | |
| parent | e6e4d93d5e9b991868341ca6086cdb498ce7ba71 (diff) | |
| download | bootstrap-85c57c6ba895d39bad648903f8a085d336d256ea.tar.xz bootstrap-85c57c6ba895d39bad648903f8a085d336d256ea.zip | |
Merge branch 'Moveo-master' into 2.2.2-wip
| -rw-r--r-- | js/bootstrap-popover.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 11c59a526..56a63d4a2 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -44,7 +44,7 @@ , content = this.getContent() $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) - $tip.find('.popover-content > *')[this.options.html ? 'html' : 'text'](content) + $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) $tip.removeClass('fade top bottom left right in') } @@ -97,7 +97,7 @@ placement: 'right' , trigger: 'click' , content: '' - , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>' + , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"></div></div></div>' }) -}(window.jQuery);
\ No newline at end of file +}(window.jQuery); |