Build: fix tests in AMD mode

This commit is contained in:
Timmy Willison
2014-12-09 15:39:24 -05:00
parent 828a718aa0
commit 57652eecd9
7 changed files with 31 additions and 34 deletions

View File

@@ -21,7 +21,8 @@
"globals": {
"jQuery": true,
"define": true,
"module": true
"define": false,
"module": false,
"noGlobal": true
}
}

View File

@@ -1,7 +1,3 @@
define([
"../core"
], function( jQuery ) {
var
// Map over jQuery in case of overwrite
_jQuery = window.jQuery,
@@ -24,8 +20,6 @@ jQuery.noConflict = function( deep ) {
// Expose jQuery and $ identifiers, even in
// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
// and CommonJS for browser emulators (#13566)
if ( typeof noGlobal === "undefined" ) {
if ( !noGlobal ) {
window.jQuery = window.$ = jQuery;
}
});

5
src/jquery.js vendored
View File

@@ -29,10 +29,9 @@ define([
"./offset",
"./dimensions",
"./deprecated",
"./exports/amd",
"./exports/global"
"./exports/amd"
], function( jQuery ) {
return jQuery;
return (window.jQuery = window.$ = jQuery);
});

View File

@@ -1 +1,2 @@
return jQuery;
}));