Commit a477102e authored by jenkins-bot's avatar jenkins-bot Committed by Gerrit Code Review
Browse files

Merge "Don't add the "minerva--history-page-action-enabled" class to <body>...

Merge "Don't add the "minerva--history-page-action-enabled" class to <body> for non-Minerva skins like MonoBook etc."
parents eab9cb47 2060ead3
weirdgloop/REL1_38 REL1_36 REL1_37 REL1_38 master weirdgloop/REL1_36 weirdgloop/REL1_37 weirdgloop/REL1_39 weirdgloop/REL1_41 weirdgloop/repo-sync wmf/1.36.0-wmf.10 wmf/1.36.0-wmf.11 wmf/1.36.0-wmf.12 wmf/1.36.0-wmf.13 wmf/1.36.0-wmf.14 wmf/1.36.0-wmf.15 wmf/1.36.0-wmf.16 wmf/1.36.0-wmf.17 wmf/1.36.0-wmf.18 wmf/1.36.0-wmf.19 wmf/1.36.0-wmf.20 wmf/1.36.0-wmf.21 wmf/1.36.0-wmf.22 wmf/1.36.0-wmf.23 wmf/1.36.0-wmf.24 wmf/1.36.0-wmf.25 wmf/1.36.0-wmf.26 wmf/1.36.0-wmf.27 wmf/1.36.0-wmf.28 wmf/1.36.0-wmf.29 wmf/1.36.0-wmf.3 wmf/1.36.0-wmf.30 wmf/1.36.0-wmf.31 wmf/1.36.0-wmf.32 wmf/1.36.0-wmf.33 wmf/1.36.0-wmf.34 wmf/1.36.0-wmf.35 wmf/1.36.0-wmf.36 wmf/1.36.0-wmf.37 wmf/1.36.0-wmf.38 wmf/1.36.0-wmf.39 wmf/1.36.0-wmf.4 wmf/1.36.0-wmf.5 wmf/1.36.0-wmf.6 wmf/1.36.0-wmf.7 wmf/1.36.0-wmf.8 wmf/1.36.0-wmf.9 wmf/1.37.0-wmf.1 wmf/1.37.0-wmf.10 wmf/1.37.0-wmf.11 wmf/1.37.0-wmf.12 wmf/1.37.0-wmf.13 wmf/1.37.0-wmf.14 wmf/1.37.0-wmf.15 wmf/1.37.0-wmf.16 wmf/1.37.0-wmf.17 wmf/1.37.0-wmf.18 wmf/1.37.0-wmf.19 wmf/1.37.0-wmf.2 wmf/1.37.0-wmf.20 wmf/1.37.0-wmf.21 wmf/1.37.0-wmf.22 wmf/1.37.0-wmf.23 wmf/1.37.0-wmf.24 wmf/1.37.0-wmf.3 wmf/1.37.0-wmf.4 wmf/1.37.0-wmf.5 wmf/1.37.0-wmf.6 wmf/1.37.0-wmf.7 wmf/1.37.0-wmf.8 wmf/1.37.0-wmf.9 wmf/1.38.0-wmf.1 wmf/1.38.0-wmf.10 wmf/1.38.0-wmf.11 wmf/1.38.0-wmf.12 wmf/1.38.0-wmf.13 wmf/1.38.0-wmf.14 wmf/1.38.0-wmf.15 wmf/1.38.0-wmf.16 wmf/1.38.0-wmf.17 wmf/1.38.0-wmf.18 wmf/1.38.0-wmf.19 wmf/1.38.0-wmf.2 wmf/1.38.0-wmf.20 wmf/1.38.0-wmf.21 wmf/1.38.0-wmf.22 wmf/1.38.0-wmf.23 wmf/1.38.0-wmf.24 wmf/1.38.0-wmf.25 wmf/1.38.0-wmf.26 wmf/1.38.0-wmf.3 wmf/1.38.0-wmf.4 wmf/1.38.0-wmf.5 wmf/1.38.0-wmf.6 wmf/1.38.0-wmf.7 wmf/1.38.0-wmf.8 wmf/1.38.0-wmf.9 wmf/1.39.0-wmf.1 wmf/1.39.0-wmf.2 wmf/1.39.0-wmf.3 wmf/1.39.0-wmf.4 wmf/1.39.0-wmf.5 wmf/1.39.0-wmf.6 wmf/1.39.0-wmf.7
No related merge requests found
Showing with 9 additions and 10 deletions
+9 -10
......@@ -349,23 +349,22 @@ class MinervaHooks {
public static function onOutputPageBodyAttributes( OutputPage $out, Skin $skin, &$bodyAttrs ) {
$classes = $out->getProperty( 'bodyClassName' );
$skinOptions = MediaWikiServices::getInstance()->getService( 'Minerva.SkinOptions' );
$isMinerva = $skin instanceof SkinMinerva;
if ( $skinOptions->get( SkinOptions::HISTORY_IN_PAGE_ACTIONS ) ) {
if ( $isMinerva && $skinOptions->get( SkinOptions::HISTORY_IN_PAGE_ACTIONS ) ) {
// Class is used when page actions is modified to contain more elements
$classes .= ' minerva--history-page-action-enabled';
}
$isSimplifiedTalk = false;
if ( $skin instanceof SkinMinerva ) {
$isSimplifiedTalk = $skin->isSimplifiedTalkPageEnabled();
}
if ( $isMinerva ) {
// phan doesn't realize that $skin can only be an instance of SkinMinerva without this:
'@phan-var SkinMinerva $skin';
if ( $skin->isSimplifiedTalkPageEnabled() ) {
$classes .= ' skin-minerva--talk-simplified';
}
if ( $isSimplifiedTalk ) {
$classes .= ' skin-minerva--talk-simplified';
$bodyAttrs['class'] .= ' ' . $classes;
}
$bodyAttrs[ 'class' ] .= ' ' . $classes;
}
/**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment