mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
Revert "Register as a CommonJS async module if in that kind of environment. Fixes #7102."
This reverts commit 6ffa730721
.
Conflicts:
src/core.js
This commit is contained in:
parent
cbf591152c
commit
ae6655bcb6
@ -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);
|
||||
|
||||
|
@ -1,12 +1,7 @@
|
||||
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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user