Merge "Add tests for WikiMap and WikiReference"

[lhc/web/wiklou.git] / resources / src / mediawiki / mediawiki.Upload.Dialog.js

diff --git a/resources/src/mediawiki/mediawiki.Upload.Dialog.js b/resources/src/mediawiki/mediawiki.Upload.Dialog.js
index 3c10eeb..596e777 100644 (file)
--- a/resources/src/mediawiki/mediawiki.Upload.Dialog.js
+++ b/resources/src/mediawiki/mediawiki.Upload.Dialog.js
@@ -337,7 +337,7 @@
                                return false;
                        }
 
-                       dialog.upload.finishStashUpload().then( function () {
+                       dialog.upload.finishStashUpload().always( function () {
                                var name;
 
                                if ( dialog.upload.getState() === mw.Upload.State.ERROR ) {
@@ -437,19 +437,13 @@
 
                // Validation
                function checkValidity() {
-                       var validityPromises = [
-                               dialog.filenameWidget.isValid(),
-                               dialog.descriptionWidget.isValid()
-                       ];
-
-                       $.when.apply( $, validityPromises ).done( function () {
-                               var allValid,
-                                       values = Array.prototype.slice.apply( arguments );
-                               allValid = values.every( function ( value ) {
-                                       return value;
-                               } );
-
-                               dialog.actions.setAbilities( { save: allValid } );
+                       $.when(
+                               dialog.filenameWidget.getValidity(),
+                               dialog.descriptionWidget.getValidity()
+                       ).done( function () {
+                               dialog.actions.setAbilities( { save: true } );
+                       } ).fail( function () {
+                               dialog.actions.setAbilities( { save: false } );
                        } );
                }
                this.filenameWidget.on( 'change', checkValidity );