remove selector options for popover, in favor of more generic content selector

diff --git a/docs/javascript.html b/docs/javascript.html
index 4947735123d12cb3c41c072e752bad786358cf12..858345d727ea23164b08345bdaa340978c55e7eb 100644 (file)
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -691,18 +691,6 @@ $('#.tabs').bind('change', function (e) {
                <td>[default markup]</td>
                <td>the html template used for rendering a popover</td>
              </tr>
-             <tr>
-               <td>titleSelector</td>
-               <td>string</td>
-               <td>.title</td>
-               <td>selector used to find the title element within the popover</td>
-             </tr>
-             <tr>
-               <td>contentSelector</td>
-               <td>string</td>
-               <td>.content p</td>
-               <td>selector used to find the content element within the popover</td>
-             </tr>
             </tbody>
           </table>
           <p><span class="label notice">Notice</span> Individual popover instance options can alternatively be specified through the use of data attributes.</code></p>

diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index e8b49af3c2b599dfa72395ebe610ffb3cbf1816e..39fb575bdb548a9648f530e5e735d138c454cd77 100644 (file)
--- a/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@ -36,8 +36,8 @@
 
     setContent: function () {
       var $tip = this.tip()
-      $tip.find(this.options.titleSelector)[this.options.html ? 'html' : 'text'](this.getTitle())
-      $tip.find(this.options.contentSelector)[this.options.html ? 'html' : 'text'](this.getContent())
+      $tip.find('.title')[this.options.html ? 'html' : 'text'](this.getTitle())
+      $tip.find('.content > *')[this.options.html ? 'html' : 'text'](this.getContent())
       $tip[0].className = 'popover'
     }
 
@@ -83,8 +83,6 @@
     placement: 'right'
   , content: 'data-content'
   , template: '<div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div>'
-  , titleSelector: '.title'
-  , contentSelector: '.content p'
   })
 
   $.fn.twipsy.rejectAttrOptions.push( 'content' )

diff --git a/js/tests/unit/bootstrap-popover.js b/js/tests/unit/bootstrap-popover.js
index 823526727fe5101eda572309cd69e8fc7a867a8f..2c1483435953d020ba54b80177f39c07f71aa9cc 100644 (file)
--- a/js/tests/unit/bootstrap-popover.js
+++ b/js/tests/unit/bootstrap-popover.js
@@ -73,27 +73,4 @@ $(function () {
         $('#qunit-runoff').empty()
       })
 
-      test("should allow arbitrary template html with title and content selector options", function() {
-        $.support.transition = false
-        var expectedTitle = 'Gotta make you understand'
-          , popover = $('<a href="#">@rvagg</a>')
-              .attr('title', expectedTitle)
-              .attr('data-content', '<p><b>Never gonna give you up</b>,</p><p>Never gonna let you down</p>')
-              .appendTo('#qunit-runoff')
-              .popover({
-                    html: true
-                  , titleSelector: 'h1'
-                  , contentSelector: '.rick > .roll'
-                  , template: '<div class="rick"><h1></h1><div class="roll"></div></div>'
-                })
-              .popover('show')
-
-        ok($('.popover > div > h1').length, 'h1 tag was inserted')
-        ok($('.popover > div > h1').text() === expectedTitle)
-        ok($('.popover > .rick > .roll > p').length === 2, 'p > b tags were inserted')
-        popover.popover('hide')
-        ok(!$('.popover').length, 'popover was removed')
-        $('#qunit-runoff').empty()
-      })
-
 })