diff options
| author | Jacob Thornton <[email protected]> | 2012-01-31 13:18:34 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-31 13:18:34 -0800 |
| commit | 0bfbe5058d61ae93d82b09f1dff7eb30dc22426e (patch) | |
| tree | 6ccf3dd9c36ff4b1f6cde5edbce21cdf0de78497 /js/tests/index.html | |
| parent | 43cbc9440425b7c97c943690eefd14520de708e1 (diff) | |
| parent | 4bd1ba4e0dc44d1d16161306576548f378ab1f8a (diff) | |
| download | bootstrap-0bfbe5058d61ae93d82b09f1dff7eb30dc22426e.tar.xz bootstrap-0bfbe5058d61ae93d82b09f1dff7eb30dc22426e.zip | |
Merge branch '2.0-wip'
Conflicts:
.gitignore
LICENSE
Makefile
bootstrap.css
bootstrap.min.css
docs/assets/js/application.js
docs/assets/js/google-code-prettify/prettify.css
docs/index.html
docs/javascript.html
examples/container-app.html
examples/fluid.html
examples/hero.html
js/bootstrap-alerts.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tabs.js
js/bootstrap-twipsy.js
js/tests/index.html
js/tests/unit/bootstrap-modal.js
js/tests/unit/bootstrap-popover.js
js/tests/unit/bootstrap-tabs.js
lib/forms.less
lib/mixins.less
lib/patterns.less
lib/scaffolding.less
lib/tables.less
Diffstat (limited to 'js/tests/index.html')
| -rw-r--r-- | js/tests/index.html | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/js/tests/index.html b/js/tests/index.html index 355c3f0af..8c710de36 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -4,29 +4,38 @@ <title>Bootstrap Plugin Test Suite</title> <!-- jquery --> - <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script> + <!--<script src="http://code.jquery.com/jquery-1.7.min.js"></script>--> + <script src="vendor/jquery.js"></script> <!-- qunit --> <link rel="stylesheet" href="vendor/qunit.css" type="text/css" media="screen" /> <script src="vendor/qunit.js"></script> <!-- plugin sources --> - <script src="../../js/bootstrap-alerts.js"></script> + <script src="../../js/bootstrap-transition.js"></script> + <script src="../../js/bootstrap-alert.js"></script> + <script src="../../js/bootstrap-button.js"></script> + <script src="../../js/bootstrap-collapse.js"></script> <script src="../../js/bootstrap-dropdown.js"></script> <script src="../../js/bootstrap-modal.js"></script> - <script src="../../js/bootstrap-tabs.js"></script> - <script src="../../js/bootstrap-twipsy.js"></script> + <script src="../../js/bootstrap-scrollspy.js"></script> + <script src="../../js/bootstrap-tab.js"></script> + <script src="../../js/bootstrap-tooltip.js"></script> <script src="../../js/bootstrap-popover.js"></script> - <script src="../../js/bootstrap-buttons.js"></script> + <script src="../../js/bootstrap-typeahead.js"></script> <!-- unit tests --> - <script src="unit/bootstrap-alerts.js"></script> + <script src="unit/bootstrap-transition.js"></script> + <script src="unit/bootstrap-alert.js"></script> + <script src="unit/bootstrap-button.js"></script> + <script src="unit/bootstrap-collapse.js"></script> <script src="unit/bootstrap-dropdown.js"></script> <script src="unit/bootstrap-modal.js"></script> + <script src="unit/bootstrap-scrollspy.js"></script> + <script src="unit/bootstrap-tab.js"></script> + <script src="unit/bootstrap-tooltip.js"></script> <script src="unit/bootstrap-popover.js"></script> - <script src="unit/bootstrap-tabs.js"></script> - <script src="unit/bootstrap-twipsy.js"></script> - <script src="unit/bootstrap-buttons.js"></script> + <script src="unit/bootstrap-typeahead.js"></script> <body> <div> @@ -34,7 +43,7 @@ <h2 id="qunit-banner"></h2> <h2 id="qunit-userAgent"></h2> <ol id="qunit-tests"></ol> - <div id="qunit-runoff"></div> + <div id="qunit-fixture"></div> </div> </body> </html>
\ No newline at end of file |