Merge "mediawiki.special.upload.js: Remove spinner in .always() instead of .done()"

diff --cc resources/src/mediawiki.special/mediawiki.special.upload.js
index 49af809,945bfb0..9836403
--- 1/resources/src/mediawiki.special/mediawiki.special.upload.js
--- 2/resources/src/mediawiki.special/mediawiki.special.upload.js
+++ b/resources/src/mediawiki.special/mediawiki.special.upload.js
@@@ -62,26 -62,21 +62,27 @@@
                                return;
                        }
                        $spinnerDestCheck = $.createSpinner().insertAfter( '#wpDestFile' );
 +                      title = mw.Title.newFromText( this.nameToCheck, mw.config.get( 'wgNamespaceIds' ).file );
  
                        ( new mw.Api() ).get( {
 +                              formatversion: 2,
                                action: 'query',
 -                              titles: ( new mw.Title( this.nameToCheck, mw.config.get( 'wgNamespaceIds' ).file ) ).getPrefixedText(),
 +                              // If title is empty, user input is invalid, the API call will produce details about why
 +                              titles: title ? title.getPrefixedText() : this.nameToCheck,
                                prop: 'imageinfo',
 -                              iiprop: 'uploadwarning',
 -                              indexpageids: true
 +                              iiprop: 'uploadwarning'
                        } ).done( function ( result ) {
 -                              var resultOut = '';
 -                              if ( result.query ) {
 -                                      resultOut = result.query.pages[ result.query.pageids[ 0 ] ].imageinfo[ 0 ];
 +                              var
 +                                      resultOut = '',
 +                                      page = result.query.pages[ 0 ];
 +                              if ( page.imageinfo ) {
 +                                      resultOut = page.imageinfo[ 0 ].html;
 +                              } else if ( page.invalidreason ) {
 +                                      resultOut = mw.html.escape( page.invalidreason );
                                }
-                               $spinnerDestCheck.remove();
                                uploadWarning.processResult( resultOut, uploadWarning.nameToCheck );
+                       } ).always( function () {
+                               $spinnerDestCheck.remove();
                        } );
                },