mw.loader: Return consistent object shape from splitModuleKey()

[lhc/web/wiklou.git] / resources / src / mediawiki / mediawiki.js

diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index 39d0127..66e09dc 100644 (file)
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1474,7 +1474,7 @@
                                        } );
                                }
 
-                               $.each( dependencies, function ( idx, module ) {
+                               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).
@@ -1718,7 +1718,10 @@
                        function splitModuleKey( key ) {
                                var index = key.indexOf( '@' );
                                if ( index === -1 ) {
-                                       return { name: key };
+                                       return {
+                                               name: key,
+                                               version: ''
+                                       };
                                }
                                return {
                                        name: key.slice( 0, index ),
@@ -2123,10 +2126,7 @@
                                 *  in the registry.
                                 */
                                getVersion: function ( module ) {
-                                       if ( !hasOwn.call( registry, module ) || registry[ module ].version === undefined ) {
-                                               return null;
-                                       }
-                                       return registry[ module ].version;
+                                       return hasOwn.call( registry, module ) ? registry[ module ].version : null;
                                },
 
                                /**
@@ -2137,10 +2137,7 @@
                                 *  in the registry.
                                 */
                                getState: function ( module ) {
-                                       if ( !hasOwn.call( registry, module ) || registry[ module ].state === undefined ) {
-                                               return null;
-                                       }
-                                       return registry[ module ].state;
+                                       return hasOwn.call( registry, module ) ? registry[ module ].state : null;
                                },
 
                                /**