jenkins-bot has submitted this change and it was merged.
Change subject: SpecialUpload: Separate style only module
......................................................................
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
---
M includes/specials/SpecialUpload.php
M resources/Resources.php
R resources/src/mediawiki.special/mediawiki.special.upload.styles.css
3 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialUpload.php
b/includes/specials/SpecialUpload.php
index 09111f6..4b731cb 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -368,7 +368,7 @@
$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 343722d..831fb0c 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1906,7 +1906,6 @@
'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 @@
'prefs-editing',
],
'dependencies' => [
+ 'mediawiki.special.upload.styles',
'jquery.spinner',
'mediawiki.jqueryMsg',
'mediawiki.api',
@@ -1929,6 +1929,9 @@
'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.styles.css
similarity index 100%
rename from resources/src/mediawiki.special/mediawiki.special.upload.css
rename to resources/src/mediawiki.special/mediawiki.special.upload.styles.css
--
To view, visit https://gerrit.wikimedia.org/r/291564
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If34483fdc50dc130a4bcf3d163b34b954f2269bb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Edokter <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
