From: Kunal Mehta <legoktm@member.fsf.org>
Date: Sat, 12 Dec 2015 02:55:07 +0000 (-0800)
Subject: API: Avoid FOUC on help pages
X-Git-Tag: 1.31.0-rc.0~8381
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=e0ec23d313342b2c28cdbae8278343784b8fa2f0;p=lhc%2Fweb%2Fwiklou.git

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 b1942bc1a1..9bbb0b00c0 100644
--- 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 fb767d5e75..0d27f87660 100644
--- 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(