matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/Analytics.js
This commit is contained in:
Michael Telatynski
2017-08-10 13:54:55 +01:00
parent 67f9c3774d 60c1ba4f4d
commit b19c1010aa
25 changed files with 694 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Analytics.js
View File

@@ -30,8 +30,9 @@ const customVariables = {
'User Type': 3,
'Chosen Language': 4,
'Instance': 5,
'Homeserver URL': 6,
'Identity Server URL': 7,
'RTE: Uses Richtext Mode': 6,
'Homeserver URL': 7,
'Identity Server URL': 8,
};
function whitelistRedact(whitelist, str) {
@@ -148,6 +149,11 @@ class Analytics {
this._setVisitVariable('Homeserver URL', whitelistRedact(whitelistedHSUrls, homeserverUrl));
this._setVisitVariable('Identity Server URL', whitelistRedact(whitelistedISUrls, identityServerUrl));
}
setRichtextMode(state) {
if (this.disabled) return;
this._setVisitVariable('RTE: Uses Richtext Mode', state ? 'on' : 'off');
}
}
if (!global.mxAnalytics) {