jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376135 )
Change subject: EventLogging modules should be soft dependencies
......................................................................
EventLogging modules should be soft dependencies
Change-Id: Ibc546a89b11360769c9c50dc52cb9b7b5e433100
---
M resources/skins.minerva.editor/init.js
M resources/skins.minerva.mainMenu/MainMenu.js
M skin.json
3 files changed, 15 insertions(+), 10 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/resources/skins.minerva.editor/init.js
b/resources/skins.minerva.editor/init.js
index 862180b..c71dd2f 100644
--- a/resources/skins.minerva.editor/init.js
+++ b/resources/skins.minerva.editor/init.js
@@ -168,14 +168,19 @@
* @method
*/
function logInit( editor ) {
- mw.track( 'mf.schemaEdit', {
- action: 'init',
- type: 'section',
- mechanism: initMechanism,
- editor: editor,
- editingSessionId:
editorOptions.sessionId
+ // If MobileFrontend is not available this will
not be possible so
+ // check first.
+ mw.loader.using( 'mobile.loggingSchemas.edit'
).done( function () {
+ mw.track( 'mf.schemaEdit', {
+ action: 'init',
+ type: 'section',
+ mechanism: initMechanism,
+ editor: editor,
+ editingSessionId:
editorOptions.sessionId
+ } );
} );
}
+
/**
* Load source editor
* @private
diff --git a/resources/skins.minerva.mainMenu/MainMenu.js
b/resources/skins.minerva.mainMenu/MainMenu.js
index 4b51e40..e957cf3 100644
--- a/resources/skins.minerva.mainMenu/MainMenu.js
+++ b/resources/skins.minerva.mainMenu/MainMenu.js
@@ -36,6 +36,8 @@
* attributes on elements.
*/
enableLogging: function () {
+ // Load the EventLogging module inside MobileFrontend
if available
+ mw.loader.using(
'mobile.loggingSchemas.mobileWebMainMenuClickTracking' );
this.$( 'a' ).on( 'click', function () {
var $link = $( this ),
eventName = $link.data( 'event-name' );
diff --git a/skin.json b/skin.json
index 47a89cb..319e415 100644
--- a/skin.json
+++ b/skin.json
@@ -233,8 +233,7 @@
"dependencies": [
"skins.minerva.mainMenu.icons",
"skins.minerva.mainMenu.styles",
- "mobile.startup",
-
"mobile.loggingSchemas.mobileWebMainMenuClickTracking"
+ "mobile.startup"
],
"position": "bottom",
"templates": {
@@ -360,8 +359,7 @@
"mediawiki.ui.input",
"mobile.startup",
"skins.minerva.toggling",
- "mediawiki.jqueryMsg",
- "mobile.loggingSchemas.edit"
+ "mediawiki.jqueryMsg"
],
"messages": {
"0": "mobile-frontend-editor-disabled",
--
To view, visit https://gerrit.wikimedia.org/r/376135
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc546a89b11360769c9c50dc52cb9b7b5e433100
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@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
