haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a crash on IE/Safari when plugin is not installed

This commit is contained in:
paweldomas 2016-08-04 09:25:16 -05:00
parent 71a778b65c
commit 34a24ce290
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
modules/UI/side_pannels/settings/SettingsMenu.js
View File

@ -137,30 +137,37 @@ export default {
// DEVICES LIST // DEVICES LIST
if (JitsiMeetJS.mediaDevices.isDeviceListAvailable() && JitsiMeetJS.mediaDevices.isDeviceListAvailable()
JitsiMeetJS.mediaDevices.isDeviceChangeAvailable()) { .then((isDeviceListAvailable) => {
this.changeDevicesList([]); if (isDeviceListAvailable &&
JitsiMeetJS.mediaDevices.isDeviceChangeAvailable()) {
this._initializeDeviceSelectionSettings(emitter);
}
});
},
$('#selectCamera').change(function () { _initializeDeviceSelectionSettings(emitter) {
let cameraDeviceId = $(this).val(); this.changeDevicesList([]);
if (cameraDeviceId !== Settings.getCameraDeviceId()) {
emitter.emit(UIEvents.VIDEO_DEVICE_CHANGED, cameraDeviceId); $('#selectCamera').change(function () {
} let cameraDeviceId = $(this).val();
}); if (cameraDeviceId !== Settings.getCameraDeviceId()) {
$('#selectMic').change(function () { emitter.emit(UIEvents.VIDEO_DEVICE_CHANGED, cameraDeviceId);
let micDeviceId = $(this).val(); }
if (micDeviceId !== Settings.getMicDeviceId()) { });
emitter.emit(UIEvents.AUDIO_DEVICE_CHANGED, micDeviceId); $('#selectMic').change(function () {
} let micDeviceId = $(this).val();
}); if (micDeviceId !== Settings.getMicDeviceId()) {
$('#selectAudioOutput').change(function () { emitter.emit(UIEvents.AUDIO_DEVICE_CHANGED, micDeviceId);
let audioOutputDeviceId = $(this).val(); }
if (audioOutputDeviceId !== Settings.getAudioOutputDeviceId()) { });
emitter.emit(UIEvents.AUDIO_OUTPUT_DEVICE_CHANGED, $('#selectAudioOutput').change(function () {
audioOutputDeviceId); let audioOutputDeviceId = $(this).val();
} if (audioOutputDeviceId !== Settings.getAudioOutputDeviceId()) {
}); emitter.emit(
} UIEvents.AUDIO_OUTPUT_DEVICE_CHANGED, audioOutputDeviceId);
}
});
}, },
/** /**