From d0a80f222e53bb669a5ec3a25955a4d9311445ec Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Sat, 15 Sep 2018 18:45:50 +0100 Subject: [PATCH] resourceloader: Minor clean up in mw.loader and mw.html * Remove redundant registry check in the internal queueModuleScript function. Like most internal methods, it can only be inside the mw.loader closure, and is only called with extant module name. * Remove redundant registry check from execute(). * Rename local variable in mw.loader.state() from 'modules' to 'states' to avoid confusion. * Shorten exception messages in mw.html to not prefix the method names, because we don't do that anywhere else in RL JS. Change-Id: Idf1a49fd98445477f2d940624ca0d079325bd15b --- resources/src/mediawiki.base/mediawiki.base.js | 6 +++--- resources/src/startup/mediawiki.js | 13 +++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/resources/src/mediawiki.base/mediawiki.base.js b/resources/src/mediawiki.base/mediawiki.base.js index 16994f5bba..5820b83eb9 100644 --- a/resources/src/mediawiki.base/mediawiki.base.js +++ b/resources/src/mediawiki.base/mediawiki.base.js @@ -356,7 +356,7 @@ } ); }; - // Fire events from before track() triggred fire() + // Fire events from before track() triggered fire() trackCallbacks.fire( mw.trackQueue ); /** @@ -546,11 +546,11 @@ } else if ( contents instanceof this.Cdata ) { // CDATA if ( /<\/[a-zA-z]/.test( contents.value ) ) { - throw new Error( 'mw.html.element: Illegal end tag found in CDATA' ); + throw new Error( 'Illegal end tag found in CDATA' ); } s += contents.value; } else { - throw new Error( 'mw.html.element: Invalid type of contents' ); + throw new Error( 'Invalid type of contents' ); } } s += ''; diff --git a/resources/src/startup/mediawiki.js b/resources/src/startup/mediawiki.js index c16948703b..b2aff4361c 100644 --- a/resources/src/startup/mediawiki.js +++ b/resources/src/startup/mediawiki.js @@ -1061,7 +1061,7 @@ function queueModuleScript( src, moduleName, callback ) { pendingRequests.push( function () { // Keep in sync with execute()/runScript(). - if ( moduleName !== 'jquery' && hasOwn.call( registry, moduleName ) ) { + if ( moduleName !== 'jquery' ) { window.require = mw.loader.require; window.module = registry[ moduleName ].module; } @@ -1196,9 +1196,6 @@ var key, value, media, i, urls, cssHandle, siteDeps, siteDepErr, runScript, cssPending = 0; - if ( !hasOwn.call( registry, module ) ) { - throw new Error( 'Module has not been registered yet: ' + module ); - } if ( registry[ module ].state !== 'loaded' ) { throw new Error( 'Module in state "' + registry[ module ].state + '" may not be executed: ' + module ); } @@ -1964,12 +1961,12 @@ /** * Change the state of one or more modules. * - * @param {Object} modules Object of module name/state pairs + * @param {Object} states Object of module name/state pairs */ - state: function ( modules ) { + state: function ( states ) { var module, state; - for ( module in modules ) { - state = modules[ module ]; + for ( module in states ) { + state = states[ module ]; if ( !hasOwn.call( registry, module ) ) { mw.loader.register( module ); } -- 2.20.1