Merge "mediawiki.special.upload.js: Remove spinner in .always() instead of .done()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 25 Apr 2016 17:15:16 +0000 (17:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 25 Apr 2016 17:15:16 +0000 (17:15 +0000)
resources/src/mediawiki.special/mediawiki.special.upload.js

index 49af809..9836403 100644 (file)
@@ -80,8 +80,9 @@
                                } else if ( page.invalidreason ) {
                                        resultOut = mw.html.escape( page.invalidreason );
                                }
-                               $spinnerDestCheck.remove();
                                uploadWarning.processResult( resultOut, uploadWarning.nameToCheck );
+                       } ).always( function () {
+                               $spinnerDestCheck.remove();
                        } );
                },
 
                                prop: 'text',
                                pst: true
                        } ).done( function ( result ) {
-                               $spinnerLicense.remove();
                                uploadLicense.processResult( result, license );
+                       } ).always( function () {
+                               $spinnerLicense.remove();
                        } );
                },