Bmansurov has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339565 )
Change subject: Hygiene: lazy-load event logging code
......................................................................
Hygiene: lazy-load event logging code
This allows us to decouple event logging from the `ext.relatedArticles.readMore'
module. As a result we'll be able to log events without loading the above
mentioned module
Bug: T157375
Change-Id: I55cf4f40cafc88d6baeb5cc1b41fc2d6bcd2fbb9
---
M extension.json
M includes/FooterHooks.php
M resources/ext.relatedArticles.readMore.bootstrap/index.js
R resources/ext.relatedArticles.readMore.eventLogging/index.js
4 files changed, 37 insertions(+), 25 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedArticles
refs/changes/65/339565/1
diff --git a/extension.json b/extension.json
index 4dc81f6..1041dec 100644
--- a/extension.json
+++ b/extension.json
@@ -102,6 +102,32 @@
"mobile",
"desktop"
]
+ },
+ "ext.relatedArticles.readMore": {
+ "dependencies": [
+ "mediawiki.util"
+ ],
+ "scripts": [
+
"resources/ext.relatedArticles.readMore/index.js"
+ ],
+ "styles": [
+
"resources/ext.relatedArticles.readMore/readMore.less"
+ ],
+ "skinStyles": {
+ "default":
"resources/ext.relatedArticles.readMore/readMore.default.less",
+ "monobook": [
+
"resources/ext.relatedArticles.readMore/readMore.default.less",
+
"resources/ext.relatedArticles.readMore/readMore.monobook.less"
+ ],
+ "minerva": ""
+ },
+ "messages": [
+ "relatedarticles-read-more-heading"
+ ],
+ "targets": [
+ "desktop",
+ "mobile"
+ ]
}
},
"config": {
diff --git a/includes/FooterHooks.php b/includes/FooterHooks.php
index ff1c299..b3870e0 100644
--- a/includes/FooterHooks.php
+++ b/includes/FooterHooks.php
@@ -189,7 +189,7 @@
}
/**
- * Register the "ext.relatedArticles.readMore" module.
+ * Register the "ext.relatedArticles.readMore.eventLogging" module.
* Optionally update the dependencies and scripts if EventLogging is
installed.
*
* @see
https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderRegisterModules
@@ -198,39 +198,21 @@
* @return boolean
*/
public static function onResourceLoaderRegisterModules( ResourceLoader
&$resourceLoader ) {
- $dependencies = [
- "mediawiki.user",
- "mediawiki.util"
- ];
- $scripts = [
- "resources/ext.relatedArticles.readMore/index.js"
- ];
+ $dependencies = [];
+ $scripts = [];
if ( class_exists( 'EventLogging' ) ) {
+ $dependencies[] = "mediawiki.user";
$dependencies[] = "mediawiki.viewport";
$dependencies[] = "ext.eventLogging.Schema";
- $scripts[] =
"resources/ext.relatedArticles.readMore/eventLogging.js";
+ $scripts[] =
"resources/ext.relatedArticles.readMore.eventLogging/index.js";
}
$resourceLoader->register(
- "ext.relatedArticles.readMore",
+ "ext.relatedArticles.readMore.eventLogging",
[
"dependencies" => $dependencies,
"scripts" => $scripts,
- "styles" => [
-
"resources/ext.relatedArticles.readMore/readMore.less"
- ],
- "skinStyles" => [
- "default" =>
"resources/ext.relatedArticles.readMore/readMore.default.less",
- "monobook" => [
-
"resources/ext.relatedArticles.readMore/readMore.default.less",
-
"resources/ext.relatedArticles.readMore/readMore.monobook.less"
- ],
- "minerva" => ""
- ],
- "messages" => [
- "relatedarticles-read-more-heading"
- ],
"targets" => [
"desktop",
"mobile"
diff --git a/resources/ext.relatedArticles.readMore.bootstrap/index.js
b/resources/ext.relatedArticles.readMore.bootstrap/index.js
index 08d039b..32f0dbc 100644
--- a/resources/ext.relatedArticles.readMore.bootstrap/index.js
+++ b/resources/ext.relatedArticles.readMore.bootstrap/index.js
@@ -28,7 +28,11 @@
// Note we load dependencies here rather than
ResourceLoader
// to avoid PHP exceptions when Cards not
installed
// which should never happen given the if
statement.
- mw.loader.using( [ 'ext.cards',
'ext.relatedArticles.readMore' ] ),
+ mw.loader.using( [
+ 'ext.cards',
+ 'ext.relatedArticles.readMore',
+
'ext.relatedArticles.readMore.eventLogging'
+ ] ),
relatedPagesGateway.getForCurrentPage( LIMIT )
).done( function ( _, pages ) {
if ( pages.length ) {
diff --git a/resources/ext.relatedArticles.readMore/eventLogging.js
b/resources/ext.relatedArticles.readMore.eventLogging/index.js
similarity index 100%
rename from resources/ext.relatedArticles.readMore/eventLogging.js
rename to resources/ext.relatedArticles.readMore.eventLogging/index.js
--
To view, visit https://gerrit.wikimedia.org/r/339565
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I55cf4f40cafc88d6baeb5cc1b41fc2d6bcd2fbb9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <bmansu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
