From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 25 Apr 2016 17:15:16 +0000 (+0000)
Subject: Merge "mediawiki.special.upload.js: Remove spinner in .always() instead of .done()"
X-Git-Tag: 1.31.0-rc.0~7190
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/modifier.php?a=commitdiff_plain;h=ea783ca68dce8da1b84b14c4134a5cbe9c4b1fed;p=lhc%2Fweb%2Fwiklou.git

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

ea783ca68dce8da1b84b14c4134a5cbe9c4b1fed
diff --cc resources/src/mediawiki.special/mediawiki.special.upload.js
index 49af809011,945bfb0ecd..98364032a3
--- a/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();
  			} );
  		},