jenkins-bot has submitted this change and it was merged.
Change subject: Fixing loading of loggingSchemas for mobile
......................................................................
Fixing loading of loggingSchemas for mobile
Moving them into onResourceLoaderRegisterModules.
Change-Id: I443cc3b6b32eee62a3795832a3ea565ec63b7f87
---
M includes/MobileFrontend.hooks.php
M includes/Resources.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 77c3061..faefd88 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -823,8 +823,10 @@
);
$scripts = array(
+ 'javascripts/loggingSchemas/mobileWebUploads.js',
'javascripts/loggingSchemas/mobileWebEditing.js',
'javascripts/loggingSchemas/MobileWebClickTracking.js',
+ 'javascripts/loggingSchemas/mobileWebWikiGrok.js',
);
if ( class_exists( 'ResourceLoaderSchemaModule' ) ) {
foreach ( $mobileEventLoggingSchemas as $module =>
$properties ) {
diff --git a/includes/Resources.php b/includes/Resources.php
index fc911e8..bc3369f 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -353,7 +353,6 @@
'mobile.editor.api',
),
'scripts' => array(
- 'javascripts/loggingSchemas/mobileWebUploads.js',
'javascripts/modules/uploads/PhotoApi.js',
'javascripts/modules/uploads/LeadPhoto.js',
'javascripts/modules/uploads/UploadTutorial.js',
@@ -928,7 +927,6 @@
'javascripts/modules/wikigrok/wikigrokeval.js',
'javascripts/modules/wikigrok/WikiGrokDialog.js',
'javascripts/modules/wikigrok/WikiGrokMoreInfo.js',
- 'javascripts/loggingSchemas/mobileWebWikiGrok.js',
),
'styles' => array(
'less/modules/wikigrok/WikiGrokDialog.less',
--
To view, visit https://gerrit.wikimedia.org/r/161573
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I443cc3b6b32eee62a3795832a3ea565ec63b7f87
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.24wmf22
Gerrit-Owner: Kaldari <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
