exports/global: Do not attach global variables for most CommonJS environments

For CommonJS environments where the global already has a document, it is expected
that if a global is needed, the user can attach the global.

Fixes #14645.

diff --git a/src/exports/global.js b/src/exports/global.js
index ace2cdddd5484537125a4ce8da89ae494999606c..8eee5bb7f04860fcca920a88dac8d9749e91bd1b 100644 (file)
--- a/src/exports/global.js
+++ b/src/exports/global.js
@@ -1,6 +1,7 @@
 define([
-       "../core"
-], function( jQuery ) {
+       "../core",
+       "../var/strundefined"
+], function( jQuery, strundefined ) {
 
 var
        // Map over jQuery in case of overwrite
@@ -24,6 +25,8 @@ jQuery.noConflict = function( deep ) {
 // Expose jQuery and $ identifiers, even in
 // AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
 // and CommonJS for browser emulators (#13566)
-window.jQuery = window.$ = jQuery;
+if ( typeof noGlobal === strundefined ) {
+       window.jQuery = window.$ = jQuery;
+}
 
 });

diff --git a/src/intro.js b/src/intro.js
index 417c61aab7eaffa2bd37dba703a7699ef5ac64a6..20b0f4205d610bb6d879eefe333e58f878d7f9c7 100644 (file)
--- a/src/intro.js
+++ b/src/intro.js
@@ -23,7 +23,7 @@
                // e.g. var jQuery = require("jquery")(window);
                // See ticket #14549 for more info
                module.exports = global.document ?
-                       factory( global ) :
+                       factory( global, true ) :
                        function( w ) {
                                if ( !w.document ) {
                                        throw new Error( "jQuery requires a window with a document" );
@@ -35,7 +35,7 @@
        }
 
 // Pass this, window may not be defined yet
-}(this, function( window ) {
+}(this, function( window, noGlobal ) {
 
 // Can't do this because several apps including ASP.NET trace
 // the stack via arguments.caller.callee and Firefox dies if