aboutsummaryrefslogtreecommitdiffstats
path: root/bower_components/jquery/src/exports
diff options
context:
space:
mode:
authorLibravatarDererk <dererk@satellogic.com>2016-11-15 14:18:46 -0300
committerLibravatarDererk <dererk@satellogic.com>2016-11-15 14:18:46 -0300
commitffb671c61a24a9086343b54bad080e145ff33fc5 (patch)
tree2c5291f7a34edf4afdc8e07887a148291bfa3fa1 /bower_components/jquery/src/exports
parent4e3224c012df9f74f010eb92203520515e8537b9 (diff)
New upstream version 7.8.1upstream/7.8.1
Diffstat (limited to 'bower_components/jquery/src/exports')
-rw-r--r--bower_components/jquery/src/exports/amd.js6
-rw-r--r--bower_components/jquery/src/exports/global.js10
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;
}
-
-});