Merge remote-tracking branch 'origin/develop' into release-v0.10.7

This commit is contained in:
David Baker 2017-10-13 16:29:36 +01:00
commit ae2908ed65

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];
} }