diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2015-04-09 09:11:34 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2015-04-09 09:28:25 -0400 |
| commit | f499569bffae60a6a7161eb2e13ec409afb98450 (patch) | |
| tree | 801ed5acdb9ac6172940078802c1d75fcb220d93 | |
| parent | 4bf80d209a7e804e1aa33d92faf3812a714a03c2 (diff) | |
| download | jquery-ui-f499569bffae60a6a7161eb2e13ec409afb98450.tar.gz jquery-ui-f499569bffae60a6a7161eb2e13ec409afb98450.zip | |
Build: Upgrade to qunit-composite 1.1.0
Ref #10119
Closes gh-1528
| -rw-r--r-- | bower.json | 2 | ||||
| -rw-r--r-- | external/qunit-composite/qunit-composite.js | 17 |
2 files changed, 15 insertions, 4 deletions
diff --git a/bower.json b/bower.json index 543a98db8..b5b8e4420 100644 --- a/bower.json +++ b/bower.json @@ -17,7 +17,7 @@ "qunit": "1.18.0", "qunit-assert-classes": "0.1.5", "qunit-assert-close": "JamesMGreene/qunit-assert-close#v1.1.1", - "qunit-composite": "JamesMGreene/qunit-composite#v1.0.4", + "qunit-composite": "JamesMGreene/qunit-composite#v1.1.0", "requirejs": "2.1.14", "jquery-1.7.0": "jquery#1.7.0", diff --git a/external/qunit-composite/qunit-composite.js b/external/qunit-composite/qunit-composite.js index 6cff04b51..1ffd2eea5 100644 --- a/external/qunit-composite/qunit-composite.js +++ b/external/qunit-composite/qunit-composite.js @@ -1,5 +1,5 @@ /** - * QUnit Composite v1.0.4 + * QUnit Composite v1.0.5-pre * * https://github.com/JamesMGreene/qunit-composite * @@ -7,7 +7,13 @@ * Released under the MIT license. * https://jquery.org/license/ */ -(function( QUnit ) { +(function( factory ) { + if ( typeof define === "function" && define.amd ) { + define( [ "qunit" ], factory ); + } else { + factory( QUnit ); + } +}(function( QUnit ) { var iframe, hasBound, modules = 1, executingComposite = false; @@ -60,6 +66,11 @@ function initIframe() { return; } + // Deal with QUnit being loaded asynchronously via AMD + if ( !iframeWin.QUnit && iframeWin.define && iframeWin.define.amd ) { + return iframeWin.require( [ "qunit" ], onIframeLoad ); + } + iframeWin.QUnit.moduleStart(function( data ) { // Capture module name for messages moduleName = data.name; @@ -181,4 +192,4 @@ QUnit.testDone(function( data ) { current.getElementsByTagName( "a" )[ 0 ].href = src; }); -})( QUnit ); +})); |