From 2f9a6581b75ca75e5b63c9a2d8a74d7ce62d9629 Mon Sep 17 00:00:00 2001
From: Fomafix <fomafix@googlemail.com>
Date: Sun, 10 Feb 2019 16:04:57 +0100
Subject: [PATCH 1/1] EnhancedChangesList: Load style module via
 addModuleStyles()

This change avoids a flash of missing collapsible toggle icons while
loading.

Change-Id: I090b1622868f2e5a01ca783dfce3be16b7d6b525
---
 includes/changes/EnhancedChangesList.php                   | 2 +-
 includes/templates/EnhancedChangesListGroup.mustache       | 2 +-
 tests/phpunit/includes/changes/EnhancedChangesListTest.php | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/includes/changes/EnhancedChangesList.php b/includes/changes/EnhancedChangesList.php
index 28b30d8ba4..51a26baab7 100644
--- a/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@ -77,12 +77,12 @@ class EnhancedChangesList extends ChangesList {
 		$this->lastdate = '';
 		$this->rclistOpen = false;
 		$this->getOutput()->addModuleStyles( [
+			'mediawiki.icon',
 			'mediawiki.special.changeslist',
 			'mediawiki.special.changeslist.enhanced',
 		] );
 		$this->getOutput()->addModules( [
 			'jquery.makeCollapsible',
-			'mediawiki.icon',
 		] );
 
 		return '<div class="mw-changeslist">';
diff --git a/includes/templates/EnhancedChangesListGroup.mustache b/includes/templates/EnhancedChangesListGroup.mustache
index 6037d3792d..6d9d6b0a82 100644
--- a/includes/templates/EnhancedChangesListGroup.mustache
+++ b/includes/templates/EnhancedChangesListGroup.mustache
@@ -10,7 +10,7 @@
 				<div class="mw-rcfilters-ui-highlights-color-c5" data-color="c5"></div>
 			</div>
 		</td>
-		<td><span class="mw-collapsible-toggle mw-collapsible-arrow mw-enhancedchanges-arrow mw-enhancedchanges-arrow-space"></span></td>
+		<td><span class="mw-collapsible-toggle mw-collapsible-arrow mw-enhancedchanges-arrow mw-enhancedchanges-arrow-space mw-collapsible-toggle-collapsed"></span></td>
 		<td class="mw-changeslist-line-prefix">{{{ prefix }}}</td>
 		<td class="mw-enhanced-rc" colspan="2">{{{ collectedRcFlags }}}&#160;{{ timestamp }}&#160;</td>
 		<td class="mw-changeslist-line-inner">
diff --git a/tests/phpunit/includes/changes/EnhancedChangesListTest.php b/tests/phpunit/includes/changes/EnhancedChangesListTest.php
index 420fe7493e..eff2c851af 100644
--- a/tests/phpunit/includes/changes/EnhancedChangesListTest.php
+++ b/tests/phpunit/includes/changes/EnhancedChangesListTest.php
@@ -26,6 +26,12 @@ class EnhancedChangesListTest extends MediaWikiLangTestCase {
 
 		$styleModules = $enhancedChangesList->getOutput()->getModuleStyles();
 
+		$this->assertContains(
+			'mediawiki.icon',
+			$styleModules,
+			'has mediawiki.icon'
+		);
+
 		$this->assertContains(
 			'mediawiki.special.changeslist',
 			$styleModules,
@@ -46,7 +52,6 @@ class EnhancedChangesListTest extends MediaWikiLangTestCase {
 		$modules = $enhancedChangesList->getOutput()->getModules();
 
 		$this->assertContains( 'jquery.makeCollapsible', $modules, 'has jquery.makeCollapsible' );
-		$this->assertContains( 'mediawiki.icon', $modules, 'has mediawiki.icon' );
 	}
 
 	public function testBeginRecentChangesList_html() {
-- 
2.20.1