Use jQuery 3 .catch( fn ) instead of .then( null, fn )

https://api.jquery.com/deferred.catch/ Since jQuery 3
deferred.catch( fn ) is an alias to deferred.then( null, fn )

This improves the readability.

Change-Id: I20fa3a1ed5c959ad0639ddf0162b8837fc15c720

diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
index ff4335a..534af05 100644 (file)
--- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
+++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
@@ -1112,7 +1112,7 @@
                                                return xhr;
                                        }
                                } )
-                                       .then( null, function ( code, data, result, jqXHR ) {
+                                       .catch( function ( code, data, result, jqXHR ) {
                                                var deferred = $.Deferred();
 
                                                if ( code !== 'http' ) {

diff --git a/resources/src/mediawiki/api.js b/resources/src/mediawiki/api.js
index 0e9c19b..2fcb4be 100644 (file)
--- a/resources/src/mediawiki/api.js
+++ b/resources/src/mediawiki/api.js
@@ -321,9 +321,7 @@
                                        return abortedPromise;
                                }
 
-                               return ( abortable = api.post( params, ajaxOptions ) ).then(
-                                       // If no error, return to caller as-is
-                                       null,
+                               return ( abortable = api.post( params, ajaxOptions ) ).catch(
                                        // Error handler
                                        function ( code ) {
                                                if ( code === 'badtoken' ) {

diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
index ac2bb02..2efacc9 100644 (file)
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
@@ -113,8 +113,7 @@
                                        } )
                                );
                        }
-               ).then(
-                       null,
+               ).catch(
                        // Always resolve, never reject
                        function () { return $.Deferred().resolve(); }
                );

diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index 6a218e3..104f699 100644 (file)
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -2780,9 +2780,9 @@
                // We only need a callback, not any actual module. First try a single using()
                // for all loading modules. If one fails, fall back to tracking each module
                // separately via $.when(), this is expensive.
-               loading = mw.loader.using( modules ).then( null, function () {
+               loading = mw.loader.using( modules ).catch( function () {
                        var all = modules.map( function ( module ) {
-                               return mw.loader.using( module ).then( null, function () {
+                               return mw.loader.using( module ).catch( function () {
                                        return $.Deferred().resolve();
                                } );
                        } );

diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
index 2361f70..6c2d51e 100644 (file)
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
@@ -203,7 +203,7 @@
 
                // Don't cache error (T67268)
                return api.getToken( 'testerror' )
-                       .then( null, function ( err ) {
+                       .catch( function ( err ) {
                                assert.equal( err, 'bite-me', 'Expected error' );
 
                                return api.getToken( 'testerror' );