matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-25 17:02:04 +03:00
Code Activity

Merge pull request #1474 from matrix-org/dbkr/fix_enablelabs_again

Browse Source 
Fix the enableLabs flag, again
This commit is contained in:
Luke Barnard
2017-10-13 17:14:40 +02:00
committed by GitHub
parent 5214a867db d0759a537b
commit d7c3fc9adb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/UserSettingsStore.js
View File

@ -202,7 +202,10 @@ export default {
isFeatureEnabled: function(featureId: string): boolean { isFeatureEnabled: function(featureId: string): boolean {
const featuresConfig = SdkConfig.get()['features']; const featuresConfig = SdkConfig.get()['features'];
let sdkConfigValue = 'disable'; // The old flag: honourned for backwards compat
const enableLabs = SdkConfig.get()['enableLabs'];
let sdkConfigValue = enableLabs ? 'labs' : 'disable';
if (featuresConfig && featuresConfig[featureId] !== undefined) { if (featuresConfig && featuresConfig[featureId] !== undefined) {
sdkConfigValue = featuresConfig[featureId]; sdkConfigValue = featuresConfig[featureId];
} }