From: Roan Kattouw <roan.kattouw@gmail.com>
Date: Thu, 28 Sep 2017 00:09:05 +0000 (-0700)
Subject: Make the RC/Watchlist legend not jump when initially collapsed
X-Git-Tag: 1.31.0-rc.0~1935^2
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=1aa0032c49d7dc9ba6ab12c2c7677d802dd9b09d;p=lhc%2Fweb%2Fwiklou.git

Make the RC/Watchlist legend not jump when initially collapsed

Look at the collapsed/expanded cookie and add class="mw-collapsed"
if it's going to be collapsed.

This is kind of a prelude to T42812.

Change-Id: Icaca762a9d7b000c973d9275f395623129f67979
---

diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index 88ec327671..dcd14e8098 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -1467,8 +1467,10 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 			$context->msg( 'recentchanges-legend-heading' )->parse();
 
 		# Collapsible
+		$collapsedState = $this->getRequest()->getCookie( 'changeslist-state' );
+		$collapsedClass = $collapsedState === 'collapsed' ? ' mw-collapsed' : '';
 		$legend =
-			'<div class="mw-changeslist-legend">' .
+			'<div class="mw-changeslist-legend mw-collapsible' . $collapsedClass . '">' .
 				$legendHeading .
 				'<div class="mw-collapsible-content">' . $legend . '</div>' .
 			'</div>';
diff --git a/resources/src/mediawiki.special/mediawiki.special.changeslist.css b/resources/src/mediawiki.special/mediawiki.special.changeslist.css
index 3e1bd4e8c4..532ca8652c 100644
--- a/resources/src/mediawiki.special/mediawiki.special.changeslist.css
+++ b/resources/src/mediawiki.special/mediawiki.special.changeslist.css
@@ -39,3 +39,8 @@
 	unicode-bidi: -moz-isolate;
 	unicode-bidi: isolate;
 }
+
+/* Prevent FOUC if legend is initially collapsed */
+.mw-changeslist-legend.mw-collapsed .mw-collapsible-content {
+	display: none;
+}