Merge pull request #15894 from twbs/bump-qunit

upgrade to QUnit v1.17.1
twbs · Feb 24, 2015 · f4b734e · f4b734e
2 parents 1cbbeef + bda4fe8
commit f4b734e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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;
 	}