jenkins-bot has submitted this change and it was merged.
Change subject: Remove history-link-loaded event and inline script wrapper
......................................................................
Remove history-link-loaded event and inline script wrapper
History link modifications are now done when the head init script
is loaded. We've made the initialization of the bar simpler at the
cost of additional delay in rendering.
Change-Id: Ia4e04f749223d7bf5d222687fe02cbfe98181d41
---
M includes/skins/MinervaTemplate.php
M resources/mobile.head/init.js
2 files changed, 8 insertions(+), 17 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index b071b80..261d273 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -282,25 +282,14 @@
* @param array $data Data used to build the page
*/
protected function renderContentWrapper( $data ) {
- echo $this->makeInlineMobileHeadEmitScript( 'header-loaded' );
+ // Construct an inline script which emits header-loaded
+ $headerLoaded = "mw.loader.using( 'mobile.head', function () {";
+ $headerLoaded .= "mw.mobileFrontend.emit( 'header-loaded' );";
+ $headerLoaded .= "} );";
+ echo ResourceLoader::makeInlineScript( $headerLoaded );
+
$this->renderPreContent( $data );
$this->renderContent( $data );
- echo $this->makeInlineMobileHeadEmitScript(
'history-link-loaded' );
- }
-
- /**
- * Construct an inline script tag which emits the given event
- *
- * The emit code will be wrapped in a closure using the mobile.head
module
- *
- * @param string $event Event to emit
- * @return WrappedString HTML
- */
- protected function makeInlineMobileHeadEmitScript( $event ) {
- $script = "mw.loader.using( 'mobile.head', function () {";
- $script .= "mw.mobileFrontend.emit( '" . $event . "' );";
- $script .= "} );";
- return ResourceLoader::makeInlineScript( $script );
}
/**
diff --git a/resources/mobile.head/init.js b/resources/mobile.head/init.js
index bae60e8..d38831c 100644
--- a/resources/mobile.head/init.js
+++ b/resources/mobile.head/init.js
@@ -51,6 +51,7 @@
// bind events
M.define( 'mainMenu', mainMenu );
+ // FIXME: Remove when cache expires.
https://phabricator.wikimedia.org/T112315
M.on( 'history-link-loaded', initHistoryLink );
M.on( 'header-loaded', function () {
// Now we have a main menu button register it.
@@ -63,6 +64,7 @@
if ( !$( '#mw-mf-page-left' ).find( '.menu' ).length ) {
mainMenu.appendTo( '#mw-mf-page-left' );
}
+ initHistoryLink();
} );
}( mw.mobileFrontend, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/236191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4e04f749223d7bf5d222687fe02cbfe98181d41
Gerrit-PatchSet: 12
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Robmoen <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Phuedx <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
