From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 28 Aug 2015 23:16:54 +0000 (+0200)
Subject: resourceloader: Don't create empty objects for every module
X-Git-Tag: 1.31.0-rc.0~10095^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=70c8dfe1c5dd393e6bdd75da16766211876e2d70;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Don't create empty objects for every module

For modules without one or more of 'scripts', 'styles', 'messages'
and 'templates'; don't needlessly create empty placeholder objects.

Except for 'scripts', these were already handled conditionally.

Bug: T105162
Change-Id: Ic1b3b09474e0b50b438b111a4f62368ceab4e732
---

diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index 49c350aabb..b9abd92e16 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1249,6 +1249,9 @@
 									$.globalEval( script );
 									markModuleReady();
 								}
+							} else {
+								// Module without script
+								markModuleReady();
 							}
 						} );
 					} catch ( e ) {
@@ -1798,10 +1801,10 @@
 						throw new Error( 'module already implemented: ' + module );
 					}
 					// Attach components
-					registry[ module ].script = script || [];
-					registry[ module ].style = style || {};
-					registry[ module ].messages = messages || {};
-					registry[ module ].templates = templates || {};
+					registry[ module ].script = script || null;
+					registry[ module ].style = style || null;
+					registry[ module ].messages = messages || null;
+					registry[ module ].templates = templates || null;
 					// The module may already have been marked as erroneous
 					if ( $.inArray( registry[ module ].state, [ 'error', 'missing' ] ) === -1 ) {
 						registry[ module ].state = 'loaded';