IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-4788 Fixed video on remote toggle (#4949)

Browse Source
This commit is contained in:
enahum
2017-01-03 19:10:09 -03:00
committed by Harrison Healey
parent 55c8283b85
commit 3ae8e9789e
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webapp/components/webrtc/webrtc_controller.jsx
View File

@@ -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'

9
webapp/non_npm_dependencies/janus/index.js
View File

@@ -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;
}
}