rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 10:52:19 +01:00
Code Issues Actions Packages Releases Activity

tests & docs & twipsy too

Browse Source
This commit is contained in:
Rod Vagg 2011-11-06 13:20:09 +11:00
parent 3628eb79ae
commit 4d2e32e809
4 changed files with 70 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
docs/javascript.html
View File

@ -487,8 +487,8 @@ $('#.tabs').bind('change', function (e) {
<thead>
<tr>
<th style="width: 100px;">Name</th>
<th style="width: 100px;">type</th>
<th style="width: 50px;">default</th>
<th style="width: 95px;">type</th>
<th style="width: 95px;">default</th>
<th>description</th>
</tr>
</thead>
@ -557,7 +557,13 @@ $('#.tabs').bind('change', function (e) {
<td>template</td>
<td>string</td>
<td>[default markup]</td>
<td>The html template used for rendering a twipsy.</td>
<td>the html template used for rendering a twipsy</td>
</tr>
<tr>
<td>contentSelector</td>
<td>string</td>
<td>.twipsy-inner</td>
<td>selector used to find the title element within the tooltip</td>
</tr>
</tbody>
</table>
@ -613,8 +619,8 @@ $('#.tabs').bind('change', function (e) {
<thead>
<tr>
<th style="width: 100px;">Name</th>
<th style="width: 100px;">type</th>
<th style="width: 50px;">default</th>
<th style="width: 95px;">type</th>
<th style="width: 95px;">default</th>
<th>description</th>
</tr>
</thead>
@ -689,7 +695,19 @@ $('#.tabs').bind('change', function (e) {
<td>template</td>
<td>string</td>
<td>[default markup]</td>
<td>The html template used for rendering a popover.</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>

5
js/bootstrap-twipsy.js vendored
View File

@ -119,7 +119,7 @@
, setContent: function () {
var $tip = this.tip()
$tip.find('.twipsy-inner')[this.options.html ? 'html' : 'text'](this.getTitle())
$tip.find(this.options.contentSelector)[this.options.html ? 'html' : 'text'](this.getTitle())
$tip[0].className = 'twipsy'
}
@ -302,10 +302,11 @@
, title: 'title'
, trigger: 'hover'
, template: '<div class="twipsy-arrow"></div><div class="twipsy-inner"></div>'
, contentSelector: '.twipsy-inner'
}
$.fn.twipsy.elementOptions = function(ele, options) {
return $.extend({}, options, $(ele).data())
}
}( window.jQuery || window.ender );
}( window.jQuery || window.ender );

25
js/tests/unit/bootstrap-popover.js vendored
View File

@ -73,4 +73,27 @@ $(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)
.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()
})
})

20
js/tests/unit/bootstrap-twipsy.js vendored
View File

@ -78,4 +78,22 @@ $(function () {
$('#qunit-runoff').empty()
})
})
test("should allow arbitrary template html with content selector options", function() {
$.support.transition = false
var twipsy = $('<a href="#" rel="twipsy" title="<b>@fat</b>"></a>')
.appendTo('#qunit-runoff')
.twipsy({
html: true
, contentSelector: 'h1'
, template: '<div><h1>Funky Twipsy!</h1><p class="funky"><b>@rvagg was here</b></p></div>'
})
.twipsy('show')
ok($('.twipsy h1').length, 'h1 tag was inserted')
ok($('.twipsy p>b').length, 'p > b tags were inserted')
ok($('.twipsy h1>b').length, 'h1 tag was customised')
twipsy.twipsy('hide')
ok(!$(".twipsy").length, 'twipsy removed')
$('#qunit-runoff').empty()
})
})