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

resourceloader: Make 'script' argument to mw.loader.implement optional

Browse source 
Follows-up 1f393b6.

The others were already made optional (1f393b6), but 'script' was
still required. This caused 4ce0c0da42 to fail since it did sometimes
trim the 'script' argument as well.

Change-Id: I5cf533c2c19a064c4d8686c54838cc7743a09ba5
This commit is contained in:
Timo Tijhof 2015-01-20 16:03:33 -08:00
parent 4ce0c0da42
commit 0e719ce234
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1793,7 +1793,7 @@
if ( typeof module !== 'string' ) {
throw new Error( 'module must be of type string, not ' + typeof module );
}
if ( !$.isFunction( script ) && !$.isArray( script ) ) {
if ( script && !$.isFunction( script ) && !$.isArray( script ) ) {
throw new Error( 'script must be of type function or array, not ' + typeof script );
}
if ( style && !$.isPlainObject( style ) ) {
@ -1814,10 +1814,9 @@
throw new Error( 'module already implemented: ' + module );
}
// Attach components
registry[module].script = script;
registry[module].script = script || [];
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
if ( $.inArray( registry[module].state, ['error', 'missing'] ) === -1 ) {