diff options
| author | fat <[email protected]> | 2015-05-09 23:00:59 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2015-05-09 23:04:58 -0700 |
| commit | 8bab38bb7176d2716b72664dbafcc326824a2ee9 (patch) | |
| tree | bdcea0ca5a46b489ac5bee2501bf7c8c081669ee /js/tests | |
| parent | 1b183e2ff796fc22aba8a8cac074a306c083d018 (diff) | |
| download | bootstrap-8bab38bb7176d2716b72664dbafcc326824a2ee9.tar.xz bootstrap-8bab38bb7176d2716b72664dbafcc326824a2ee9.zip | |
add collapse
Diffstat (limited to 'js/tests')
| -rw-r--r-- | js/tests/index.html | 2 | ||||
| -rw-r--r-- | js/tests/unit/collapse.js | 4 | ||||
| -rw-r--r-- | js/tests/visual/collapse.html | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/js/tests/index.html b/js/tests/index.html index 0ba54e802..cc008152f 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -134,9 +134,9 @@ <script src="../../js/dist/alert.js"></script> <script src="../../js/dist/button.js"></script> <script src="../../js/dist/carousel.js"></script> + <script src="../../js/dist/collapse.js"></script> <!-- Old Plugin sources --> - <script src="../../js/collapse.js"></script> <script src="../../js/dropdown.js"></script> <script src="../../js/modal.js"></script> <script src="../../js/scrollspy.js"></script> diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js index 0efa65400..78fafc6c2 100644 --- a/js/tests/unit/collapse.js +++ b/js/tests/unit/collapse.js @@ -355,7 +355,7 @@ $(function () { $('<div id="body1" aria-expanded="true" class="in"/>').appendTo($groups.eq(0)) - var $target2 = $('<a class="collapsed" data-toggle="collapse" role="button" href="#body2" data-parent="#accordion"/>').appendTo($groups.eq(1)) + var $target2 = $('<a role="button" data-toggle="collapse" href="#body2" data-parent="#accordion" class="collapsed" />').appendTo($groups.eq(1)) $('<div id="body2" aria-expanded="false"/>').appendTo($groups.eq(1)) @@ -400,7 +400,7 @@ $(function () { $body2 .toggleClass('in collapsing') - .data('bs.collapse').transitioning = 1 + .data('bs.collapse')._isTransitioning = 1 $target1.trigger('click') diff --git a/js/tests/visual/collapse.html b/js/tests/visual/collapse.html index 3b8a42e3d..2ccc787ec 100644 --- a/js/tests/visual/collapse.html +++ b/js/tests/visual/collapse.html @@ -71,8 +71,8 @@ <!-- JavaScript Includes --> <script src="../vendor/jquery.min.js"></script> -<script src="../../transition.js"></script> -<script src="../../collapse.js"></script> +<script src="../../dist/util.js"></script> +<script src="../../dist/collapse.js"></script> </body> </html> |