Core: expose noConflict in AMD mode

- For compability reasons, we had already added the global
  in AMD mode, but without noConflict. This adds back noConflict
  to AMD (which fixes noConflict mode in the tests).

Fixes gh-2930

diff --git a/build/tasks/build.js b/build/tasks/build.js
index 7f0da1d6b40cf5e31a2d073acf8f6c6db02caf54..1579691a08989b11cecf90eb6df283d5dc153544 100644 (file)
--- a/build/tasks/build.js
+++ b/build/tasks/build.js
@@ -17,7 +17,6 @@ module.exports = function( grunt ) {
                read = function( fileName ) {
                        return grunt.file.read( srcFolder + fileName );
                },
-               globals = read( "exports/global.js" ),
                wrapper = read( "wrapper.js" ).split( /\/\/ \@CODE\n\/\/[^\n]+/ ),
                config = {
                        baseUrl: "src",
@@ -39,10 +38,7 @@ module.exports = function( grunt ) {
                        skipSemiColonInsertion: true,
                        wrap: {
                                start: wrapper[ 0 ].replace( /\/\*\s*eslint(?: |-).*\s*\*\/\n/, "" ),
-                               end: globals.replace(
-                                       /\/\*\s*ExcludeStart\s*\*\/[\w\W]*?\/\*\s*ExcludeEnd\s*\*\//ig,
-                                       ""
-                               ) + wrapper[ 1 ]
+                               end: wrapper[ 1 ]
                        },
                        rawText: {},
                        onBuildWrite: convert

diff --git a/src/exports/global.js b/src/exports/global.js
index ebdb73b3058c4f29932cd5e6982c20e67a29dd5a..460b56e4783035fa9c69765a998cb07b1e9c919a 100644 (file)
--- 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 744a98e5da5880b50df52ba8ffc921a7f2520e43..52fc87dbd4e2f97fe2e08411fab5e60102a87e68 100644 (file)
--- 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;
 
 } );

diff --git a/test/data/testinit.js b/test/data/testinit.js
index 9e2679654dba9dbf75cf26a06f9dedb68d280fa7..ef210e739500cc407d356a3a2112061ed3fa7515 100644 (file)
--- a/test/data/testinit.js
+++ b/test/data/testinit.js
@@ -320,9 +320,7 @@ this.loadTests = function() {
                                /**
                                 * Run in noConflict mode
                                 */
-                               if ( jQuery.noConflict ) {
-                                       jQuery.noConflict();
-                               }
+                               jQuery.noConflict();
 
                                // Load the TestSwarm listener if swarmURL is in the address.
                                if ( QUnit.isSwarm ) {

diff --git a/test/unit/core.js b/test/unit/core.js
index b00db8c333151fc3c6d662cb6a7c20f2919b3768..f5083b4a91f0ad0c5a3f3056e814fd1ae6830883 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -197,27 +197,24 @@ QUnit.test( "globalEval execution after script injection (#7862)", function( ass
        assert.ok( window.strictEvalTest - now < 500, "Code executed synchronously" );
 } );
 
-// This is not run in AMD mode
-if ( jQuery.noConflict ) {
-       QUnit.test( "noConflict", function( assert ) {
-               assert.expect( 7 );
+QUnit.test( "noConflict", function( assert ) {
+       assert.expect( 7 );
 
-               var $$ = jQuery;
+       var $$ = jQuery;
 
-               assert.strictEqual( jQuery, jQuery.noConflict(), "noConflict returned the jQuery object" );
-               assert.strictEqual( window[ "jQuery" ], $$, "Make sure jQuery wasn't touched." );
-               assert.strictEqual( window[ "$" ], original$, "Make sure $ was reverted." );
+       assert.strictEqual( jQuery, jQuery.noConflict(), "noConflict returned the jQuery object" );
+       assert.strictEqual( window[ "jQuery" ], $$, "Make sure jQuery wasn't touched." );
+       assert.strictEqual( window[ "$" ], original$, "Make sure $ was reverted." );
 
-               jQuery = $ = $$;
+       jQuery = $ = $$;
 
-               assert.strictEqual( jQuery.noConflict( true ), $$, "noConflict returned the jQuery object" );
-               assert.strictEqual( window[ "jQuery" ], originaljQuery, "Make sure jQuery was reverted." );
-               assert.strictEqual( window[ "$" ], original$, "Make sure $ was reverted." );
-               assert.ok( $$().pushStack( [] ), "Make sure that jQuery still works." );
+       assert.strictEqual( jQuery.noConflict( true ), $$, "noConflict returned the jQuery object" );
+       assert.strictEqual( window[ "jQuery" ], originaljQuery, "Make sure jQuery was reverted." );
+       assert.strictEqual( window[ "$" ], original$, "Make sure $ was reverted." );
+       assert.ok( $$().pushStack( [] ), "Make sure that jQuery still works." );
 
-               window[ "jQuery" ] = jQuery = $$;
-       } );
-}
+       window[ "jQuery" ] = jQuery = $$;
+} );
 
 QUnit.test( "trim", function( assert ) {
        assert.expect( 13 );