diff options
| author | Mark Otto <[email protected]> | 2012-01-07 00:01:52 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-07 00:01:52 -0800 |
| commit | 94b825abc82abba14131824d57f3368871c5f4cb (patch) | |
| tree | 5b549398798b9d978dc13838aa8414d6db971198 | |
| parent | cfc2353059df628c67d19a3c5c3ead2cc6051f53 (diff) | |
| parent | 64c8623533752ab155e452335457285fa06c1b70 (diff) | |
| download | bootstrap-94b825abc82abba14131824d57f3368871c5f4cb.tar.xz bootstrap-94b825abc82abba14131824d57f3368871c5f4cb.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
| -rw-r--r-- | js/bootstrap-twipsy.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/bootstrap-twipsy.js | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js index a176f0908..1ce4ad85b 100644 --- a/js/bootstrap-twipsy.js +++ b/js/bootstrap-twipsy.js @@ -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 () { diff --git a/js/tests/unit/bootstrap-twipsy.js b/js/tests/unit/bootstrap-twipsy.js index 6623fc026..08512ca97 100644 --- a/js/tests/unit/bootstrap-twipsy.js +++ b/js/tests/unit/bootstrap-twipsy.js @@ -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') + }) + })
\ No newline at end of file |