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

pr feedback

Browse source
This commit is contained in:
David Baker 2016-08-05 16:36:35 +01:00
parent e8ee5c2f96
commit f8d02c1551
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -139,10 +139,6 @@ module.exports = React.createClass({
return this.props.config.default_is_url || "https://vector.im"; return this.props.config.default_is_url || "https://vector.im";
}, },
getEnableLabs() {
return this.props.config.enableLabs === undefined ? true : this.props.config.enableLabs;
},
componentWillMount: function() { componentWillMount: function() {
this.favicon = new Favico({animation: 'none'}); this.favicon = new Favico({animation: 'none'});
@ -1068,7 +1064,7 @@ module.exports = React.createClass({
onClose={this.onUserSettingsClose} onClose={this.onUserSettingsClose}
version={this.state.version} version={this.state.version}
brand={this.props.config.brand} brand={this.props.config.brand}
enableLabs={this.getEnableLabs()} enableLabs={this.props.config.enableLabs}
/> />
right_panel = <RightPanel collapsed={this.state.collapse_rhs} opacity={this.state.sideOpacity}/> right_panel = <RightPanel collapsed={this.state.collapse_rhs} opacity={this.state.sideOpacity}/>
break; break;

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

@ -52,7 +52,7 @@ module.exports = React.createClass({
brand: React.PropTypes.string, brand: React.PropTypes.string,
// True to show the 'labs' section of experimental features // True to show the 'labs' section of experimental features
enableLabs: React.PropTypes.boolean, enableLabs: React.PropTypes.bool,
}, },
getDefaultProps: function() { getDefaultProps: function() {
@ -363,7 +363,7 @@ module.exports = React.createClass({
}, },
_renderLabs: function () { _renderLabs: function () {
if (!this.props.enableLabs) return false; if (this.props.enableLabs === false) return null;
let features = LABS_FEATURES.map(feature => ( let features = LABS_FEATURES.map(feature => (
<div key={feature.id} className="mx_UserSettings_toggle"> <div key={feature.id} className="mx_UserSettings_toggle">