dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mw.loader: For using() errors, reject Promise instead of throwing
[lhc/web/wiklou.git]
/
resources
/
src
/
mediawiki
/
mediawiki.js
diff --git
a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index
4dce192
..
dd3d6de
100644
(file)
--- a/
resources/src/mediawiki/mediawiki.js
+++ b/
resources/src/mediawiki/mediawiki.js
@@
-1168,6
+1168,7
@@
* @private
* @param {string[]} modules Array of string module names
* @return {Array} List of dependencies, including 'module'.
* @private
* @param {string[]} modules Array of string module names
* @return {Array} List of dependencies, including 'module'.
+ * @throws {Error} If an unregistered module or a dependency loop is encountered
*/
function resolve( modules ) {
var resolved = [];
*/
function resolve( modules ) {
var resolved = [];
@@
-1993,8
+1994,12
@@
deferred.fail( error );
}
deferred.fail( error );
}
- // Resolve entire dependency map
- dependencies = resolve( dependencies );
+ try {
+ // Resolve entire dependency map
+ dependencies = resolve( dependencies );
+ } catch ( e ) {
+ return deferred.reject( e ).promise();
+ }
if ( allReady( dependencies ) ) {
// Run ready immediately
deferred.resolve( mw.loader.require );
if ( allReady( dependencies ) ) {
// Run ready immediately
deferred.resolve( mw.loader.require );