From e0ec23d313342b2c28cdbae8278343784b8fa2f0 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Fri, 11 Dec 2015 18:55:07 -0800 Subject: [PATCH] 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 --- includes/api/ApiHelp.php | 3 ++- resources/Resources.php | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) 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( -- 2.20.1