moved to explicit assignment of properties from jitsiRegionInfo

removed no longer needed jshint ignore statement
This commit is contained in:
Aaron van Meerten 2017-05-23 09:26:49 -05:00
parent 3cc4d44376
commit 4ffe668dd2
2 changed files with 7 additions and 2 deletions

View File

@ -16,7 +16,6 @@ react/
# The following are checked by ESLint with the minimum configuration which does
# not supersede JSHint but take advantage of advanced language features such as
# Facebook Flow which are not supported by JSHint.
modules/analytics/analytics.js
modules/translation/translation.js
analytics.js

View File

@ -112,7 +112,6 @@ class Analytics {
const permanentProperties = {
roomName: APP.conference.roomName,
userAgent: navigator.userAgent,
...window.jitsiRegionInfo
};
const { group, server } = APP.store.getState()['features/jwt'];
@ -124,6 +123,13 @@ class Analytics {
permanentProperties.group = group;
}
if (window.jitsiRegionInfo) {
permanentProperties.ProxyRegion;
permanentProperties.Region;
permanentProperties.Shard;
permanentProperties.CrossRegion;
}
analytics.addPermanentProperties(permanentProperties);
analytics.setAnalyticsHandlers(handlers);
},