From 09b8f235e882eca6279791ea6881953a458ba297 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Thu, 28 Aug 2014 19:50:59 +0200
Subject: [PATCH] mediawiki.action.view.metadata: Include the CSS we need,
 don't rely on shared.css

Change-Id: I4b1cbc5998492272825d33842ee3721a41b19b4c
---
 includes/page/ImagePage.php                              | 2 +-
 resources/Resources.php                                  | 1 +
 .../mediawiki.action/mediawiki.action.view.metadata.css  | 6 ++++++
 .../mediawiki.action/mediawiki.action.view.metadata.js   | 4 +---
 resources/src/mediawiki.legacy/oldshared.css             | 4 ----
 resources/src/mediawiki.legacy/shared.css                | 9 ---------
 6 files changed, 9 insertions(+), 17 deletions(-)
 create mode 100644 resources/src/mediawiki.action/mediawiki.action.view.metadata.css

diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index 80e5371ee2..d06c8191ec 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -267,7 +267,7 @@ class ImagePage extends Article {
 				# @todo FIXME: Why is this using escapeId for a class?!
 				$class = Sanitizer::escapeId( $v['id'] );
 				if ( $type == 'collapsed' ) {
-					// Handled by mediawiki.action.view.metadata module and shared.css.
+					// Handled by mediawiki.action.view.metadata module.
 					$class .= ' collapsable';
 				}
 				$r .= "<tr class=\"$class\">\n";
diff --git a/resources/Resources.php b/resources/Resources.php
index c83fe34474..eb36ee5341 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1036,6 +1036,7 @@ return array(
 		),
 	),
 	'mediawiki.action.view.metadata' => array(
+		'styles' => 'resources/src/mediawiki.action/mediawiki.action.view.metadata.css',
 		'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.metadata.js',
 		'messages' => array(
 			'metadata-expand',
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.metadata.css b/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
new file mode 100644
index 0000000000..2c8d2e6543
--- /dev/null
+++ b/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
@@ -0,0 +1,6 @@
+/*!
+ * Hide collapsable rows in a collapsed table.
+ */
+table.collapsed tr.collapsable {
+	display: none;
+}
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.metadata.js b/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
index 1b3835035b..25b5acc5bc 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
@@ -4,9 +4,7 @@
  * Add an expand/collapse link and collapse by default if set to
  * (with JS disabled, user will see all items)
  *
- * See also:
- * - ImagePage.php#makeMetadataTable (creates the HTML)
- * - shared.css (hides tr.collapsable inside table.collapsed)
+ * See also ImagePage.php#makeMetadataTable (creates the HTML)
  */
 ( function ( mw, $ ) {
 	$( function () {
diff --git a/resources/src/mediawiki.legacy/oldshared.css b/resources/src/mediawiki.legacy/oldshared.css
index 11a857e186..4741074912 100644
--- a/resources/src/mediawiki.legacy/oldshared.css
+++ b/resources/src/mediawiki.legacy/oldshared.css
@@ -402,10 +402,6 @@ table.mw_metadata td.spacer {
 	border-bottom: none;
 }
 
-table.collapsed tr.collapsable {
-	display: none;
-}
-
 .visualClear {
 	clear: both;
 }
diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css
index a3ad1e8c29..6e7dd9a1c3 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -529,15 +529,6 @@ table.wikitable > caption {
 	font-weight: bold;
 }
 
-/**
- * Hide collapsable rows in a collapsed table.
- *
- * Used by ImagePage and the mediawiki.action.view.metadata module.
- */
-table.collapsed tr.collapsable {
-	display: none;
-}
-
 /* success and error messages */
 .error,
 .warning,
-- 
2.20.1