root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #907 from ansman/2.0-wip 

Twipsy now respects custom classes
This commit is contained in:
Jacob Thornton 2012-01-06 11:07:59 -08:00
parent 5cb76037ae 969fbe7150
commit 64c8623533
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/bootstrap-twipsy.js vendored
View File

@ -155,7 +155,7 @@
, setContent: function () { , setContent: function () {
var $tip = this.tip() var $tip = this.tip()
$tip.find('.twipsy-inner').html(this.getTitle()) $tip.find('.twipsy-inner').html(this.getTitle())
$tip[0].className = 'twipsy' $tip.removeClass('fade in top bottom left right')
} }
, hide: function () { , hide: function () {

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

@ -48,4 +48,15 @@ $(function () {
ok(!$(".twipsy").length, 'twipsy removed') ok(!$(".twipsy").length, 'twipsy removed')
}) })
test("should respect custom classes", function () {
var twipsy = $('<a href="#" rel="twipsy" title="Another twipsy"></a>')
.appendTo('#qunit-fixture')
.twipsy({ template: '<div class="twipsy some-class"><div class="twipsy-arrow"/><div class="twipsy-inner"/></div>'})
.twipsy('show')
ok($('.twipsy').hasClass('some-class'), 'custom class is present')
twipsy.twipsy('hide')
ok(!$(".twipsy").length, 'twipsy removed')
})
}) })