imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #393 from matrix-org/dbkr/enable_labs

Browse source 
Add config to hide the labs section
This commit is contained in:
David Baker 2016-08-05 17:25:25 +01:00 • committed by GitHub
commit 4b8ad3c102
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/structures/MatrixChat.js
View file

@ -1062,7 +1062,12 @@ module.exports = React.createClass({
right_panel = <RightPanel roomId={this.state.currentRoomId} collapsed={this.state.collapse_rhs} opacity={this.state.sideOpacity} />
break;
case this.PageTypes.UserSettings:
page_element = <UserSettings onClose={this.onUserSettingsClose} version={this.state.version} brand={this.props.config.brand} />
page_element = <UserSettings
onClose={this.onUserSettingsClose}
version={this.state.version}
brand={this.props.config.brand}
enableLabs={this.props.config.enableLabs}
/>
right_panel = <RightPanel collapsed={this.state.collapse_rhs} opacity={this.state.sideOpacity}/>
break;
case this.PageTypes.CreateRoom:

9
src/components/structures/UserSettings.js
View file

@ -54,11 +54,15 @@ module.exports = React.createClass({
onClose: React.PropTypes.func,
// The brand string given when creating email pushers
brand: React.PropTypes.string,
// True to show the 'labs' section of experimental features
enableLabs: React.PropTypes.bool,
},
getDefaultProps: function() {
return {
onClose: function() {}
onClose: function() {},
enableLabs: true,
};
},
@ -363,6 +367,9 @@ module.exports = React.createClass({
},
_renderLabs: function () {
// default to enabled if undefined
if (this.props.enableLabs === false) return null;
let features = LABS_FEATURES.map(feature => (
<div key={feature.id} className="mx_UserSettings_toggle">
<input