From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 20 Jun 2017 21:02:30 +0000 (+0000)
Subject: Merge "ApiSandbox: Indicate when login is suppressed"
X-Git-Tag: 1.31.0-rc.0~2939
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%22id_auteur=%24connect_id_auteur%22%29%20.%20%22?a=commitdiff_plain;h=3cecf7e6f1b6b30e86c3b08372ecf200bd5a9018;p=lhc%2Fweb%2Fwiklou.git

Merge "ApiSandbox: Indicate when login is suppressed"
---

3cecf7e6f1b6b30e86c3b08372ecf200bd5a9018
diff --cc resources/src/mediawiki.special/mediawiki.special.apisandbox.js
index c32f9535a9,6916477cdc..ff6a80cd60
--- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
+++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
@@@ -1125,22 -1100,36 +1125,29 @@@
  					}
  				} )
  					.then( null, function ( code, data, result, jqXHR ) {
 +						var deferred = $.Deferred();
 +
  						if ( code !== 'http' ) {
  							// Not really an error, work around mw.Api thinking it is.
 -							return $.Deferred()
 -								.resolve( result, jqXHR )
 -								.promise();
 +							deferred.resolve( result, jqXHR );
 +						} else {
 +							// Just forward it.
 +							deferred.reject.apply( deferred, arguments );
  						}
 -						return this;
 +						return deferred.promise();
  					} )
 -					.fail( function ( code, data ) {
 -						var details = 'HTTP error: ' + data.exception;
 -						$result.empty()
 -							.append(
 -								new OO.ui.LabelWidget( {
 -									label: mw.message( 'apisandbox-results-error', details ).text(),
 -									classes: [ 'error' ]
 -								} ).$element
 -							);
 -					} )
 -					.done( function ( data, jqXHR ) {
 +					.then( function ( data, jqXHR ) {
  						var m, loadTime, button, clear,
- 							ct = jqXHR.getResponseHeader( 'Content-Type' );
+ 							ct = jqXHR.getResponseHeader( 'Content-Type' ),
+ 							loginSuppressed = jqXHR.getResponseHeader( 'MediaWiki-Login-Suppressed' ) || 'false';
  
  						$result.empty();
+ 						if ( loginSuppressed !== 'false' ) {
+ 							$( '<div>' )
+ 								.addClass( 'warning' )
+ 								.append( Util.parseMsg( 'apisandbox-results-login-suppressed' ) )
+ 								.appendTo( $result );
+ 						}
  						if ( /^text\/mediawiki-api-prettyprint-wrapped(?:;|$)/.test( ct ) ) {
  							data = JSON.parse( data );
  							if ( data.modules.length ) {