Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-18 06:27:19 +08:00
Code Issues Packages Projects Releases 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() { getLabsFeatures() {
const featuresConfig = SdkConfig.get()['features'] || {}; const featuresConfig = SdkConfig.get()['features'] || {};
return FEATURES.filter((f) => { // The old flag: honourned for backwards compat
const sdkConfigValue = featuresConfig[f.id]; const enableLabs = SdkConfig.get()['enableLabs'];
if (sdkConfigValue === 'labs') { let labsFeatures;
return true; if (enableLabs) {
} labsFeatures = FEATURES;
}).map((f) => { } else {
labsFeatures.filter((f) => {
const sdkConfigValue = featuresConfig[f.id];
if (sdkConfigValue === 'labs') {
return true;
}
});
}
return labsFeatures.map((f) => {
return f.id; return f.id;
}); });
}, },