Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resourceloader: Make arguments to mw.loader.implement optional

Browse source 
This will allow the server to trim any trailing parameters with
empty objects from invocations.

'templates' was the only parameter added after the initial ResourceLoader
release, the other properties have always been required.

Change-Id: Ie32e7d6a3c09f86a52d60394c474a62cb1b4e1d6
This commit is contained in:
Timo Tijhof 2014-12-17 20:45:03 +00:00 committed by Ori.livneh
parent 13142cd2f4
commit 1f393b6da8
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
resources/src/mediawiki/mediawiki.js
View file

@ -1692,7 +1692,7 @@
* @param {string} module Name of module
* @param {Function|Array} script Function with module code or Array of URLs to
* be used as the src attribute of a new `<script>` tag.
* @param {Object} style Should follow one of the following patterns:
* @param {Object} [style] Should follow one of the following patterns:
*
* { "css": [css, ..] }
* { "url": { <media>: [url, ..] } }
@ -1705,25 +1705,25 @@
* The reason css strings are not concatenated anymore is bug 31676. We now check
* whether it's safe to extend the stylesheet (see #canExpandStylesheetWith).
*
* @param {Object} msgs List of key/value pairs to be added to mw#messages.
* @param {Object} [msgs] List of key/value pairs to be added to mw#messages.
* @param {Object} [templates] List of key/value pairs to be added to mw#templates.
*/
implement: function ( module, script, style, msgs, templates ) {
// Validate input
if ( typeof module !== 'string' ) {
throw new Error( 'module must be a string, not a ' + typeof module );
throw new Error( 'module must be of type string, not ' + typeof module );
}
if ( !$.isFunction( script ) && !$.isArray( script ) ) {
throw new Error( 'script must be a function or an array, not a ' + typeof script );
throw new Error( 'script must be of type function or array, not ' + typeof script );
}
if ( !$.isPlainObject( style ) ) {
throw new Error( 'style must be an object, not a ' + typeof style );
if ( style && !$.isPlainObject( style ) ) {
throw new Error( 'style must be of type object, not ' + typeof style );
}
if ( !$.isPlainObject( msgs ) ) {
throw new Error( 'msgs must be an object, not a ' + typeof msgs );
if ( msgs && !$.isPlainObject( msgs ) ) {
throw new Error( 'msgs must be of type object, not a ' + typeof msgs );
}
if ( templates !== undefined && !$.isPlainObject( templates ) ) {
throw new Error( 'templates must be an object, not a ' + typeof templates );
if ( templates && !$.isPlainObject( templates ) ) {
throw new Error( 'templates must be of type object, not a ' + typeof templates );
}
// Automatically register module
if ( !hasOwn.call( registry, module ) ) {
@ -1735,8 +1735,8 @@
}
// Attach components
registry[module].script = script;
registry[module].style = style;
registry[module].messages = msgs;
registry[module].style = style || {};
registry[module].messages = msgs || {};
// Templates are optional (for back-compat)
registry[module].templates = templates || {};
// The module may already have been marked as erroneous

5
tests/qunit/suites/resources/mediawiki/mediawiki.test.js
View file

@ -649,6 +649,11 @@
} );
QUnit.test( 'mw.loader.implement( only scripts )', 1, function ( assert ) {
mw.loader.implement( 'test.onlyscripts', function () {} );
assert.strictEqual( mw.loader.getState( 'test.onlyscripts' ), 'ready' );
} );
QUnit.asyncTest( 'mw.loader.implement( only messages )', 2, function ( assert ) {
assert.assertFalse( mw.messages.exists( 'bug_29107' ), 'Verify that the test message doesn\'t exist yet' );