jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348872 )
Change subject: Merge remote-tracking branch 'origin/master' into HEAD
......................................................................
Merge remote-tracking branch 'origin/master' into HEAD
Additional changes:
* Use Skin:getSkinOption to register print styles
SkinMinerva no longer knows anything about mobileContext.
Update how we add styles to the page
Change-Id: I293f6133160fee40e34c92b7d5c2865dc3c20a3c
---
M includes/Minerva.hooks.php
M includes/skins/SkinMinerva.php
2 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Minerva.hooks.php b/includes/Minerva.hooks.php
index cacafff..d74d02d 100644
--- a/includes/Minerva.hooks.php
+++ b/includes/Minerva.hooks.php
@@ -70,6 +70,8 @@
// setSkinOptions is not available
if ( $skin instanceof SkinMinerva ) {
$skin->setSkinOptions( [
+ SkinMinerva::OPTION_PRINT_STYLES
+ => $mobileContext->getConfigVariable(
'MinervaPrintStyles' ),
SkinMinerva::OPTION_CATEGORIES
=> $mobileContext->getConfigVariable(
'MinervaShowCategoriesButton' ),
SkinMinerva::OPTION_FONT_CHANGER
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 8f99e71..d3a87e0 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -17,6 +17,7 @@
const OPTION_FONT_CHANGER = 'fontChanger';
const OPTION_BACK_TO_TOP = 'backToTop';
const OPTION_TOGGLING = 'toggling';
+ const OPTION_PRINT_STYLES = 'printStyles';
/** @var string $skinname Name of this skin */
public $skinname = 'minerva';
@@ -59,6 +60,8 @@
self::OPTION_BACK_TO_TOP => false,
/** Whether sections can be collapsed (requires MobileFrontend
and MobileFormatter) */
self::OPTION_TOGGLING => false,
+ /** Whether print styles should be loaded */
+ self::OPTION_PRINT_STYLES => false,
];
/**
@@ -321,7 +324,7 @@
public function initPage( OutputPage $out ) {
parent::initPage( $out );
$styles = [ 'mobile.usermodule.styles' ];
- if ( $this->mobileContext->getConfigVariable(
'MinervaPrintStyles' ) ) {
+ if ( $this->getSkinOption( self::OPTION_PRINT_STYLES ) ) {
$styles[] = 'skins.minerva.print.styles';
}
--
To view, visit https://gerrit.wikimedia.org/r/348872
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I293f6133160fee40e34c92b7d5c2865dc3c20a3c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: printstyles
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
