From: Roan Kattouw <roan.kattouw@gmail.com>
Date: Thu, 7 Feb 2019 22:28:10 +0000 (-0800)
Subject: resourceloader: Fix localStorage for multi-file modules
X-Git-Tag: 1.34.0-rc.0~2903
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=d55a1446323e49809af2e36472e7397fc185834b;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Fix localStorage for multi-file modules

I had forgotten to update mw.loader.store.set() for the new multi-file
module format.

Follows-up fbbd65d2df43f522f4deae719.

Change-Id: I27edeb43b218c93761ea7c394e18fac7a5cc914d
---

diff --git a/resources/src/startup/mediawiki.js b/resources/src/startup/mediawiki.js
index ea49fd0e79..8b2aa29dc7 100644
--- a/resources/src/startup/mediawiki.js
+++ b/resources/src/startup/mediawiki.js
@@ -2348,12 +2348,14 @@
 								!Array.isArray( descriptor.script )
 							) {
 								encodedScript = '{' +
-									Object.keys( descriptor.script ).map( function ( key ) {
-										var value = descriptor.script[ key ];
+									'"main":' + JSON.stringify( descriptor.script.main ) + ',' +
+									'"files":{' +
+									Object.keys( descriptor.script.files ).map( function ( key ) {
+										var value = descriptor.script.files[ key ];
 										return JSON.stringify( key ) + ':' +
 											( typeof value === 'function' ? value : JSON.stringify( value ) );
 									} ).join( ',' ) +
-									'}';
+									'}}';
 							} else {
 								encodedScript = JSON.stringify( descriptor.script );
 							}