diff options
| author | Mark Otto <[email protected]> | 2013-07-26 01:43:53 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-26 01:43:53 -0700 |
| commit | 5b2b46fe28b0dad4c41c2fe9bd96fa166e54b96d (patch) | |
| tree | 62dc5712b47a5d89936c6efffcad4ae545656000 /js/tests/unit/button.js | |
| parent | 5d766d9e2ff09ee5a8eeb148b86622297634a3ff (diff) | |
| parent | 2910e3cb5a4fbefad4f16ecc5cf9a4385b9bd2cc (diff) | |
| download | bootstrap-5b2b46fe28b0dad4c41c2fe9bd96fa166e54b96d.tar.xz bootstrap-5b2b46fe28b0dad4c41c2fe9bd96fa166e54b96d.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'js/tests/unit/button.js')
| -rw-r--r-- | js/tests/unit/button.js | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js index 0f8988a7d..41ddb5c2f 100644 --- a/js/tests/unit/button.js +++ b/js/tests/unit/button.js @@ -40,14 +40,15 @@ $(function () { ok(btn.hasClass('disabled'), 'btn has disabled class') start() stop() + btn.button('reset') + equals(btn.html(), 'mdo', 'btn text equals mdo') + setTimeout(function () { + ok(!btn.attr('disabled'), 'btn is not disabled') + ok(!btn.hasClass('disabled'), 'btn does not have disabled class') + start() + }, 0) }, 0) - btn.button('reset') - equals(btn.html(), 'mdo', 'btn text equals mdo') - setTimeout(function () { - ok(!btn.attr('disabled'), 'btn is not disabled') - ok(!btn.hasClass('disabled'), 'btn does not have disabled class') - start() - }, 0) + }) test("should toggle active", function () { |