Merge "mw.Upload.BookletLayout: Add a catch all error state"

diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index b574a5d..b0c696c 100644 (file)
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -254,6 +254,9 @@
                                }
 
                                if ( layout.upload.getState() === mw.Upload.State.WARNING ) {
+                                       // We could get more than one of these errors, these are in order
+                                       // of importance. For example fixing the thumbnail like file name
+                                       // won't help the fact that the file already exists.
                                        if ( stateDetails.exists !== undefined ) {
                                                deferred.reject( new OO.ui.Error(
                                                        $( '<p>' ).html(
@@ -297,6 +300,14 @@
                                                                mw.message( 'badfilename', stateDetails.badfilename ).parse()
                                                        )
                                                ) );
+                                       } else {
+                                               deferred.reject( new OO.ui.Error(
+                                                       $( '<p>' ).html(
+                                                               // Let's get all the help we can if we can't pin point the error
+                                                               mw.message( 'api-error-unknown-warning', JSON.stringify( stateDetails ) ).parse()
+                                                       ),
+                                                       { recoverable: false }
+                                               ) );
                                        }
 
                                        return false;