library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove the define.amd.jQuery check, ref gh-1150.

Browse Source
This commit is contained in:
jrburke 2013-01-30 15:32:19 -08:00 committed by Dave Methvin
parent 3f05afbd8d
commit 34c4e122a3
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/exports.js
View File

@ -8,19 +8,14 @@ if ( typeof module === "object" && typeof module.exports === "object" ) {
// Otherwise expose jQuery to the global object as usual // Otherwise expose jQuery to the global object as usual
window.jQuery = window.$ = jQuery; window.jQuery = window.$ = jQuery;
// Expose jQuery as an AMD module, but only for AMD loaders that // Register as a named AMD module, since jQuery can be concatenated with other
// understand the issues with loading multiple versions of jQuery // files that may use define, but not via a proper concatenation script that
// in a page that all might call define(). The loader will indicate // understands anonymous AMD modules. A named AMD is safest and most robust
// they have special allowances for multiple jQuery versions by // way to register. Lowercase jquery is used because AMD module names are
// specifying define.amd.jQuery = true. Register as a named module, // derived from file names, and jQuery is normally delivered in a lowercase
// since jQuery can be concatenated with other files that may use define, // file name. Do this after creating the global so that if an AMD module wants
// but not use a proper concatenation script that understands anonymous // to call noConflict to hide this version of jQuery, it will work.
// AMD modules. A named AMD is safest and most robust way to register. if ( typeof define === "function" && define.amd ) {
// Lowercase jquery is used because AMD module names are derived from
// file names, and jQuery is normally delivered in a lowercase file name.
// Do this after creating the global so that if an AMD module wants to call
// noConflict to hide this version of jQuery, it will work.
if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
define( "jquery", [], function () { return jQuery; } ); define( "jquery", [], function () { return jQuery; } );
} }
} }

4
test/data/testinit.js
View File

@ -19,9 +19,7 @@ function define( name, dependencies, callback ) {
amdDefined = callback(); amdDefined = callback();
} }
define.amd = { define.amd = {};
jQuery: true
};
/** /**
* Returns an array of elements with the given IDs * Returns an array of elements with the given IDs