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

diff --git a/src/exports.js b/src/exports.js
index c535b7eefd8afed7e2a897e49f6b72a87b0763c0..365c97bf6d2ab1e7af4c4fbadd6920b758938933 100644 (file)
--- a/src/exports.js
+++ b/src/exports.js
@@ -8,19 +8,14 @@ if ( typeof module === "object" && typeof module.exports === "object" ) {
        // Otherwise expose jQuery to the global object as usual
        window.jQuery = window.$ = jQuery;
 
-       // Expose jQuery as an AMD module, but only for AMD loaders that
-       // understand the issues with loading multiple versions of jQuery
-       // in a page that all might call define(). The loader will indicate
-       // they have special allowances for multiple jQuery versions by
-       // specifying define.amd.jQuery = true. Register as a named module,
-       // since jQuery can be concatenated with other files that may use define,
-       // but not use a proper concatenation script that understands anonymous
-       // AMD modules. A named AMD is safest and most robust way to register.
-       // 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 ) {
+       // Register as a named AMD module, since jQuery can be concatenated with other
+       // files that may use define, but not via a proper concatenation script that
+       // understands anonymous AMD modules. A named AMD is safest and most robust
+       // way to register. 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( "jquery", [], function () { return jQuery; } );
        }
 }

diff --git a/test/data/testinit.js b/test/data/testinit.js
index ea940cb6371b43dd0baf7495190175314b5618b4..87edfde29a9235abb9d01437c1f201b5d42a89b9 100644 (file)
--- a/test/data/testinit.js
+++ b/test/data/testinit.js
@@ -19,9 +19,7 @@ function define( name, dependencies, callback ) {
        amdDefined = callback();
 }
 
-define.amd = {
-       jQuery: true
-};
+define.amd = {};
 
 /**
  * Returns an array of elements with the given IDs