Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230704
Change subject: Revert "Don't hardcode script tags. Use RL makeInlineScript
method"
......................................................................
Revert "Don't hardcode script tags. Use RL makeInlineScript method"
This reverts commit 75f4cf09a27c019b8ee9e029fa9f3e367699a42a
Change-Id: I386a6c99cd6700f5927857a6636555c82c9dab2c
---
M includes/skins/MinervaTemplate.php
1 file changed, 20 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/04/230704/1
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index d99112a..fe42b9c 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -316,20 +316,29 @@
* @param array $data Data used to build the page
*/
protected function renderContentWrapper( $data ) {
- $script = "mw.loader.using('mobile.head', function () {";
if ( $this->renderHistoryLinkBeforeContent ) {
echo $this->getHistoryLinkTopHtml( $data );
- $script .= "mw.mobileFrontend.emit(
'history-link-loaded' );";
+ ?>
+ <script>
+ if ( window.mw && mw.mobileFrontend ) {
mw.mobileFrontend.emit( 'history-link-loaded' ); }
+ </script>
+ <?php
}
- $script .= "mw.mobileFrontend.emit( 'header-loaded' );";
- $this->renderPreContent( $data );
- $this->renderContent( $data );
- if ( !$this->renderHistoryLinkBeforeContent ) {
- echo $this->getHistoryLinkTopHtml( $data );
- $script .= "mw.mobileFrontend.emit(
'history-link-loaded' );";
- }
- $script .= "});";
- echo ResourceLoader::makeInlineScript( $script );
+ ?>
+ <script>
+ if ( window.mw && mw.mobileFrontend ) {
mw.mobileFrontend.emit( 'header-loaded' ); }
+ </script>
+ <?php
+ $this->renderPreContent( $data );
+ $this->renderContent( $data );
+ if ( !$this->renderHistoryLinkBeforeContent ) {
+ echo $this->getHistoryLinkTopHtml( $data );
+ ?>
+ <script>
+ if ( window.mw && mw.mobileFrontend ) {
mw.mobileFrontend.emit( 'history-link-loaded' ); }
+ </script>
+ <?php
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/230704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I386a6c99cd6700f5927857a6636555c82c9dab2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
