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

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

Browse source 
This reverts commit 6ffa730721.

Conflicts:

	src/core.js
This commit is contained in:
wycats 2011-01-05 13:26:05 -08:00
parent cbf591152c
commit ae6655bcb6
3 changed files with 23 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core.js
View file

@ -1034,11 +1034,6 @@ function doScrollCheck() {
jQuery.ready(); jQuery.ready();
} }
// Expose jQuery as an Asynchronous Module
if ( typeof define === "function" ) {
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,12 +1,7 @@
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,9 +12,7 @@ test("Basic requirements", function() {
}); });
test("jQuery()", function() { test("jQuery()", function() {
expect(24); expect(23);
strictEqual( commonJSDefined, jQuery, "CommonJS registered (Bug #7102)" );
// Basic constructor's behavior // Basic constructor's behavior