library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build: Upgrade to qunit-composite 1.1.0

Browse Source 
Ref #10119
Closes gh-1528
This commit is contained in:
Scott González 2015-04-09 09:11:34 -04:00
parent 4bf80d209a
commit f499569bff
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -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",

17
external/qunit-composite/qunit-composite.js vendored
View File

@ -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 );
}));