From: Timo Tijhof Date: Fri, 24 Aug 2018 02:36:40 +0000 (+0100) Subject: resourceloader: Remove redundant calls to getState() in mw.loader.enqueue() X-Git-Tag: 1.34.0-rc.0~4284^2 X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=2c7ff994aa285a9ecda897fc6fe3c874ed6547a7;p=lhc%2Fweb%2Fwiklou.git resourceloader: Remove redundant calls to getState() in mw.loader.enqueue() The list of module names are known to be registered there. Thus, no need for getState() and its hasOwn.call(registry) check. If it was possible for an unknown module name to make its way to this code, it would break both before and after this commit due to the setting of registry[module].state which would throw TypeError for setting on undefined. Change-Id: Ie3cccc7e4c57648279325852f362d5eb72128306 --- diff --git a/resources/src/startup/mediawiki.js b/resources/src/startup/mediawiki.js index 0aa15db840..1ec2470846 100644 --- a/resources/src/startup/mediawiki.js +++ b/resources/src/startup/mediawiki.js @@ -1093,7 +1093,6 @@ if ( ready !== undefined ) { ready(); } - return; } @@ -1105,7 +1104,6 @@ dependencies ); } - return; } @@ -1116,7 +1114,7 @@ jobs.push( { // Narrow down the list to modules that are worth waiting for dependencies: dependencies.filter( function ( module ) { - var state = mw.loader.getState( module ); + var state = registry[ module ].state; return state === 'registered' || state === 'loaded' || state === 'loading' || state === 'executing'; } ), ready: ready, @@ -1125,10 +1123,9 @@ } dependencies.forEach( function ( module ) { - var state = mw.loader.getState( module ); // Only queue modules that are still in the initial 'registered' state // (not ones already loading, ready or error). - if ( state === 'registered' && queue.indexOf( module ) === -1 ) { + if ( registry[ module ].state === 'registered' && queue.indexOf( module ) === -1 ) { // Private modules must be embedded in the page. Don't bother queuing // these as the server will deny them anyway (T101806). if ( registry[ module ].group === 'private' ) {