Robmoen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/236191
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 slightly slower than before.
But I suppose this is acceptable now that the last-modified is at the
bottome of the page
Change-Id: Ia4e04f749223d7bf5d222687fe02cbfe98181d41
---
M includes/skins/MinervaTemplate.php
M resources/mobile.head/init.js
2 files changed, 7 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/91/236191/1
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 7abee82..e315b6d 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -288,29 +288,18 @@
* @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 );
// Last modified bar at the top of the article
if ( !$this->isMainPage ) {
echo $this->getHistoryLinkHtml( $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 415682e..71844dc 100644
--- a/resources/mobile.head/init.js
+++ b/resources/mobile.head/init.js
@@ -35,7 +35,6 @@
// bind events
M.define( 'mainMenu', mainMenu );
- M.on( 'history-link-loaded', initHistoryLink );
M.on( 'header-loaded', function () {
// Now we have a main menu button register it.
mainMenu.registerClickEvents();
@@ -45,6 +44,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: newchange
Gerrit-Change-Id: Ia4e04f749223d7bf5d222687fe02cbfe98181d41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Robmoen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
