mirror of
https://github.com/jquery/jquery.git
synced 2026-02-01 21:45:03 -05:00
Build: fix tests in AMD mode
This commit is contained in:
@@ -21,7 +21,8 @@
|
||||
|
||||
"globals": {
|
||||
"jQuery": true,
|
||||
"define": true,
|
||||
"module": true
|
||||
"define": false,
|
||||
"module": false,
|
||||
"noGlobal": true
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
5
src/jquery.js
vendored
@@ -29,10 +29,9 @@ define([
|
||||
"./offset",
|
||||
"./dimensions",
|
||||
"./deprecated",
|
||||
"./exports/amd",
|
||||
"./exports/global"
|
||||
"./exports/amd"
|
||||
], function( jQuery ) {
|
||||
|
||||
return jQuery;
|
||||
return (window.jQuery = window.$ = jQuery);
|
||||
|
||||
});
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
return jQuery;
|
||||
}));
|
||||
|
||||
Reference in New Issue
Block a user