Merge "ApiSandbox: Indicate when login is suppressed"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 20 Jun 2017 21:02:30 +0000 (21:02 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 20 Jun 2017 21:02:30 +0000 (21:02 +0000)
1  2 
languages/i18n/en.json
languages/i18n/qqq.json
resources/Resources.php
resources/src/mediawiki.special/mediawiki.special.apisandbox.js

Simple merge
Simple merge
Simple merge
                                        }
                                } )
                                        .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 ) {