jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354715 )
Change subject: Hygiene: Define notifications in extension.json
......................................................................
Hygiene: Define notifications in extension.json
These ResourceLoader modules can safely be defined in extension.json.
It has no hard dependencies on ResourceLoader modules provided by
Echo.
Registering this in Echo makes this code more discoverable. Hooks should
only be used as a last resort as they performance penalties.
Change-Id: I952aeb7501cf45605860eefcf0213ea1ae555755
---
M extension.json
M includes/Minerva.hooks.php
M resources/skins.minerva.notifications.badge/NotificationBadge.js
3 files changed, 26 insertions(+), 53 deletions(-)
Approvals:
Pmiazga: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 1d0b25f..e6ee3e3 100644
--- a/extension.json
+++ b/extension.json
@@ -1457,6 +1457,30 @@
"mobile-frontend-editor-tutorial-cancel"
]
},
+ "skins.minerva.notifications.badge": {
+ "dependencies": [
+ "mediawiki.router",
+ "mobile.startup"
+ ],
+ "scripts": [
+
"resources/skins.minerva.notifications.badge/NotificationBadge.js"
+ ],
+ "templates": {
+ "badge.hogan":
"includes/skins/secondaryButton.mustache"
+ },
+ "targets": [ "mobile", "desktop" ]
+ },
+ "skins.minerva.notifications": {
+ "dependencies": [
+ "skins.minerva.notifications.badge",
+ "mediawiki.ui.anchor",
+ "skins.minerva.scripts"
+ ],
+ "scripts": [
+ "resources/skins.minerva.notifications/init.js"
+ ],
+ "targets": [ "mobile", "desktop" ]
+ },
"skins.minerva.editor": {
"class": "MFResourceLoaderParsedMessageModule",
"dependencies": [
@@ -1706,7 +1730,6 @@
"MobileFrontendHooks::onCentralAuthSilentLoginRedirect"
],
"ResourceLoaderRegisterModules": [
- "MinervaHooks::onResourceLoaderRegisterModules",
"MobileFrontendHooks::onResourceLoaderRegisterModules"
],
"EventLoggingRegisterSchemas": [
diff --git a/includes/Minerva.hooks.php b/includes/Minerva.hooks.php
index 596c0f2..86d2874 100644
--- a/includes/Minerva.hooks.php
+++ b/includes/Minerva.hooks.php
@@ -104,57 +104,6 @@
}
/**
- * ResourceLoaderRegisterModules hook handler.
- *
- * Registers:
- *
- * * EventLogging schema modules, if the EventLogging extension is
loaded;
- * * Modules for the Visual Editor overlay, if the VisualEditor
extension is loaded; and
- * * Modules for the notifications overlay, if the Echo extension is
loaded.
- *
- * @see
https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderRegisterModules
- *
- * @param ResourceLoader &$resourceLoader The ResourceLoader object
- * @return bool Always true
- */
- public static function onResourceLoaderRegisterModules( ResourceLoader
&$resourceLoader ) {
- $resourceBoilerplate = [
- 'localBasePath' => dirname( __DIR__ ),
- // Rename to Minerva when you move to a skin
- 'remoteExtPath' => 'MobileFrontend',
- ];
-
- if ( class_exists( 'MWEchoNotifUser' ) ) {
- $resourceLoader->register( [
- 'skins.minerva.notifications.badge' =>
$resourceBoilerplate + [
- 'dependencies' => [
- 'mediawiki.router',
- 'mobile.startup',
- ],
- 'scripts' => [
-
'resources/skins.minerva.notifications.badge/NotificationBadge.js',
- ],
- 'templates' => [
- 'badge.hogan' =>
'includes/skins/secondaryButton.mustache',
- ],
- 'targets' => [ 'mobile', 'desktop' ],
- ],
- 'skins.minerva.notifications' =>
$resourceBoilerplate + [
- 'dependencies' => [
-
'skins.minerva.notifications.badge',
- 'mediawiki.ui.anchor',
- 'skins.minerva.scripts',
- ],
- 'scripts' => [
-
'resources/skins.minerva.notifications/init.js',
- ],
- 'targets' => [ 'mobile', 'desktop' ],
- ],
- ] );
- }
- }
-
- /**
* BeforePageDisplayMobile hook handler.
*
* @param OutputPage $out
diff --git a/resources/skins.minerva.notifications.badge/NotificationBadge.js
b/resources/skins.minerva.notifications.badge/NotificationBadge.js
index 91149e4..7f51830 100644
--- a/resources/skins.minerva.notifications.badge/NotificationBadge.js
+++ b/resources/skins.minerva.notifications.badge/NotificationBadge.js
@@ -76,7 +76,8 @@
var self = this;
return this._loadModuleScript(
'mobile.notifications.overlay' ).then( function () {
- var NotificationsOverlay = M.require(
'mobile.notifications.overlay/NotificationsOverlay' );
+ var NotificationsOverlay =
+ M.require(
'mobile.notifications.overlay/NotificationsOverlay' ); //
resource-modules-disable-line
return new NotificationsOverlay( {
badge: self
} );
--
To view, visit https://gerrit.wikimedia.org/r/354715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I952aeb7501cf45605860eefcf0213ea1ae555755
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Jhernandez <jhernan...@wikimedia.org>
Gerrit-Reviewer: Pmiazga <pmia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
