Skip to content
Permalink
Browse files

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

  • Loading branch information...
jrburke authored and dmethvin committed Jan 30, 2013
1 parent 3f05afb commit 34c4e122a333bbfc80bd4f6e79db20f3a73ae5b3
Showing with 9 additions and 16 deletions.
  1. +8 −13 src/exports.js
  2. +1 −3 test/data/testinit.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; } );
}
}
@@ -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

0 comments on commit 34c4e12

Please sign in to comment.
You can’t perform that action at this time.