jenkins-bot has submitted this change and it was merged. Change subject: Log settings-open event ......................................................................
Log settings-open event
Change-Id: I55fb9e4b8b6b210003f6bbad07486e1c2a8cba4f
---
M resources/js/ext.uls.interface.js
1 file changed, 47 insertions(+), 13 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.uls.interface.js
b/resources/js/ext.uls.interface.js
index fcbb292..c4b8128 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -91,6 +91,7 @@
.click();
} );
}
+
uls.hide();
} );
}
@@ -119,6 +120,12 @@
} ).click();
} );
}
+
+ mw.uls.logEvent( {
+ action: 'settings-open',
+ context: 'uls'
+ } );
+
uls.hide();
} );
}
@@ -319,11 +326,20 @@
$ulsTrigger.attr( {
title: $.i18n(
'ext-uls-select-language-settings-icon-tooltip' )
} );
- $ulsTrigger.on( 'click', function ( e ) {
+
+ $ulsTrigger.on( 'click', function ( e,
eventParams ) {
var languagesettings =
$ulsTrigger.data( 'languagesettings' ),
languageSettingsOptions;
- if ( !languagesettings ) {
+ if ( languagesettings ) {
+ if ( !languagesettings.shown ) {
+ mw.uls.logEvent( {
+ action:
'settings-open',
+ context:
eventParams && eventParams.source || 'interlanguage'
+ } );
+ }
+ } else {
+ // Initialize the Language
settings window
languageSettingsOptions = {
defaultModule:
'display',
onVisible: function () {
@@ -355,6 +371,7 @@
this.position();
}
};
+
mw.loader.using(
mw.uls.languageSettingsModules, function () {
$ulsTrigger.languagesettings( languageSettingsOptions ).click();
} );
@@ -363,22 +380,39 @@
}
} );
} else if ( anonMode ) {
- $ulsTrigger.on( 'click', function ( e ) {
+ $ulsTrigger.on( 'click', function ( e,
eventParams ) {
var languagesettings =
$ulsTrigger.data( 'languagesettings' );
- if ( !languagesettings ) {
+ if ( languagesettings ) {
+ if ( !languagesettings.shown ) {
+ mw.uls.logEvent( {
+ action:
'settings-open',
+ context:
eventParams && eventParams.source || 'personal'
+ } );
+ }
+ } else {
mw.loader.using(
mw.uls.languageSettingsModules, function () {
-
$ulsTrigger.languagesettings().click();
+
$ulsTrigger.languagesettings();
+
+ $ulsTrigger.trigger(
'click', eventParams );
} );
+
e.stopPropagation();
}
} );
} else {
- $ulsTrigger.on( 'click', function ( e ) {
+ $ulsTrigger.on( 'click', function ( e,
eventParams ) {
var uls = $ulsTrigger.data( 'uls' ),
ulsOptions;
- if ( !uls ) {
+ if ( uls ) {
+ if ( !uls.shown ) {
+ mw.uls.logEvent( {
+ action:
'settings-open',
+ context:
eventParams && eventParams.source || 'personal'
+ } );
+ }
+ } else {
// ULS options that are common
to all modes of showing
ulsOptions = {
onReady: function () {
@@ -392,7 +426,9 @@
mw.uls.changeLanguage( language );
}
};
- $ulsTrigger.uls( ulsOptions
).click();
+
+ $ulsTrigger.uls( ulsOptions
).trigger( 'click', eventParams );
+
e.stopPropagation();
}
} );
@@ -405,11 +441,9 @@
$( '#uls-preferences-link' )
.text( $.i18n(
'ext-uls-language-settings-preferences-link' ) )
.click( function () {
- if ( $ulsTrigger.length ) {
- $ulsTrigger.click();
- } else {
- $( '.uls-settings-trigger'
).click();
- }
+ $ulsTrigger.trigger( 'click', {
+ source: 'preferences'
+ } );
return false;
} );
--
To view, visit https://gerrit.wikimedia.org/r/73949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I55fb9e4b8b6b210003f6bbad07486e1c2a8cba4f
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Santhosh <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
