From a7017dbc0ab66d7db799a50594eed5848781aabf Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Thu, 25 Jul 2019 17:46:01 +0100
Subject: [PATCH] resourceloader: Move 'mw.config' assignment from startup.js
 to mediawiki.js

Before this change, the startup module responds as follows:

   ```lang=js
   ... contents of startup/mediawiki.js:
   ...... mw.config = null;
   ...
   ... contents of startup/startup.js:
   ...... mw.config = new mw.Map( bool );
   ```

After this change:

   ```lang=js
   ... contents of startup/mediawiki.js:
   ...... mw.config = new mw.Map( bool );
   ...
   ... contents of startup/startup.js:
   ......
   ```

Change-Id: I97fea20f17c4865aa4740482f3054532038531f0
---
 includes/resourceloader/ResourceLoaderStartUpModule.php | 6 +++---
 resources/src/startup/mediawiki.js                      | 3 +--
 resources/src/startup/startup.js                        | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index f0ef25a5b7..6b38ee4cf7 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -426,6 +426,9 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 			'$VARS.storeEnabled' => ResourceLoader::encodeJsonForScript(
 				$conf->get( 'ResourceLoaderStorageEnabled' ) && !$context->getDebug()
 			),
+			'$VARS.wgLegacyJavaScriptGlobals' => ResourceLoader::encodeJsonForScript(
+				$conf->get( 'LegacyJavaScriptGlobals' )
+			),
 			'$VARS.storeKey' => ResourceLoader::encodeJsonForScript( $this->getStoreKey() ),
 			'$VARS.storeVary' => ResourceLoader::encodeJsonForScript( $this->getStoreVary( $context ) ),
 		];
@@ -446,9 +449,6 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 
 		// Perform string replacements for startup.js
 		$pairs = [
-			'$VARS.wgLegacyJavaScriptGlobals' => ResourceLoader::encodeJsonForScript(
-				$conf->get( 'LegacyJavaScriptGlobals' )
-			),
 			'$VARS.configuration' => ResourceLoader::encodeJsonForScript(
 				$this->getConfigSettings( $context )
 			),
diff --git a/resources/src/startup/mediawiki.js b/resources/src/startup/mediawiki.js
index b2a8f5b42d..b0355b0019 100644
--- a/resources/src/startup/mediawiki.js
+++ b/resources/src/startup/mediawiki.js
@@ -432,8 +432,7 @@
 		 *
 		 * @property {mw.Map} config
 		 */
-		// Dummy placeholder later assigned in ResourceLoaderStartUpModule
-		config: null,
+		config: new Map( $VARS.wgLegacyJavaScriptGlobals ),
 
 		/**
 		 * Empty object for third-party libraries, for cases where you don't
diff --git a/resources/src/startup/startup.js b/resources/src/startup/startup.js
index da048ffdff..06c6737b26 100644
--- a/resources/src/startup/startup.js
+++ b/resources/src/startup/startup.js
@@ -113,7 +113,6 @@ if ( !isCompatible( navigator.userAgent ) ) {
 	 */
 	( function () {
 		/* global mw */
-		mw.config = new mw.Map( $VARS.wgLegacyJavaScriptGlobals );
 
 		$CODE.registrations();
 
-- 
2.20.1