diff options
| author | enahum <nahumhbl@gmail.com> | 2017-01-03 19:10:09 -0300 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-01-03 17:10:09 -0500 |
| commit | 3ae8e9789e8c4408f1ec8fef195210e339ea17a4 (patch) | |
| tree | 24c4c5ef787aef78e75acb9bda3bfe8411f8c5d9 | |
| parent | 55c8283b855193c4b2be119aa9175cf39055ef5d (diff) | |
| download | chat-3ae8e9789e8c4408f1ec8fef195210e339ea17a4.tar.gz chat-3ae8e9789e8c4408f1ec8fef195210e339ea17a4.tar.bz2 chat-3ae8e9789e8c4408f1ec8fef195210e339ea17a4.zip | |
PLT-4788 Fixed video on remote toggle (#4949)
| -rw-r--r-- | webapp/components/webrtc/webrtc_controller.jsx | 7 | ||||
| -rw-r--r-- | webapp/non_npm_dependencies/janus/index.js | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/webapp/components/webrtc/webrtc_controller.jsx b/webapp/components/webrtc/webrtc_controller.jsx index 36278b3f4..6e63ca91d 100644 --- a/webapp/components/webrtc/webrtc_controller.jsx +++ b/webapp/components/webrtc/webrtc_controller.jsx @@ -1080,9 +1080,8 @@ export default class WebrtcController extends React.Component { const currentId = UserStore.getCurrentId(); const remoteImage = (<img src={this.state.remoteUserImage}/>); let localImage; - let localVideoHidden; + let localVideoHidden = ''; let remoteVideoHidden = 'hidden'; - let remoteVideoHiddenLocal = 'full'; let error; let remoteMute; let videoClass = ''; @@ -1173,11 +1172,9 @@ export default class WebrtcController extends React.Component { if (this.state.isRemotePaused) { remoteVideoHidden = 'hidden'; - remoteVideoHiddenLocal = 'full'; remoteImageHidden = 'webrtc__remote-image'; } else { remoteVideoHidden = ''; - remoteVideoHiddenLocal = ''; remoteImageHidden = 'webrtc__remote-image hidden'; } } else { @@ -1211,7 +1208,7 @@ export default class WebrtcController extends React.Component { </div> <div id='local-video' - className={localVideoHidden + ' ' + remoteVideoHiddenLocal} + className={localVideoHidden} > <video ref='local-video' diff --git a/webapp/non_npm_dependencies/janus/index.js b/webapp/non_npm_dependencies/janus/index.js index 2dc38ff9b..688cfc202 100644 --- a/webapp/non_npm_dependencies/janus/index.js +++ b/webapp/non_npm_dependencies/janus/index.js @@ -343,9 +343,10 @@ function Janus(gatewayCallbacks) { } } var iceServers = gatewayCallbacks.iceServers; - if(iceServers === undefined || iceServers === null || iceServers.length === 0) + if(iceServers === undefined || iceServers === null || iceServers.length === 0) { iceServers = [{urls: "stun:stun.l.google.com:19302"}]; - console.log('using ice', iceServers); + Janus.log('using ice', iceServers); + } var iceTransportPolicy = gatewayCallbacks.iceTransportPolicy; // Whether IPv6 candidates should be gathered var ipv6Support = gatewayCallbacks.ipv6; @@ -2020,7 +2021,7 @@ function Janus(gatewayCallbacks) { Janus.warn("No video track"); return false; } - config.myStream.getVideoTracks()[0].enabled = mute ? false : true; + config.myStream.getVideoTracks()[0].enabled = mute; return true; } else { // Mute/unmute audio track @@ -2030,7 +2031,7 @@ function Janus(gatewayCallbacks) { Janus.warn("No audio track"); return false; } - config.myStream.getAudioTracks()[0].enabled = mute ? false : true; + config.myStream.getAudioTracks()[0].enabled = mute; return true; } } |