mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-29 04:48:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2017-10-13 13:22:11 +00:00
commit efc906dd0f
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/UserSettingsStore.js
View file

@ -36,13 +36,21 @@ export default {
getLabsFeatures() {
const featuresConfig = SdkConfig.get()['features'] || {};
return FEATURES.filter((f) => {
const sdkConfigValue = featuresConfig[f.id];
// The old flag: honourned for backwards compat
const enableLabs = SdkConfig.get()['enableLabs'];
if (sdkConfigValue === 'labs') {
return true;
}
}).map((f) => {
let labsFeatures;
if (enableLabs) {
labsFeatures = FEATURES;
} else {
labsFeatures.filter((f) => {
const sdkConfigValue = featuresConfig[f.id];
if (sdkConfigValue === 'labs') {
return true;
}
});
}
return labsFeatures.map((f) => {
return f.id;
});
},