diff options
| author | Jacob Thornton <[email protected]> | 2012-07-24 00:24:25 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-07-24 00:24:25 -0700 |
| commit | 5b2f2ed82181c651626b541aee6963f74bf8be31 (patch) | |
| tree | 31706cdec9278f49a03544385d45e8572af1f98f /js/tests/unit | |
| parent | 4ea7c472358e2d77f76193ed3c1bafd641dd74ae (diff) | |
| parent | 7ce048bccd618bbae794a9115861d1927664b8ed (diff) | |
| download | bootstrap-5b2f2ed82181c651626b541aee6963f74bf8be31.tar.xz bootstrap-5b2f2ed82181c651626b541aee6963f74bf8be31.zip | |
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
Conflicts:
docs/assets/css/docs.css
docs/javascript.html
docs/templates/pages/javascript.mustache
Diffstat (limited to 'js/tests/unit')
| -rw-r--r-- | js/tests/unit/bootstrap-affix.js | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/js/tests/unit/bootstrap-affix.js b/js/tests/unit/bootstrap-affix.js index 2d4419def..bc25df991 100644 --- a/js/tests/unit/bootstrap-affix.js +++ b/js/tests/unit/bootstrap-affix.js @@ -16,10 +16,4 @@ $(function () { ok(!$affix.hasClass('affix'), 'affix class was not added') }) - test("should add affix class if scrolled to correct position", function () { - var $affix = $('<div></div>').appendTo('body').affix() - $('body').trigger('scroll') - ok($affix.hasClass('affix'), 'element has class affix') - }) - })
\ No newline at end of file |