diff options
| author |   Dererk <dererk@satellogic.com> | 2016-11-15 14:18:53 -0300 |
|---|---|---|
| committer | Dererk <dererk@satellogic.com> | 2016-11-15 14:18:53 -0300 |
| commit | 1ad5102b7ddd181bb9c632b124d3ea4c7db28be6 (patch) | |
| tree | 73dda18465d0f4b8eb52d4482282a387c9f67c95 /bower_components/jquery/src/exports | |
| parent | b67294f76809a681ff73f209ed691a3e3f00563d (diff) | |
| parent | ffb671c61a24a9086343b54bad080e145ff33fc5 (diff) | |
Merge tag 'upstream/7.8.1'
Upstream version 7.8.1
# gpg: Firmado el mar 15 nov 2016 14:18:48 ART
# gpg: usando RSA clave A6C7B88B9583046A11C5403E0B00FB6CEBE2D002
# gpg: Firma correcta de "Ulises Vitulli <dererk@debian.org>" [absoluta]
# gpg: alias "Dererk <dererk@torproject.org>" [absoluta]
# gpg: alias "Ulises Vitulli <uvitulli@fi.uba.ar>" [absoluta]
# gpg: alias "Ulises Vitulli <dererk@satellogic.com>" [absoluta]
Diffstat (limited to 'bower_components/jquery/src/exports')
| -rw-r--r-- | bower_components/jquery/src/exports/amd.js | 6 | ||||
| -rw-r--r-- | bower_components/jquery/src/exports/global.js | 10 |
2 files changed, 5 insertions, 11 deletions
diff --git a/bower_components/jquery/src/exports/amd.js b/bower_components/jquery/src/exports/amd.js index 9a9846f..add6eb9 100644 --- a/bower_components/jquery/src/exports/amd.js +++ b/bower_components/jquery/src/exports/amd.js @@ -1,4 +1,4 @@ -define([ +define( [ "../core" ], function( jQuery ) { @@ -18,7 +18,7 @@ define([ if ( typeof define === "function" && define.amd ) { define( "jquery", [], function() { return jQuery; - }); + } ); } -}); +} ); diff --git a/bower_components/jquery/src/exports/global.js b/bower_components/jquery/src/exports/global.js index 8eee5bb..17ac17d 100644 --- a/bower_components/jquery/src/exports/global.js +++ b/bower_components/jquery/src/exports/global.js @@ -1,9 +1,5 @@ -define([ - "../core", - "../var/strundefined" -], function( jQuery, strundefined ) { - var + // Map over jQuery in case of overwrite _jQuery = window.jQuery, @@ -25,8 +21,6 @@ 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) -if ( typeof noGlobal === strundefined ) { +if ( !noGlobal ) { window.jQuery = window.$ = jQuery; } - -}); |