diff options
Diffstat (limited to 'libs/bower_components/jquery/src/exports')
-rw-r--r-- | libs/bower_components/jquery/src/exports/amd.js | 6 | ||||
-rw-r--r-- | libs/bower_components/jquery/src/exports/global.js | 14 |
2 files changed, 7 insertions, 13 deletions
diff --git a/libs/bower_components/jquery/src/exports/amd.js b/libs/bower_components/jquery/src/exports/amd.js index 9a9846f9f6..add6eb9bde 100644 --- a/libs/bower_components/jquery/src/exports/amd.js +++ b/libs/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/libs/bower_components/jquery/src/exports/global.js b/libs/bower_components/jquery/src/exports/global.js index 8eee5bb7f0..be9cbfb3ab 100644 --- a/libs/bower_components/jquery/src/exports/global.js +++ b/libs/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, @@ -22,11 +18,9 @@ jQuery.noConflict = function( deep ) { return jQuery; }; -// Expose jQuery and $ identifiers, even in -// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557) +// 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; } - -}); |