diff options
author | Lars Henrik Mai <lars.mai@kontinui.de> | 2014-09-23 08:44:31 +0200 |
---|---|---|
committer | Lars Henrik Mai <lars.mai@kontinui.de> | 2014-09-23 08:44:31 +0200 |
commit | 7fc6575a7a38daa21a26e2b179a92ca809b61eea (patch) | |
tree | 679498b3fd59aa375c6c6ce7ba48ed3d6a6e11d7 /source/bower_components/jquery/src/exports | |
parent | 35239fc1f4641db1e602383b43cc29b151cde9b9 (diff) | |
parent | 1c177d628ffdb693483b1c39b94b5f19adcd8095 (diff) |
Merge branch 'replace-bootstrap-with-foundation'
Diffstat (limited to 'source/bower_components/jquery/src/exports')
-rw-r--r-- | source/bower_components/jquery/src/exports/amd.js | 24 | ||||
-rw-r--r-- | source/bower_components/jquery/src/exports/global.js | 32 |
2 files changed, 56 insertions, 0 deletions
diff --git a/source/bower_components/jquery/src/exports/amd.js b/source/bower_components/jquery/src/exports/amd.js new file mode 100644 index 0000000..9a9846f --- /dev/null +++ b/source/bower_components/jquery/src/exports/amd.js @@ -0,0 +1,24 @@ +define([ + "../core" +], function( jQuery ) { + +// Register as a named AMD module, since jQuery can be concatenated with other +// files that may use define, but not via a proper concatenation script that +// understands anonymous AMD modules. A named AMD is safest and most robust +// way to register. Lowercase jquery is used because AMD module names are +// derived from file names, and jQuery is normally delivered in a lowercase +// file name. Do this after creating the global so that if an AMD module wants +// to call noConflict to hide this version of jQuery, it will work. + +// Note that for maximum portability, libraries that are not jQuery should +// declare themselves as anonymous modules, and avoid setting a global if an +// AMD loader is present. jQuery is a special case. For more information, see +// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon + +if ( typeof define === "function" && define.amd ) { + define( "jquery", [], function() { + return jQuery; + }); +} + +}); diff --git a/source/bower_components/jquery/src/exports/global.js b/source/bower_components/jquery/src/exports/global.js new file mode 100644 index 0000000..8eee5bb --- /dev/null +++ b/source/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; +} + +}); |