From: Fomafix <fomafix@googlemail.com>
Date: Fri, 15 Apr 2016 04:43:04 +0000 (+0000)
Subject: mediawiki.special.upload.js: Remove spinner in .always() instead of .done()
X-Git-Tag: 1.31.0-rc.0~7190^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%2C%22id_auteur=%24connecte%22%29%20.%20%22?a=commitdiff_plain;h=c2b3e27afeb20fef7386860ee8ed319587ccbef7;p=lhc%2Fweb%2Fwiklou.git

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

This removes the spinner even when the API request fails.

Change-Id: Ic0f08312b9a1137772f5b6734256e7bd48d20fcf
---

diff --git a/resources/src/mediawiki.special/mediawiki.special.upload.js b/resources/src/mediawiki.special/mediawiki.special.upload.js
index 8c89ed97d8..945bfb0ecd 100644
--- a/resources/src/mediawiki.special/mediawiki.special.upload.js
+++ b/resources/src/mediawiki.special/mediawiki.special.upload.js
@@ -74,8 +74,9 @@
 				if ( result.query ) {
 					resultOut = result.query.pages[ result.query.pageids[ 0 ] ].imageinfo[ 0 ];
 				}
-				$spinnerDestCheck.remove();
 				uploadWarning.processResult( resultOut, uploadWarning.nameToCheck );
+			} ).always( function () {
+				$spinnerDestCheck.remove();
 			} );
 		},
 
@@ -123,8 +124,9 @@
 				prop: 'text',
 				pst: true
 			} ).done( function ( result ) {
-				$spinnerLicense.remove();
 				uploadLicense.processResult( result, license );
+			} ).always( function () {
+				$spinnerLicense.remove();
 			} );
 		},