summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-11-21 12:15:49 -0300
committerCorey Hulen <corey@hulen.com>2016-11-21 07:15:49 -0800
commitf6f0b89a851fcbe1dcf8d5de77c880f333ab2c74 (patch)
tree7c6f94da7ce86af59af1876ceb3c7fdbdf46dcc5 /webapp
parent20e931c047c7c7d1bfeb89892bdafef14c57eb73 (diff)
downloadchat-f6f0b89a851fcbe1dcf8d5de77c880f333ab2c74.tar.gz
chat-f6f0b89a851fcbe1dcf8d5de77c880f333ab2c74.tar.bz2
chat-f6f0b89a851fcbe1dcf8d5de77c880f333ab2c74.zip
Remove terms and privacy from WebRTC (#4606)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/admin_console/webrtc_settings.jsx36
1 files changed, 1 insertions, 35 deletions
diff --git a/webapp/components/admin_console/webrtc_settings.jsx b/webapp/components/admin_console/webrtc_settings.jsx
index cea8e2226..995a02a0c 100644
--- a/webapp/components/admin_console/webrtc_settings.jsx
+++ b/webapp/components/admin_console/webrtc_settings.jsx
@@ -15,23 +15,10 @@ export default class WebrtcSettings extends AdminSettings {
constructor(props) {
super(props);
- this.canSave = this.canSave.bind(this);
- this.handleAgreeChange = this.handleAgreeChange.bind(this);
-
this.getConfigFromState = this.getConfigFromState.bind(this);
this.renderSettings = this.renderSettings.bind(this);
}
- canSave() {
- return !this.state.enableWebrtc || this.state.agree;
- }
-
- handleAgreeChange(e) {
- this.setState({
- agree: e.target.checked
- });
- }
-
getConfigFromState(config) {
config.WebrtcSettings.Enable = this.state.enableWebrtc;
config.WebrtcSettings.GatewayWebsocketUrl = this.state.gatewayWebsocketUrl;
@@ -57,8 +44,7 @@ export default class WebrtcSettings extends AdminSettings {
stunURI: settings.StunURI,
turnURI: settings.TurnURI,
turnUsername: settings.TurnUsername,
- turnSharedKey: settings.TurnSharedKey,
- agree: settings.Enable
+ turnSharedKey: settings.TurnSharedKey
};
}
@@ -74,25 +60,6 @@ export default class WebrtcSettings extends AdminSettings {
}
renderSettings() {
- const tosCheckbox = (
- <div className='form-group'>
- <div className='col-sm-4'/>
- <div className='col-sm-8'>
- <input
- type='checkbox'
- ref='agree'
- checked={this.state.agree}
- onChange={this.handleAgreeChange}
- disabled={!this.state.enableWebrtc}
- />
- <FormattedHTMLMessage
- id='admin.webrtc.agree'
- defaultMessage=' I understand and accept the Mattermost Hosted WebRTC Service <a href="https://about.mattermost.com/webrtc-terms/" target="_blank">Terms of Service</a> and <a href="https://about.mattermost.com/webrtc-privacy/" target="_blank">Privacy Policy</a>.'
- />
- </div>
- </div>
- );
-
return (
<SettingsGroup>
<BooleanSetting
@@ -112,7 +79,6 @@ export default class WebrtcSettings extends AdminSettings {
value={this.state.enableWebrtc}
onChange={this.handleChange}
/>
- {tosCheckbox}
<TextSetting
id='gatewayWebsocketUrl'
label={