diff options
author | enahum <nahumhbl@gmail.com> | 2016-09-28 09:48:19 -0300 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-09-28 08:48:19 -0400 |
commit | 45ca052482d42a535f399b149c7e26e99663ac15 (patch) | |
tree | d7ec1b4f5dbc2a1cc7150143d5032551c30ec480 /webapp/components | |
parent | 5288255ca3b86e71a5c1bc4a3e88adb2ebbadee0 (diff) | |
download | chat-45ca052482d42a535f399b149c7e26e99663ac15.tar.gz chat-45ca052482d42a535f399b149c7e26e99663ac15.tar.bz2 chat-45ca052482d42a535f399b149c7e26e99663ac15.zip |
PLT-4298 Remove "Return to ongoing call" (#4101)
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/admin_console/rate_settings.jsx | 2 | ||||
-rw-r--r-- | webapp/components/webrtc/webrtc_controller.jsx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/webapp/components/admin_console/rate_settings.jsx b/webapp/components/admin_console/rate_settings.jsx index bb4f9d83c..8159f4b0d 100644 --- a/webapp/components/admin_console/rate_settings.jsx +++ b/webapp/components/admin_console/rate_settings.jsx @@ -112,7 +112,7 @@ export default class RateSettings extends AdminSettings { helpText={ <FormattedMessage id='admin.rate.maxBurstDescription' - defaultMessage='Maxumum number of requests allowed beyond the per second query limit.' + defaultMessage='Maximum number of requests allowed beyond the per second query limit.' /> } value={this.state.maxBurst} diff --git a/webapp/components/webrtc/webrtc_controller.jsx b/webapp/components/webrtc/webrtc_controller.jsx index 968f24638..e609e4fdb 100644 --- a/webapp/components/webrtc/webrtc_controller.jsx +++ b/webapp/components/webrtc/webrtc_controller.jsx @@ -734,7 +734,9 @@ export default class WebrtcController extends React.Component { this.onSessionError(); return this.doCleanup(); } + WebrtcStore.setVideoCallWith(null); + WebrtcStore.emitRhsChanged(false); if (manual) { return this.close(); |