From fdaecaf25f74bf34fd889e9341d4e4b80d8497a1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Thu, 16 Jun 2016 14:25:02 +0200
Subject: [PATCH] Split off basic styles from the JavaScript module
 'mediawiki.action.history'

Since d629541076c the .updatedmarker element was styled via a JavaScript
module - which caused a flash of unstyled content on the history page
for most users, and was left unstyled for noscript users.

Bug: T137383
Change-Id: I362abacf51160a8305b2b0013f65e89deb2ffc93
---
 includes/actions/HistoryAction.php                          | 1 +
 resources/Resources.php                                     | 5 ++++-
 resources/src/mediawiki.action/mediawiki.action.history.css | 6 ++----
 .../mediawiki.action/mediawiki.action.history.styles.css    | 5 +++++
 4 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 resources/src/mediawiki.action/mediawiki.action.history.styles.css

diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index 5ec10e6aff..63fe97b5a1 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -116,6 +116,7 @@ class HistoryAction extends FormlessAction {
 		// Setup page variables.
 		$out->setFeedAppendQuery( 'action=history' );
 		$out->addModules( 'mediawiki.action.history' );
+		$out->addModuleStyles( 'mediawiki.action.history.styles' );
 		if ( $config->get( 'UseMediaWikiUIEverywhere' ) ) {
 			$out = $this->getOutput();
 			$out->addModuleStyles( [
diff --git a/resources/Resources.php b/resources/Resources.php
index c2724afdf5..e31e77e8c7 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1461,10 +1461,13 @@ return [
 		],
 	],
 	'mediawiki.action.history' => [
-		'position' => 'top',
 		'scripts' => 'resources/src/mediawiki.action/mediawiki.action.history.js',
 		'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.css',
 	],
+	'mediawiki.action.history.styles' => [
+		'position' => 'top',
+		'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css',
+	],
 	'mediawiki.action.history.diff' => [
 		'position' => 'top',
 		'styles' => [
diff --git a/resources/src/mediawiki.action/mediawiki.action.history.css b/resources/src/mediawiki.action/mediawiki.action.history.css
index 95e92ae374..fd5dbc97d6 100644
--- a/resources/src/mediawiki.action/mediawiki.action.history.css
+++ b/resources/src/mediawiki.action/mediawiki.action.history.css
@@ -1,8 +1,6 @@
+/* Styles for the JavaScript enhancements of the history page */
+
 #pagehistory li.before input[name="oldid"],
 #pagehistory li.after input[name="diff"] {
 	visibility: hidden;
 }
-
-.updatedmarker {
-	background-color: #b7f430;
-}
diff --git a/resources/src/mediawiki.action/mediawiki.action.history.styles.css b/resources/src/mediawiki.action/mediawiki.action.history.styles.css
new file mode 100644
index 0000000000..269db8eb32
--- /dev/null
+++ b/resources/src/mediawiki.action/mediawiki.action.history.styles.css
@@ -0,0 +1,5 @@
+/* Basic styles for the history page */
+
+.updatedmarker {
+	background-color: #b7f430;
+}
-- 
2.20.1