API: Avoid FOUC on help pages

Loading CSS with OutputPage::addModules() causes a FOUC because the
styles are loaded through JavaScript, using addModuleStyles() fixes
this. But it doesn't load module dependencies, so load the
mediawiki.hlist styles explicitly in ApiHelp.

Bug: T117901
Change-Id: I1dfd194d686c05573eefc85d5dfd7ee2731bf286

diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index b1942bc..9bbb0b0 100644 (file)
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -98,7 +98,8 @@ class ApiHelp extends ApiBase {
                }
 
                $out = $context->getOutput();
-               $out->addModules( 'mediawiki.apihelp' );
+               $out->addModuleStyles( 'mediawiki.hlist' );
+               $out->addModuleStyles( 'mediawiki.apihelp' );
                if ( !empty( $options['toc'] ) ) {
                        $out->addModules( 'mediawiki.toc' );
                }

diff --git a/resources/Resources.php b/resources/Resources.php
index fb767d5..0d27f87 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -832,7 +832,6 @@ return array(
        'mediawiki.apihelp' => array(
                'styles' => 'resources/src/mediawiki/mediawiki.apihelp.css',
                'targets' => array( 'desktop' ),
-               'dependencies' => 'mediawiki.hlist',
                'position' => 'top',
        ),
        'mediawiki.template' => array(