From: Swaagie <info@martijnswaagman.nl>
Date: Tue, 27 Nov 2012 14:07:31 +0000 (+0100)
Subject: leave it to the developer to decide how to use the content of the popover
X-Git-Tag: v2.2.2~33^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6028%2Fhead;p=thirdparty%2Fbootstrap.git

leave it to the developer to decide how to use the content of the popover
---

diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index 0afe7ec3b2..28138765f3 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);