Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/186111
Change subject: resourceloader: Make 'script' argument to mw.loader.implement
optional
......................................................................
resourceloader: Make 'script' argument to mw.loader.implement optional
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
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/11/186111/1
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index c7858ab..bed5cb5 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -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 ) {
--
To view, visit https://gerrit.wikimedia.org/r/186111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5cf533c2c19a064c4d8686c54838cc7743a09ba5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
