aboutsummaryrefslogtreecommitdiffstats
path: root/src/core.js
diff options
context:
space:
mode:
authorjaubourg <j@ubourg.net>2010-12-28 02:02:31 +0100
committerjaubourg <j@ubourg.net>2010-12-28 02:02:31 +0100
commit97b32d78307273f8bd2e5147bf5c0f0a45607a95 (patch)
treec1cddb6a87257aaa14a0ac3d04d66460aec9f177 /src/core.js
parent85f0dda56289ed6c044dadb3a42b1a4d2ddb0891 (diff)
parent5fd21fc02bda43d4e31bcf2d5b55b918a9190a7f (diff)
downloadjquery-97b32d78307273f8bd2e5147bf5c0f0a45607a95.tar.gz
jquery-97b32d78307273f8bd2e5147bf5c0f0a45607a95.zip
Merge branch 'master' of github.com:jquery/jquery into deferred
Diffstat (limited to 'src/core.js')
-rw-r--r--src/core.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core.js b/src/core.js
index 3763cd0fe..eb0c1c8a7 100644
--- a/src/core.js
+++ b/src/core.js
@@ -1038,6 +1038,11 @@ function doScrollCheck() {
jQuery.ready();
}
+// Expose jQuery as an Asynchronous Module
+if ( typeof define !== "undefined" ) {
+ define( "jquery", [], function () { return jQuery; } );
+}
+
// Expose jQuery to the global object
return (window.jQuery = window.$ = jQuery);