Merge "Make the RC/Watchlist legend not jump when initially collapsed"

diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index 88ec327..dcd14e8 100644 (file)
--- 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 3e1bd4e..532ca86 100644 (file)
--- 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;
+}