jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354222 )
Change subject: rl: Break out mobile.messageBox styles module
......................................................................
rl: Break out mobile.messageBox styles module
The mobile.messageBox styles are loaded using
OutputPage#addModuleStyles, which requires that the specified modules
are styles-only, on certain special pages. They are also loaded by the
RL on other pages as they are depended on by the mobile.nearby and
mobile.editor.common RL modules.
Support both ways of loading the mobile.messageBox styles (and other
content) and the RL by:
* Creating the mobile.messageBox.styles styles-only RL module.
* Making the mobile.messageBox RL module depend on
mobile.messageBox.styles.
* Only loading the mobile.messageBox.styles RL module on certain pages.
Bug: T164892
Change-Id: I46dd7fbfdfebd1daf732f9c3a7dbbf488ff6c533
---
M extension.json
M includes/skins/SkinMinerva.php
R resources/mobile.messageBox.styles/messageBox.less
3 files changed, 14 insertions(+), 7 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 4191e85..4ff68ea 100644
--- a/extension.json
+++ b/extension.json
@@ -321,17 +321,24 @@
"resources/mobile.mainMenu/MainMenu.js"
]
},
+ "mobile.messageBox.styles": {
+ "targets": [
+ "mobile",
+ "desktop"
+ ],
+ "position": "top",
+ "styles": [
+
"resources/mobile.messageBox.styles/messageBox.less"
+ ]
+ },
"mobile.messageBox": {
"targets": [
"mobile",
"desktop"
],
"dependencies": [
- "mobile.startup"
- ],
- "position": "top",
- "styles": [
- "resources/mobile.messageBox/messageBox.less"
+ "mobile.startup",
+ "mobile.messageBox.styles"
],
"templates": {
"MessageBox.hogan":
"resources/mobile.messageBox/MessageBox.mustache"
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 1b18eeb..8cadaf4 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1402,14 +1402,14 @@
$styles[] = 'skins.minerva.userpage.styles';
$styles[] = 'skins.minerva.userpage.icons';
} elseif ( $title->isSpecialPage() ) {
- $styles[] = 'mobile.messageBox';
+ $styles[] = 'mobile.messageBox.styles';
$styles['special'] = 'skins.minerva.special.styles';
}
if ( $title->isSpecial( 'Notifications' ) ) {
$styles[] = 'skins.minerva.notifications.filter.styles';
}
if ( $this->getOutput()->getRequest()->getText( 'oldid' ) ) {
- $styles[] = 'mobile.messageBox';
+ $styles[] = 'mobile.messageBox.styles';
}
return $styles;
diff --git a/resources/mobile.messageBox/messageBox.less
b/resources/mobile.messageBox.styles/messageBox.less
similarity index 100%
rename from resources/mobile.messageBox/messageBox.less
rename to resources/mobile.messageBox.styles/messageBox.less
--
To view, visit https://gerrit.wikimedia.org/r/354222
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I46dd7fbfdfebd1daf732f9c3a7dbbf488ff6c533
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx <samsm...@wikimedia.org>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: Phuedx <samsm...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
