Merge "resourceloader: Use null-objects for 'sources' and 'registry'"

diff --combined resources/src/startup/mediawiki.js
index bfd0a14,bb04085..97fc027
--- 1/resources/src/startup/mediawiki.js
--- 2/resources/src/startup/mediawiki.js
+++ b/resources/src/startup/mediawiki.js
@@@ -13,7 -13,6 +13,6 @@@
        'use strict';
  
        var mw, StringSet, log,
-               hasOwn = Object.prototype.hasOwnProperty,
                trackQueue = [];
  
        /**
@@@ -259,6 -258,7 +258,6 @@@
  
        defineFallbacks();
  
 -      /* eslint-disable no-console */
        log = ( function () {
                /**
                 * Write a verbose message to the browser's console in debug mode.
@@@ -292,7 -292,7 +291,7 @@@
                 *
                 * @param {...string} msg Messages to output to console
                 */
 -              log.warn = console && console.warn && Function.prototype.bind ?
 +              log.warn = console && console.warn ?
                        Function.prototype.bind.call( console.warn, console ) :
                        function () {};
  
@@@ -307,7 -307,7 +306,7 @@@
                 * @since 1.26
                 * @param {...Mixed} msg Messages to output to console
                 */
 -              log.error = console && console.error && Function.prototype.bind ?
 +              log.error = console && console.error ?
                        Function.prototype.bind.call( console.error, console ) :
                        function () {};
  
@@@ -322,7 -322,9 +321,7 @@@
                 * @param {string} [logName=key] Optional custom name for the feature.
                 *  This is used instead of `key` in the message and `mw.deprecate` tracking.
                 */
 -              log.deprecate = !Object.defineProperty ? function ( obj, key, val ) {
 -                      obj[ key ] = val;
 -              } : function ( obj, key, val, msg, logName ) {
 +              log.deprecate = function ( obj, key, val, msg, logName ) {
                        var stacks;
                        function maybeLog() {
                                var name,
@@@ -362,6 -364,7 +361,6 @@@
  
                return log;
        }() );
 -      /* eslint-enable no-console */
  
        /**
         * @class mw
@@@ -580,7 -583,7 +579,7 @@@
                         * @property
                         * @private
                         */
-                       var registry = {},
+                       var registry = Object.create( null ),
                                // Mapping of sources, keyed by source-id, values are strings.
                                //
                                // Format:
@@@ -589,7 -592,7 +588,7 @@@
                                //         'sourceId': 'http://example.org/w/load.php'
                                //     }
                                //
-                               sources = {},
+                               sources = Object.create( null ),
  
                                // For queueModuleScript()
                                handlingPendingRequests = false,
@@@ -927,7 -930,7 +926,7 @@@
                        function sortDependencies( module, resolved, unresolved ) {
                                var i, deps, skip;
  
-                               if ( !hasOwn.call( registry, module ) ) {
+                               if ( !( module in registry ) ) {
                                        throw new Error( 'Unknown dependency: ' + module );
                                }
  
@@@ -1632,8 -1635,7 +1631,7 @@@
                         *  or null if the module does not exist
                         */
                        function getModuleKey( module ) {
-                               return hasOwn.call( registry, module ) ?
-                                       ( module + '@' + registry[ module ].version ) : null;
+                               return module in registry ? ( module + '@' + registry[ module ].version ) : null;
                        }
  
                        /**
@@@ -1665,7 -1667,7 +1663,7 @@@
                         * @param {string} [skip]
                         */
                        function registerOne( module, version, dependencies, group, source, skip ) {
-                               if ( hasOwn.call( registry, module ) ) {
+                               if ( module in registry ) {
                                        throw new Error( 'module already registered: ' + module );
                                }
                                registry[ module ] = {
@@@ -1718,7 -1720,7 +1716,7 @@@
                                        // Appends a list of modules from the queue to the batch
                                        for ( q = 0; q < queue.length; q++ ) {
                                                // Only load modules which are registered
-                                               if ( hasOwn.call( registry, queue[ q ] ) && registry[ queue[ q ] ].state === 'registered' ) {
+                                               if ( queue[ q ] in registry && registry[ queue[ q ] ].state === 'registered' ) {
                                                        // Prevent duplicate entries
                                                        if ( batch.indexOf( queue[ q ] ) === -1 ) {
                                                                batch.push( queue[ q ] );
@@@ -1795,7 -1797,7 +1793,7 @@@
                                addSource: function ( ids ) {
                                        var id;
                                        for ( id in ids ) {
-                                               if ( hasOwn.call( sources, id ) ) {
+                                               if ( id in sources ) {
                                                        throw new Error( 'source already registered: ' + id );
                                                }
                                                sources[ id ] = ids[ id ];
@@@ -1874,7 -1876,7 +1872,7 @@@
                                                name = split.name,
                                                version = split.version;
                                        // Automatically register module
-                                       if ( !hasOwn.call( registry, name ) ) {
+                                       if ( !( name in registry ) ) {
                                                mw.loader.register( name );
                                        }
                                        // Check for duplicate implementation
@@@ -1963,7 -1965,7 +1961,7 @@@
                                        var module, state;
                                        for ( module in states ) {
                                                state = states[ module ];
-                                               if ( !hasOwn.call( registry, module ) ) {
+                                               if ( !( module in registry ) ) {
                                                        mw.loader.register( module );
                                                }
                                                setAndPropagate( module, state );
@@@ -1978,7 -1980,7 +1976,7 @@@
                                 *  in the registry.
                                 */
                                getVersion: function ( module ) {
-                                       return hasOwn.call( registry, module ) ? registry[ module ].version : null;
+                                       return module in registry ? registry[ module ].version : null;
                                },
  
                                /**
@@@ -1989,7 -1991,7 +1987,7 @@@
                                 *  in the registry.
                                 */
                                getState: function ( module ) {
-                                       return hasOwn.call( registry, module ) ? registry[ module ].state : null;
+                                       return module in registry ? registry[ module ].state : null;
                                },
  
                                /**