wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-24 07:54:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Log 'mark all read' button click actions"

Browse source
This commit is contained in:
jenkins-bot 2016-08-11 20:58:31 +00:00 committed by Gerrit Code Review
parent c4121e7ff8 b02a6e8b26
commit ccab1d8351
4 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Echo.php
View file

@ -568,7 +568,7 @@ $wgEchoConfig = array(
), ),
'EchoInteraction' => array( 'EchoInteraction' => array(
'enabled' => false, 'enabled' => false,
'revision' => 15180901, 'revision' => 15823738,
'client' => true, 'client' => true,
), ),
) )

7
modules/logger/mw.echo.Logger.js
View file

@ -75,7 +75,8 @@
mw.echo.Logger.static.actions = { mw.echo.Logger.static.actions = {
notificationClick: 'notification-link-click', notificationClick: 'notification-link-click',
notificationBundleExpand: 'notification-bundle-expand', notificationBundleExpand: 'notification-bundle-expand',
notificationImpression: 'notification-impression' notificationImpression: 'notification-impression',
markAllReadClick: 'mark-all-read-click'
}; };
/* Methods */ /* Methods */
@ -111,8 +112,8 @@
if ( eventType ) { if ( eventType ) {
myEvt.notificationType = eventType; myEvt.notificationType = eventType;
} }
if ( mobile ) { if ( mobile !== undefined || mw.config.get( 'skin' ) === 'minerva' ) {
myEvt.mobile = mobile; myEvt.mobile = mobile || mw.config.get( 'skin' ) === 'minerva';
} }
if ( notifWiki && notifWiki !== mw.config.get( 'wgDBname' ) && notifWiki !== 'local' ) { if ( notifWiki && notifWiki !== mw.config.get( 'wgDBname' ) && notifWiki !== 'local' ) {

8
modules/ui/mw.echo.ui.NotificationBadgeWidget.js
View file

@ -294,6 +294,14 @@
* Respond to 'mark all as read' button click * Respond to 'mark all as read' button click
*/ */
mw.echo.ui.NotificationBadgeWidget.prototype.onMarkAllReadButtonClick = function () { mw.echo.ui.NotificationBadgeWidget.prototype.onMarkAllReadButtonClick = function () {
// Log the click action
mw.echo.logger.logInteraction(
mw.echo.Logger.static.actions.markAllReadClick,
mw.echo.Logger.static.context.popup,
null, // Event id isn't relevant
this.manager.getTypeString() // The type of the list
);
this.controller.markLocalNotificationsRead(); this.controller.markLocalNotificationsRead();
}; };

10
modules/ui/mw.echo.ui.SpecialHelpMenuWidget.js
View file

@ -106,6 +106,16 @@
* Respond to mark all read button click * Respond to mark all read button click
*/ */
mw.echo.ui.SpecialHelpMenuWidget.prototype.onMarkAllreadButtonClick = function () { mw.echo.ui.SpecialHelpMenuWidget.prototype.onMarkAllreadButtonClick = function () {
// Log this action
mw.echo.logger.logInteraction(
mw.echo.Logger.static.actions.markAllReadClick,
mw.echo.Logger.static.context.archive,
null, // Notification ID is irrelevant
this.manager.getTypeString(), // The type of the list in general
null, // The Logger has logic to decide whether this is mobile or not
this.manager.getFiltersModel().getSourcePagesModel().getCurrentSource() // Source name
);
this.popup.toggle( false ); this.popup.toggle( false );
this.emit( 'markAllRead' ); this.emit( 'markAllRead' );
}; };