diff options
| author | Mark Otto <[email protected]> | 2014-01-15 13:08:35 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-15 13:08:35 -0800 |
| commit | a633fc042d4060499964fca7333edc5ac55cde4b (patch) | |
| tree | 4422ee5ec858137d5b07a34e662dd1c493a6f06b /js | |
| parent | cae63200d8a645f385349debd940666ddbca0b38 (diff) | |
| parent | 1facbf6e7a32cfb1334e9c84a59c762c27f13cb5 (diff) | |
| download | bootstrap-a633fc042d4060499964fca7333edc5ac55cde4b.tar.xz bootstrap-a633fc042d4060499964fca7333edc5ac55cde4b.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/components.html
docs/css.html
Diffstat (limited to 'js')
| -rw-r--r-- | js/tests/index.html | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/js/tests/index.html b/js/tests/index.html index 4e3d487db..2983a0042 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -4,12 +4,17 @@ <title>Bootstrap Plugin Test Suite</title> <!-- jquery --> - <!--<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" media="screen"> <script src="vendor/qunit.js"></script> + <script> + // See https://github.com/axemclion/grunt-saucelabs#test-result-details-with-qunit + QUnit.done(function(results) { + window.global_test_results = results + }) + </script> <!-- plugin sources --> <script src="../../js/transition.js"></script> |