Awight has submitted this change and it was merged.
Change subject: Register mobile modules in SkinMinervaDefaultModules hook
......................................................................
Register mobile modules in SkinMinervaDefaultModules hook
Change-Id: Idb65f2a0e1ed62023475cdeed6f1056be78f9714
---
M CentralNotice.hooks.php
1 file changed, 8 insertions(+), 9 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CentralNotice.hooks.php b/CentralNotice.hooks.php
index 8f5fad9..eefac7c 100644
--- a/CentralNotice.hooks.php
+++ b/CentralNotice.hooks.php
@@ -121,9 +121,9 @@
$wgHooks[ 'BeforePageDisplay' ][ ] = 'efCentralNoticeLoader';
$wgHooks[ 'SiteNoticeAfter' ][ ] = 'efCentralNoticeDisplay';
$wgHooks[ 'ResourceLoaderGetConfigVars' ][] =
'efResourceLoaderGetConfigVars';
+ // Register mobile modules
+ $wgHooks[ 'SkinMinervaDefaultModules' ][] =
'onSkinMinervaDefaultModules';
}
- // Register mobile modules
- $wgHooks['EnableMobileModules'][] = 'efEnableMobileModules';
// Tell the UserMerge extension where we store user ids
$wgHooks[ 'UserMergeAccountFields' ][] = function( &$updateFields ) {
@@ -371,19 +371,18 @@
}
/**
- * EnableMobileModules callback for placing the CN resourceloader
- * modules onto mobile pages.
+ * Place CentralNotice ResourceLoader modules onto mobile pages.
*
- * @param OutputPage $out
- * @param $mode
+ * @param Skin $skin
+ * @param array $modules
*
* @return bool
*/
-function efEnableMobileModules( $out, $mode ) {
- $names = array(
+function onSkinMinervaDefaultModules( Skin $skin, array &$modules ) {
+ $modules[ 'centralnotice' ] = array(
'ext.centralNotice.bannerController.mobiledevice',
'ext.centralNotice.bannerController.mobile',
);
- $out->addModules( $names );
+
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/173110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb65f2a0e1ed62023475cdeed6f1056be78f9714
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Robmoen <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: Robmoen <[email protected]>
Gerrit-Reviewer: Ssmith <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
