Skip to content
Permalink
Browse files

exports/global: Do not attach global variables for most CommonJS envi…

…ronments

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.
  • Loading branch information
timmywil committed Dec 20, 2013
1 parent 281808f commit e0fad093b63d2d197a9c59ccce8896d75a83c95e
Showing with 8 additions and 5 deletions.
  1. +6 −3 src/exports/global.js
  2. +2 −2 src/intro.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;
}

});
@@ -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

0 comments on commit e0fad09

Please sign in to comment.
You can’t perform that action at this time.