diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/exports/global.js | 12 | ||||
-rw-r--r-- | src/jquery.js | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/exports/global.js b/src/exports/global.js index ebdb73b30..460b56e47 100644 --- a/src/exports/global.js +++ b/src/exports/global.js @@ -1,10 +1,8 @@ -/* ExcludeStart */ +define( [ + "../core" +], function( jQuery, noGlobal ) { -// This file is included in a different way from all the others -// so the "use strict" pragma is not needed. -/* eslint strict: "off" */ - -/* ExcludeEnd */ +"use strict"; var @@ -32,3 +30,5 @@ jQuery.noConflict = function( deep ) { if ( !noGlobal ) { window.jQuery = window.$ = jQuery; } + +} ); diff --git a/src/jquery.js b/src/jquery.js index 744a98e5d..52fc87dbd 100644 --- a/src/jquery.js +++ b/src/jquery.js @@ -30,11 +30,12 @@ define( [ "./offset", "./dimensions", "./deprecated", - "./exports/amd" + "./exports/amd", + "./exports/global" ], function( jQuery ) { "use strict"; -return ( window.jQuery = window.$ = jQuery ); +return jQuery; } ); |