From: Timo Tijhof <krinklemail@gmail.com>
Date: Mon, 14 Mar 2016 17:50:09 +0000 (+0000)
Subject: resourceloader: Remove 'require' and 'module' from debug mode
X-Git-Tag: 1.31.0-rc.0~7625
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=87c12927d53b8617f92abf2c3cfeea252d8cce3e;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Remove 'require' and 'module' from debug mode

Partially reverts 94c116240 and 7fd977b242 as it was incorrectly
split up. This should've been part of Idbd05488 instead of 94c116240.

Bug: T108655
Bug: T129776
Change-Id: Ia5e6e57c9bd651ec913a2543e2df8951ff345ea2
---

diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index 4aad2bac90..9d799db154 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1189,18 +1189,11 @@
 			 * @param {string} [moduleName] Name of currently executing module
 			 * @return {jQuery.Promise}
 			 */
-			function queueModuleScript( src, moduleName ) {
+			function queueModuleScript( src ) {
 				var r = $.Deferred();
 
 				pendingRequests.push( function () {
-					if ( moduleName && hasOwn.call( registry, moduleName ) ) {
-						window.require = mw.loader.require;
-						window.module = registry[ moduleName ].module;
-					}
 					addScript( src ).always( function () {
-						// Clear environment
-						delete window.require;
-						delete window.module;
 						r.resolve();
 
 						// Start the next one (if any)
diff --git a/tests/qunit/data/defineCallMwLoaderTestCallback.js b/tests/qunit/data/defineCallMwLoaderTestCallback.js
deleted file mode 100644
index afd886c334..0000000000
--- a/tests/qunit/data/defineCallMwLoaderTestCallback.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = 'Define worked.';
diff --git a/tests/qunit/data/requireCallMwLoaderTestCallback.js b/tests/qunit/data/requireCallMwLoaderTestCallback.js
deleted file mode 100644
index 8bc087b007..0000000000
--- a/tests/qunit/data/requireCallMwLoaderTestCallback.js
+++ /dev/null
@@ -1,2 +0,0 @@
-var x = require( 'test.require.define' );
-module.exports = 'Require worked.' + x;
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
index dd43c553bc..ce4ea8b147 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -1127,24 +1127,4 @@
 		}, /is not loaded/, 'Requesting non-existent modules throws error.' );
 	} );
 
-	QUnit.asyncTest( 'mw.loader require in debug mode', 1, function ( assert ) {
-		var path = mw.config.get( 'wgScriptPath' );
-		mw.loader.register( [
-			[ 'test.require.define', '0' ],
-			[ 'test.require.callback', '0', [ 'test.require.define' ] ]
-		] );
-		mw.loader.implement( 'test.require.callback', [ QUnit.fixurl( path + '/tests/qunit/data/requireCallMwLoaderTestCallback.js' ) ] );
-		mw.loader.implement( 'test.require.define', [ QUnit.fixurl( path + '/tests/qunit/data/defineCallMwLoaderTestCallback.js' ) ] );
-
-		mw.loader.using( 'test.require.callback', function () {
-			QUnit.start();
-			var exported = mw.loader.require( 'test.require.callback' );
-			assert.strictEqual( exported, 'Require worked.Define worked.',
-				'module.exports worked in debug mode' );
-		}, function () {
-			QUnit.start();
-			assert.ok( false, 'Error callback fired while loader.using "test.require.callback" module' );
-		} );
-	} );
-
 }( mediaWiki, jQuery ) );