diff options
| author | Mark Otto <[email protected]> | 2012-12-02 01:32:23 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-02 01:32:23 -0800 |
| commit | 32d425967a981838cb2e66701c0e814aeee8ab9c (patch) | |
| tree | 4d26f5573207a15e456484dd7f9f2a4f05cdc7bf /docs/assets/js/bootstrap.js | |
| parent | 85c57c6ba895d39bad648903f8a085d336d256ea (diff) | |
| download | bootstrap-32d425967a981838cb2e66701c0e814aeee8ab9c.tar.xz bootstrap-32d425967a981838cb2e66701c0e814aeee8ab9c.zip | |
run make on js changes to popover
Diffstat (limited to 'docs/assets/js/bootstrap.js')
| -rw-r--r-- | docs/assets/js/bootstrap.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index bc2f43f68..7de84b6b1 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -1269,7 +1269,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') } @@ -1322,10 +1322,11 @@ 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);/* ============================================================= +}(window.jQuery); +/* ============================================================= * bootstrap-scrollspy.js v2.2.2 * http://twitter.github.com/bootstrap/javascript.html#scrollspy * ============================================================= |