From: Gergő Tisza Date: Thu, 6 Feb 2014 01:55:01 +0000 (+0000) Subject: Return jqXHR from mw.Api calls X-Git-Tag: 1.31.0-rc.0~16918^2 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=203bb9ebf7e0fa21e92080af80a827aeda363338;p=lhc%2Fweb%2Fwiklou.git Return jqXHR from mw.Api calls Exposes the jQuery XHR object to mw.Api clients. This is needed for logging cache headers in MultimediaViewer, and surely has other uses as well. Change-Id: I49977b5f9d155cc7332377c906a31f5689bec8b4 --- diff --git a/resources/mediawiki.api/mediawiki.api.js b/resources/mediawiki.api/mediawiki.api.js index cdc67679f4..6012d93e36 100644 --- a/resources/mediawiki.api/mediawiki.api.js +++ b/resources/mediawiki.api/mediawiki.api.js @@ -160,7 +160,7 @@ } ); } ) // AJAX success just means "200 OK" response, also check API error codes - .done( function ( result ) { + .done( function ( result, textStatus, jqXHR ) { if ( result === undefined || result === null || result === '' ) { apiDeferred.reject( 'ok-but-empty', 'OK response but empty result (check HTTP headers?)' @@ -169,7 +169,7 @@ var code = result.error.code === undefined ? 'unknown' : result.error.code; apiDeferred.reject( code, result ); } else { - apiDeferred.resolve( result ); + apiDeferred.resolve( result, jqXHR ); } } );