mw.Upload.BookletLayout: Fail when unable to load config from foreign wiki

[lhc/web/wiklou.git] / resources / src / mediawiki / mediawiki.Upload.BookletLayout.js

diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 7a7469a..bbd0f1b 100644 (file)
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -177,7 +177,13 @@
                return this.upload.getApi().then(
                        function ( api ) {
                                return $.when(
-                                       booklet.upload.loadConfig(),
+                                       booklet.upload.loadConfig().then(
+                                               null,
+                                               function ( errorMsg ) {
+                                                       booklet.getPage( 'upload' ).$element.msg( errorMsg );
+                                                       return $.Deferred().resolve();
+                                               }
+                                       ),
                                        // If the user can't upload anything, don't give them the option to.
                                        api.getUserInfo().then( function ( userInfo ) {
                                                if ( userInfo.rights.indexOf( 'upload' ) === -1 ) {