jenkins-bot has submitted this change and it was merged.
Change subject: Define render function in MinervaTemplate to output page
......................................................................
Define render function in MinervaTemplate to output page
Make prepareData a public function that gets called in MinervaTemplate
execute that mobile overrides
Change-Id: Id34e1a6af58aa16f231379a379e391880c65d8e2
---
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMobileTemplate.php
2 files changed, 9 insertions(+), 2 deletions(-)
Approvals:
MaxSem: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 6eb2c60..0bf91e1 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -18,8 +18,13 @@
);
}
+ public function prepareData() { // expects to be overriden
+ }
+
public function execute() {
$this->prepareCommonData();
+ $this->prepareData();
+ $this->render( $this->data );
}
public function getLanguageVariants() {
@@ -57,4 +62,8 @@
<?php
}
}
+
+ private function render( $data ) { // FIXME: replace with template
engines
+ echo $data[ 'headelement' ];
+ }
}
diff --git a/includes/skins/SkinMobileTemplate.php
b/includes/skins/SkinMobileTemplate.php
index 5c1b066..f5ad1d49 100644
--- a/includes/skins/SkinMobileTemplate.php
+++ b/includes/skins/SkinMobileTemplate.php
@@ -50,8 +50,6 @@
public function execute() {
parent::execute();
- $this->prepareData();
- $this->html( 'headelement' );
$this->renderArticleSkin();
$this->html( 'bottomScripts' ) ?>
</body>
--
To view, visit https://gerrit.wikimedia.org/r/58991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id34e1a6af58aa16f231379a379e391880c65d8e2
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
