diff options
Diffstat (limited to 'js/vendor/jquery/src/exports')
-rw-r--r-- | js/vendor/jquery/src/exports/amd.js | 6 | ||||
-rw-r--r-- | js/vendor/jquery/src/exports/global.js | 10 |
2 files changed, 5 insertions, 11 deletions
diff --git a/js/vendor/jquery/src/exports/amd.js b/js/vendor/jquery/src/exports/amd.js index 9a9846f9f..add6eb9bd 100644 --- a/js/vendor/jquery/src/exports/amd.js +++ b/js/vendor/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/js/vendor/jquery/src/exports/global.js b/js/vendor/jquery/src/exports/global.js index 6513287c6..be9cbfb3a 100644 --- a/js/vendor/jquery/src/exports/global.js +++ b/js/vendor/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; } - -}); |