jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Remove SkinMinervaBeta functions
......................................................................
Hygiene: Remove SkinMinervaBeta functions
Removee SkinMinervaBeta::getSecondaryActions
Seems to be a clone of SkinMinerva::getSecondaryActions
with one exception - a talk icon. Talk icon has been
added to stable for consistency.
Remove preparePageContent and outputPage
Seems to do nothing.
Bug: T116974
Change-Id: Ibe813a6f410ee3391a449cc15e145bb96f52b693
---
M includes/skins/SkinMinerva.php
M includes/skins/SkinMinervaBeta.php
2 files changed, 1 insertion(+), 54 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index c02ef9c..07bbe2f 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -793,7 +793,7 @@
'attributes' => array(
'href' => $talkTitle->getLinkURL(),
'data-title' => $talkTitle->getFullText(),
- 'class' => 'talk',
+ 'class' => MobileUI::iconClass( 'talk',
'before', 'talk' ),
),
'label' => $talkButton['text'],
);
diff --git a/includes/skins/SkinMinervaBeta.php
b/includes/skins/SkinMinervaBeta.php
index cf1c05e..d7be0bf 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -35,17 +35,6 @@
}
/**
- * initialize various variables and generate the template
- * @param OutputPage $out optional parameter: The OutputPage Obj.
- */
- public function outputPage( OutputPage $out = null ) {
- if ( !$out ) {
- $out = $this->getOutput();
- }
- parent::outputPage( $out );
- }
-
- /**
* Returns an array with details for a talk button.
* @param Title $talkTitle Title object of the talk page
* @param array $talkButton Array with data of desktop talk button
@@ -98,37 +87,6 @@
}
/**
- * Returns an array of links for page secondary actions
- * @param BaseTemplate $tpl
- * @return Array
- */
- protected function getSecondaryActions( BaseTemplate $tpl ) {
- $buttons = parent::getSecondaryActions( $tpl );
-
- $title = $this->getTitle();
- $namespaces = $tpl->data['content_navigation']['namespaces'];
- if ( $this->isTalkAllowed() ) {
- // FIXME [core]: This seems unnecessary..
- $subjectId = $title->getNamespaceKey( '' );
- $talkId = $subjectId === 'main' ? 'talk' :
"{$subjectId}_talk";
- $talkButton = isset( $namespaces[$talkId] ) &&
!$title->isTalkPage() ?
- $namespaces[$talkId]['text'] : '';
-
- $talkTitle = $title->getTalkPage();
- $buttons['talk'] = array(
- 'attributes' => array(
- 'href' => $talkTitle->getLinkURL(),
- 'class' => MobileUI::iconClass(
'talk', 'before', 'talk' ),
- 'data-title' =>
$talkTitle->getFullText(),
- ),
- 'label' => $talkButton,
- );
- }
-
- return $buttons;
- }
-
- /**
* Get the needed styles for this skin
* @return array
*/
@@ -151,17 +109,6 @@
$this->msg(
'mobile-frontend-view-source' )->text() ) .
Html::closeElement( 'p' );
return $viewSourceLink . parent::getOldRevisionHtml();
- }
-
- /** @inheritdoc */
- protected function preparePageContent( QuickTemplate $tpl ) {
- parent::preparePageContent( $tpl );
-
- $title = $this->getTitle();
-
- if ( !$title ) {
- return;
- }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/245595
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe813a6f410ee3391a449cc15e145bb96f52b693
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
