jenkins-bot has submitted this change and it was merged.
Change subject: Fix Schema errors
......................................................................
Fix Schema errors
* Load schemas as category dependency.
* Log category button click immediately.
* Fix diff-prev-or-next.
* Log fontchanger events immediately.
* Do not record font-size, but only the event that
font-size has been changed.
Bug: T78359
Change-Id: I1638e44b1947c0af59d672cb8bc76c22949b567d
---
M includes/MobileFrontend.hooks.php
M includes/Resources.php
M javascripts/loggingSchemas/init.js
M javascripts/modules/categories/init.js
M javascripts/modules/fontchanger/FontChanger.js
M javascripts/modules/fontchanger/init.js
M javascripts/specials/mobilediff.js
7 files changed, 18 insertions(+), 12 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 8cdcd3b..0ea8b12 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -874,7 +874,7 @@
'MobileWebWatchlistClickTracking' => 10720361,
'MobileWebDiffClickTracking' => 10720373,
'MobileWebMainMenuClickTracking' => 10703095,
- 'MobileWebUIClickTracking' => 10733934,
+ 'MobileWebUIClickTracking' => 10742159,
'MobileWebWikiGrok' => 10352247,
'MobileWebWikiGrokError' => 10353516,
);
diff --git a/includes/Resources.php b/includes/Resources.php
index 41f4383..bdb35af 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -567,6 +567,7 @@
'mediawiki.Title',
'mobile.overlays',
'mobile.templates',
+ 'mobile.loggingSchemas',
),
'scripts' => array(
'javascripts/modules/categories/CategoryOverlay.js',
@@ -1027,6 +1028,7 @@
'mobile.settings',
'mobile.templates',
'mobile.drawers',
+ 'mobile.loggingSchemas',
),
'scripts' => array(
'javascripts/modules/fontchanger/FontChanger.js',
diff --git a/javascripts/loggingSchemas/init.js
b/javascripts/loggingSchemas/init.js
index 8aef7af..ee64763 100644
--- a/javascripts/loggingSchemas/init.js
+++ b/javascripts/loggingSchemas/init.js
@@ -49,10 +49,6 @@
'lastmodified-history' );
MobileWebClickTracking.hijackLink( 'UI', $profileLink,
'lastmodified-profile' );
MobileWebClickTracking.hijackLink( 'UI', '.nearby-button',
'nearby-button' );
- MobileWebClickTracking.hijackLink( 'UI', '.fontchanger.link',
'fontchanger-menu' );
- MobileWebClickTracking.hijackLink( 'UI', '.fontchanger-size1',
'fontchanger-size1' );
- MobileWebClickTracking.hijackLink( 'UI', '.fontchanger-size2',
'fontchanger-size2' );
- MobileWebClickTracking.hijackLink( 'UI', '.fontchanger-size3',
'fontchanger-size3' );
} );
MobileWebClickTracking.logPastEvent();
diff --git a/javascripts/modules/categories/init.js
b/javascripts/modules/categories/init.js
index 93272db..613da40 100644
--- a/javascripts/modules/categories/init.js
+++ b/javascripts/modules/categories/init.js
@@ -20,8 +20,11 @@
* Enable the categories button
*/
function initButton() {
- $( '.category-button' ).removeClass( 'hidden' );
- MobileWebClickTracking.hijackLink( 'UI', '.category-button',
'category-button' );
+ $( '.category-button' )
+ .removeClass( 'hidden' )
+ .on( 'click', function () {
+ MobileWebClickTracking.log( 'UI',
'category-button' );
+ } );
}
$( initButton );
diff --git a/javascripts/modules/fontchanger/FontChanger.js
b/javascripts/modules/fontchanger/FontChanger.js
index c49ac8b..89422ba 100644
--- a/javascripts/modules/fontchanger/FontChanger.js
+++ b/javascripts/modules/fontchanger/FontChanger.js
@@ -2,7 +2,8 @@
var FontChanger,
Drawer = M.require( 'Drawer' ),
Icon = M.require( 'Icon' ),
- settings = M.require( 'settings' );
+ settings = M.require( 'settings' ),
+ MobileWebClickTracking = M.require(
'loggingSchemas/MobileWebClickTracking' );
/**
* FontChanger wrapper
@@ -61,6 +62,8 @@
$el.on( 'click', function () {
self.setNewSize( $el );
+
+ MobileWebClickTracking.log( 'UI',
'fontchanger-font-change' );
} );
} );
},
diff --git a/javascripts/modules/fontchanger/init.js
b/javascripts/modules/fontchanger/init.js
index 1e6f2fa..c1b69dd 100644
--- a/javascripts/modules/fontchanger/init.js
+++ b/javascripts/modules/fontchanger/init.js
@@ -2,7 +2,8 @@
var settings = M.require( 'settings' ),
mainmenu = M.require( 'mainmenu' ),
userFontSize = settings.get( 'userFontSize', true ),
- FontChanger = M.require( 'modules/fontchanger/FontChanger' );
+ FontChanger = M.require( 'modules/fontchanger/FontChanger' ),
+ MobileWebClickTracking = M.require(
'loggingSchemas/MobileWebClickTracking' );
// set the user font size if needed
if ( userFontSize !== '100' ) {
@@ -21,5 +22,6 @@
// show the fontchanger drawer
fcDrawer.show();
+ MobileWebClickTracking.log( 'UI', 'fontchanger-menu' );
} );
}( mw.mobileFrontend, jQuery ) );
diff --git a/javascripts/specials/mobilediff.js
b/javascripts/specials/mobilediff.js
index 6d9e206..8659ab9 100644
--- a/javascripts/specials/mobilediff.js
+++ b/javascripts/specials/mobilediff.js
@@ -6,12 +6,12 @@
schema.hijackLink( 'Diff', 'h2 a', 'view' );
// Clicking previous or next diff links
- schema.hijackLink( 'Diff', '.revision-history-links a',
'diff-prev-or-next' );
+ schema.hijackLink( 'Diff', '.revision-history-links a', 'prev-or-next'
);
// user link
schema.hijackLink( 'Diff', '.mw-mf-user a', 'user' );
- // thank button
- schema.hijackLink( 'Diff', '#mw-mf-userinfo > button', 'thank' );
+ // thank button is already logged tracked in the Thank extension
+ // If you update the schema related code, remember to update the Thank
extension too
} )( jQuery, mw.mobileFrontend );
--
To view, visit https://gerrit.wikimedia.org/r/179385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1638e44b1947c0af59d672cb8bc76c22949b567d
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
