From: Derk-Jan Hartman <hartman.wiki@gmail.com>
Date: Sat, 28 May 2016 20:55:39 +0000 (+0200)
Subject: SpecialUpload: Separate style only module
X-Git-Tag: 1.31.0-rc.0~6770^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=2963a1a25eea7ebd3745dc8d43ed1a421cab7d1a;p=lhc%2Fweb%2Fwiklou.git

SpecialUpload: Separate style only module

Move the style into a style only module, because it is used
independant of the javascript module. Add the new style module as a
dependency for the javascript module.

Bug: T136364
Change-Id: If34483fdc50dc130a4bcf3d163b34b954f2269bb
---

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 09111f6fae..4b731cb994 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -368,7 +368,7 @@ class SpecialUpload extends SpecialPage {
 		$sessionKey = $this->mUpload->stashSession();
 
 		// Add styles for the warning, reused from the live preview
-		$this->getOutput()->addModuleStyles( 'mediawiki.special.upload' );
+		$this->getOutput()->addModuleStyles( 'mediawiki.special.upload.styles' );
 
 		$warningHtml = '<h2>' . $this->msg( 'uploadwarning' )->escaped() . "</h2>\n"
 			. '<div class="mw-destfile-warning"><ul>';
diff --git a/resources/Resources.php b/resources/Resources.php
index 343722d49b..831fb0c267 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1906,7 +1906,6 @@ return [
 			'thumbnail.html' => 'resources/src/mediawiki.special/templates/thumbnail.html',
 		],
 		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.upload.js',
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.upload.css',
 		'messages' => [
 			'widthheight',
 			'size-bytes',
@@ -1919,6 +1918,7 @@ return [
 			'prefs-editing',
 		],
 		'dependencies' => [
+			'mediawiki.special.upload.styles',
 			'jquery.spinner',
 			'mediawiki.jqueryMsg',
 			'mediawiki.api',
@@ -1929,6 +1929,9 @@ return [
 			'user.options',
 		],
 	],
+	'mediawiki.special.upload.styles' => [
+		'styles' => 'resources/src/mediawiki.special/mediawiki.special.upload.styles.css',
+	],
 	'mediawiki.special.userlogin.common.styles' => [
 		'styles' => [
 			'resources/src/mediawiki.special/mediawiki.special.userlogin.common.css',
diff --git a/resources/src/mediawiki.special/mediawiki.special.upload.css b/resources/src/mediawiki.special/mediawiki.special.upload.css
deleted file mode 100644
index b916248e0c..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.upload.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * Styling for Special:Upload
- */
-.mw-destfile-warning {
-	border: 1px solid #fde29b;
-	padding: .5em 1em;
-	margin-bottom: 1em;
-	color: #705000;
-	background-color: #fdf1d1;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.upload.styles.css b/resources/src/mediawiki.special/mediawiki.special.upload.styles.css
new file mode 100644
index 0000000000..b916248e0c
--- /dev/null
+++ b/resources/src/mediawiki.special/mediawiki.special.upload.styles.css
@@ -0,0 +1,10 @@
+/*!
+ * Styling for Special:Upload
+ */
+.mw-destfile-warning {
+	border: 1px solid #fde29b;
+	padding: .5em 1em;
+	margin-bottom: 1em;
+	color: #705000;
+	background-color: #fdf1d1;
+}