[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Fix PageMigration save button bug

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403322 )

Change subject: Fix PageMigration save button bug
......................................................................


Fix PageMigration save button bug

This fixes bug of ajaxdispatcher working incorrectly
with request promise.

Bug: T179182
Change-Id: I7c1ad68a8aca48ceec04de9ce5f97f20922a4378
---
M Resources.php
M resources/js/ext.translate.special.pagemigration.js
M resources/js/jquery.ajaxdispatcher.js
3 files changed, 13 insertions(+), 3 deletions(-)

Approvals:
  jenkins-bot: Verified
  Nikerabbit: Looks good to me, approved



diff --git a/Resources.php b/Resources.php
index 36180a3..675b6b5 100644
--- a/Resources.php
+++ b/Resources.php
@@ -369,6 +369,7 @@
                'pm-on-save-message-text',
                'pm-savepages-button-label',
                'pm-cancel-button-label',
+               'tpt-unknown-page',
        ],
 ] + $resourcePaths;
 
diff --git a/resources/js/ext.translate.special.pagemigration.js 
b/resources/js/ext.translate.special.pagemigration.js
index c821223..6e5282e 100644
--- a/resources/js/ext.translate.special.pagemigration.js
+++ b/resources/js/ext.translate.special.pagemigration.js
@@ -362,6 +362,9 @@
                                $( '#action-import' ).removeClass( 'hide' );
                                $( 'input' ).prop( 'disabled', false );
                                $( '.mw-tpm-sp-instructions' ).text( mw.msg( 
'pm-on-save-message-text' ) ).show( 'fast' );
+                       } ).fail( function ( errmsg ) {
+                               $( 'input' ).prop( 'disabled', false );
+                               $( '.mw-tpm-sp-error__message' ).text( mw.msg( 
errmsg ) ).show( 'fast' );
                        } );
                }
        }
diff --git a/resources/js/jquery.ajaxdispatcher.js 
b/resources/js/jquery.ajaxdispatcher.js
index d237a76..9f45697 100644
--- a/resources/js/jquery.ajaxdispatcher.js
+++ b/resources/js/jquery.ajaxdispatcher.js
@@ -18,6 +18,8 @@
                return $.when( helper( list, maxRetries ) )
                        .then( function ( promises ) {
                                return deferred.resolve( promises );
+                       } ).fail( function ( errmsg ) {
+                               return deferred.reject( errmsg );
                        } );
        }
 
@@ -34,8 +36,10 @@
                rest = list.slice( 1 );
 
                retries = 0;
-               retrier = function () {
-                       var promise = this;
+               retrier = function ( result, promise ) {
+                       if ( !promise.state ) {
+                               return;
+                       }
 
                        if ( promise.state() === 'rejected' ) {
                                if ( retries < maxRetries ) {
@@ -51,7 +55,9 @@
                        }
                };
 
-               first.call().always( retrier );
+               first.call().always( retrier ).catch( function ( errmsg ) {
+                       return deferred.reject( errmsg );
+               } );
 
                return deferred;
        }

-- 
To view, visit https://gerrit.wikimedia.org/r/403322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c1ad68a8aca48ceec04de9ce5f97f20922a4378
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Phantom42 <nikita...@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Phantom42 <nikita...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits