From 70c8dfe1c5dd393e6bdd75da16766211876e2d70 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Sat, 29 Aug 2015 01:16:54 +0200 Subject: [PATCH] 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 --- resources/src/mediawiki/mediawiki.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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'; -- 2.20.1