diff options
author | Mark Otto <otto@github.com> | 2012-12-05 23:05:10 +0400 |
---|---|---|
committer | Mark Otto <otto@github.com> | 2012-12-05 23:05:10 +0400 |
commit | 33e14fe5bfd7a7091ab491a961d66a2a2580f1de (patch) | |
tree | 79c2c539e578877c3241e90402e47c4691c22a39 /js/bootstrap-popover.js | |
parent | b3019d7aab877cccf03fda3e6894c0fdaa7330f3 (diff) | |
parent | ed74992853054c57f33ef5d21941f0869e287552 (diff) |
Merge branch '2.2.2-wip' into 3.0.0-wip
Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less
Diffstat (limited to 'js/bootstrap-popover.js')
-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 5915b4df83..41dcdc010c 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); |