When converting the source to AMD, don't forget to AMD

This commit is contained in:
Timmy Willison 2013-08-16 12:54:43 -04:00
parent 338e48aea5
commit b693b370a4
3 changed files with 14 additions and 4 deletions

View File

@ -57,10 +57,13 @@ module.exports = function( grunt ) {
} }
// Remove define wrappers, closure ends, and empty declarations // Remove define wrappers, closure ends, and empty declarations
// Unless it's the proper AMD define
contents = contents contents = contents
.replace( /define\([^{]*?{/, "" ) .replace( /define\([^{]*?{/, "" )
.replace( rdefineEnd, "" ) .replace( rdefineEnd, "" );
// Remove empty definitions // Remove empty definitions
contents = contents
.replace( /define\(\[[^\]]+\]\)[\W\n]+$/, "" ); .replace( /define\(\[[^\]]+\]\)[\W\n]+$/, "" );
} }
return contents; return contents;

View File

@ -1,3 +1,7 @@
define([
"../core"
], function( jQuery ) {
// Register as a named AMD module, since jQuery can be concatenated with other // 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 // 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 // understands anonymous AMD modules. A named AMD is safest and most robust
@ -10,3 +14,5 @@ if ( typeof define === "function" && define.amd ) {
return jQuery; return jQuery;
}); });
} }
});

3
src/jquery.js vendored
View File

@ -27,7 +27,8 @@ define([
"./effects/animated-selector", "./effects/animated-selector",
"./offset", "./offset",
"./dimensions", "./dimensions",
"./deprecated" "./deprecated",
"./exports/amd"
], function( jQuery ) { ], function( jQuery ) {
// Expose jQuery and $ identifiers, even in // Expose jQuery and $ identifiers, even in