kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #623 in FS/freeswitch from ~JAONZE/freeswitch:bugfix/FS-8603-mic-box-in-setting-modal-having-an to master 

* commit '22f766c28f12f1a003a5cd5167e8f072c279aa49':
  FS-8603 [verto_communicator] - Added Device validation
This commit is contained in:
Anthony Minessale II 2015-12-10 11:53:03 -06:00
parent 85f8bca628 22f766c28f
commit 48f0cd65d5
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
html5/verto/verto_communicator/src/vertoService/services/vertoService.js
View File

@ -294,6 +294,28 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
}
console.debug('Devices were refreshed, checking that we have cameras.');
// Verify if selected devices are valid
var videoFlag = data.videoDevices.some(function(device) {
return device.id == storage.data.selectedVideo;
});
var shareFlag = data.shareDevices.some(function(device) {
return device.id == storage.data.selectedShare;
});
var audioFlag = data.audioDevices.some(function(device) {
return device.id == storage.data.selectedAudio;
});
var speakerFlag = data.speakerDevices.some(function(device) {
return device.id == storage.data.selectedSpeaker;
});
if (!videoFlag) storage.data.selectedVideo = data.videoDevices[0].id;
if (!shareFlag) storage.data.selectedShare = data.shareDevices[0].id;
if (!audioFlag) storage.data.selectedAudio = data.audioDevices[0].id;
if (!speakerFlag) storage.data.selectedSpeaker = data.speakerDevices[0].id;
// This means that we cannot use video!
if (data.videoDevices.length === 0) {
console.log('No camera, disabling video.');