diff options
author | Thomas Park <thomas@thomaspark.me> | 2014-11-01 21:05:20 -0400 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.me> | 2014-11-01 21:05:20 -0400 |
commit | 918b2a49ca6ac074bac47f6685cf3a687a4c6212 (patch) | |
tree | 5d11a2820c6e0726a6ee071724557d12a90c6709 /bower_components/jquery/src/exports/global.js | |
parent | 5c12c8a99c04fbff7d13e97679121a5de13e01d6 (diff) |
3.2.0 -> 3.3.0
Diffstat (limited to 'bower_components/jquery/src/exports/global.js')
-rw-r--r-- | bower_components/jquery/src/exports/global.js | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/bower_components/jquery/src/exports/global.js b/bower_components/jquery/src/exports/global.js new file mode 100644 index 00000000..8eee5bb7 --- /dev/null +++ b/bower_components/jquery/src/exports/global.js @@ -0,0 +1,32 @@ +define([ + "../core", + "../var/strundefined" +], function( jQuery, strundefined ) { + +var + // Map over jQuery in case of overwrite + _jQuery = window.jQuery, + + // Map over the $ in case of overwrite + _$ = window.$; + +jQuery.noConflict = function( deep ) { + if ( window.$ === jQuery ) { + window.$ = _$; + } + + if ( deep && window.jQuery === jQuery ) { + window.jQuery = _jQuery; + } + + return jQuery; +}; + +// Expose jQuery and $ identifiers, even in +// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557) +// and CommonJS for browser emulators (#13566) +if ( typeof noGlobal === strundefined ) { + window.jQuery = window.$ = jQuery; +} + +}); |