Commit ae6655bc authored by wycats's avatar wycats

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

This reverts commit 6ffa7307.

Conflicts:

	src/core.js
parent cbf59115
......@@ -1034,11 +1034,6 @@ function doScrollCheck() {
jQuery.ready();
}
// Expose jQuery as an Asynchronous Module
if ( typeof define === "function" ) {
define( "jquery", [], function () { return jQuery; } );
}
// Expose jQuery to the global object
return (window.jQuery = window.$ = jQuery);
......
var jQuery = this.jQuery || "jQuery", // For testing .noConflict()
$ = this.$ || "$",
originaljQuery = jQuery,
original$ = $,
commonJSDefined;
function define(module, dependencies, callback) {
commonJSDefined = callback();
}
original$ = $;
/**
* Returns an array of elements with the given IDs, eg.
......
......@@ -12,9 +12,7 @@ test("Basic requirements", function() {
});
test("jQuery()", function() {
expect(24);
strictEqual( commonJSDefined, jQuery, "CommonJS registered (Bug #7102)" );
expect(23);
// Basic constructor's behavior
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment