mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
This commit is contained in:
commit
94b825abc8
2 changed files with 12 additions and 1 deletions
2
js/bootstrap-twipsy.js
vendored
2
js/bootstrap-twipsy.js
vendored
|
@ -155,7 +155,7 @@
|
|||
, setContent: function () {
|
||||
var $tip = this.tip()
|
||||
$tip.find('.twipsy-inner').html(this.getTitle())
|
||||
$tip[0].className = 'twipsy'
|
||||
$tip.removeClass('fade in top bottom left right')
|
||||
}
|
||||
|
||||
, hide: function () {
|
||||
|
|
11
js/tests/unit/bootstrap-twipsy.js
vendored
11
js/tests/unit/bootstrap-twipsy.js
vendored
|
@ -48,4 +48,15 @@ $(function () {
|
|||
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')
|
||||
})
|
||||
|
||||
})
|
Loading…
Reference in a new issue