deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Register as a CommonJS async module if in that kind of environment. Fixes #7102.

Browse source
This commit is contained in:
jrburke 2010-12-27 13:01:20 -06:00 committed by Colin Snover
parent 01cba2ecaa
commit 6ffa730721
3 changed files with 35 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core.js
View file

@ -886,6 +886,11 @@ function doScrollCheck() {
jQuery.ready(); jQuery.ready();
} }
// Expose jQuery as an Asynchronous Module
if ( typeof define !== "undefined" ) {
define( "jquery", [], function () { return jQuery; } );
}
// Expose jQuery to the global object // Expose jQuery to the global object
return (window.jQuery = window.$ = jQuery); return (window.jQuery = window.$ = jQuery);

7
test/data/testinit.js
View file

@ -1,7 +1,12 @@
var jQuery = this.jQuery || "jQuery", // For testing .noConflict() var jQuery = this.jQuery || "jQuery", // For testing .noConflict()
$ = this.$ || "$", $ = this.$ || "$",
originaljQuery = jQuery, originaljQuery = jQuery,
original$ = $; original$ = $,
commonJSDefined;
function define(module, dependencies, callback) {
commonJSDefined = callback();
}
/** /**
* Returns an array of elements with the given IDs, eg. * Returns an array of elements with the given IDs, eg.

4
test/unit/core.js
View file

@ -12,7 +12,9 @@ test("Basic requirements", function() {
}); });
test("jQuery()", function() { test("jQuery()", function() {
expect(23); expect(24);
strictEqual( commonJSDefined, jQuery, "CommonJS registered (Bug #7102)" );
// Basic constructor's behavior // Basic constructor's behavior