diff options
| author | Chris Rebert <[email protected]> | 2015-02-23 22:25:09 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-02-23 22:25:09 -0800 |
| commit | f4b734eebdc6ae528111f1e250bdc0673b467507 (patch) | |
| tree | 5d1cf3da28118c5bb474298a9e1e06a34aedb237 | |
| parent | 1cbbeef47c696fc4f389cd0df900cf6213ed327d (diff) | |
| parent | bda4fe87ca37c2ca03c0609847de68c0bb5f81cd (diff) | |
| download | bootstrap-f4b734eebdc6ae528111f1e250bdc0673b467507.tar.xz bootstrap-f4b734eebdc6ae528111f1e250bdc0673b467507.zip | |
Merge pull request #15894 from twbs/bump-qunit
upgrade to QUnit v1.17.1
| -rw-r--r-- | js/tests/vendor/qunit.css | 4 | ||||
| -rw-r--r-- | js/tests/vendor/qunit.js | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/js/tests/vendor/qunit.css b/js/tests/vendor/qunit.css index bfcdca411..0eb0b0171 100644 --- a/js/tests/vendor/qunit.css +++ b/js/tests/vendor/qunit.css @@ -1,12 +1,12 @@ /*! - * QUnit 1.17.0 + * QUnit 1.17.1 * http://qunitjs.com/ * * Copyright jQuery Foundation and other contributors * Released under the MIT license * http://jquery.org/license * - * Date: 2015-01-19T11:58Z + * Date: 2015-01-20T19:39Z */ /** Font Family and Sizes */ diff --git a/js/tests/vendor/qunit.js b/js/tests/vendor/qunit.js index 46d404157..006ca4747 100644 --- a/js/tests/vendor/qunit.js +++ b/js/tests/vendor/qunit.js @@ -1,12 +1,12 @@ /*! - * QUnit 1.17.0 + * QUnit 1.17.1 * http://qunitjs.com/ * * Copyright jQuery Foundation and other contributors * Released under the MIT license * http://jquery.org/license * - * Date: 2015-01-19T11:58Z + * Date: 2015-01-20T19:39Z */ (function( window ) { @@ -2522,7 +2522,7 @@ function toolbarModuleFilter() { moduleFilter = document.createElement( "span" ), moduleFilterHtml = toolbarModuleFilterHtml(); - if ( !moduleFilterHtml ) { + if ( !toolbar || !moduleFilterHtml ) { return false; } |