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

Merge 25b3545c14 into 64475143cf

This commit is contained in:
Kostiantyn Tsaregradskyi 2016-07-04 04:14:59 +00:00 committed by GitHub
parent 64475143cf 25b3545c14
commit 0403e2c557
2 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
conference.js
View File

@ -21,7 +21,8 @@ const ConferenceEvents = JitsiMeetJS.events.conference;
const ConferenceErrors = JitsiMeetJS.errors.conference;
const TrackEvents = JitsiMeetJS.events.track;
const TrackErrors = JitsiMeetJS.errors.track;
const MediaDevicesErrors = JitsiMeetJS.errors.mediaDevices;
let room, connection, localAudio, localVideo, roomLocker;
@ -886,13 +887,14 @@ export default {
this.videoSwitchInProgress = false;
this.toggleScreenSharing(false);
if (err.name === TrackErrors.CHROME_EXTENSION_USER_CANCELED) {
if (err.name ===
MediaDevicesErrors.CHROME_EXTENSION_USER_CANCELED) {
return;
}
console.error('failed to share local desktop', err);
if (err.name === TrackErrors.FIREFOX_EXTENSION_NEEDED) {
if (err.name === MediaDevicesErrors.FIREFOX_EXTENSION_NEEDED) {
APP.UI.showExtensionRequiredDialog(
config.desktopSharingFirefoxExtensionURL
);
@ -900,14 +902,14 @@ export default {
}
// Handling:
// TrackErrors.PERMISSION_DENIED
// TrackErrors.CHROME_EXTENSION_INSTALLATION_ERROR
// TrackErrors.GENERAL
// MediaDevicesErrors.PERMISSION_DENIED
// MediaDevicesErrors.CHROME_EXTENSION_INSTALLATION_ERROR
// MediaDevicesErrors.GENERAL
// and any other
let dialogTxt;
let dialogTitle;
if (err.name === TrackErrors.PERMISSION_DENIED) {
if (err.name === MediaDevicesErrors.PERMISSION_DENIED) {
dialogTxt = APP.translation.generateTranslationHTML(
"dialog.screenSharingPermissionDeniedError");
dialogTitle = APP.translation.generateTranslationHTML(

75
modules/UI/UI.js
View File

@ -42,30 +42,30 @@ let followMeHandler;
let deviceErrorDialog;
const TrackErrors = JitsiMeetJS.errors.track;
const JitsiMediaDevicesErrors = JitsiMeetJS.errors.mediaDevices;
const JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP = {
const JITSI_MEDIA_DEVICES_ERROR_TO_MESSAGE_KEY_MAP = {
microphone: {},
camera: {}
};
JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.camera[TrackErrors.UNSUPPORTED_RESOLUTION]
JITSI_MEDIA_DEVICES_ERROR_TO_MESSAGE_KEY_MAP.camera[JitsiMediaDevicesErrors.UNSUPPORTED_RESOLUTION]
= "dialog.cameraUnsupportedResolutionError";
JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.camera[TrackErrors.GENERAL]
JITSI_MEDIA_DEVICES_ERROR_TO_MESSAGE_KEY_MAP.camera[JitsiMediaDevicesErrors.GENERAL]
= "dialog.cameraUnknownError";
JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.camera[TrackErrors.PERMISSION_DENIED]
JITSI_MEDIA_DEVICES_ERROR_TO_MESSAGE_KEY_MAP.camera[JitsiMediaDevicesErrors.PERMISSION_DENIED]
= "dialog.cameraPermissionDeniedError";
JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.camera[TrackErrors.NOT_FOUND]
JITSI_MEDIA_DEVICES_ERROR_TO_MESSAGE_KEY_MAP.camera[JitsiMediaDevicesErrors.NOT_FOUND]
= "dialog.cameraNotFoundError";
JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.camera[TrackErrors.CONSTRAINT_FAILED]
JITSI_MEDIA_DEVICES_ERROR_TO_MESSAGE_KEY_MAP.camera[JitsiMediaDevicesErrors.CONSTRAINT_FAILED]
= "dialog.cameraConstraintFailedError";
JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.microphone[TrackErrors.GENERAL]
JITSI_MEDIA_DEVICES_ERROR_TO_MESSAGE_KEY_MAP.microphone[JitsiMediaDevicesErrors.GENERAL]
= "dialog.micUnknownError";
JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.microphone[TrackErrors.PERMISSION_DENIED]
JITSI_MEDIA_DEVICES_ERROR_TO_MESSAGE_KEY_MAP.microphone[JitsiMediaDevicesErrors.PERMISSION_DENIED]
= "dialog.micPermissionDeniedError";
JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.microphone[TrackErrors.NOT_FOUND]
JITSI_MEDIA_DEVICES_ERROR_TO_MESSAGE_KEY_MAP.microphone[JitsiMediaDevicesErrors.NOT_FOUND]
= "dialog.micNotFoundError";
JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.microphone[TrackErrors.CONSTRAINT_FAILED]
JITSI_MEDIA_DEVICES_ERROR_TO_MESSAGE_KEY_MAP.microphone[JitsiMediaDevicesErrors.CONSTRAINT_FAILED]
= "dialog.micConstraintFailedError";
/**
@ -1204,23 +1204,26 @@ UI.showExtensionRequiredDialog = function (url) {
/**
* Shows dialog with combined information about camera and microphone errors.
* @param {JitsiTrackError} micError
* @param {JitsiTrackError} cameraError
* @param {JitsiMediaDevicesError} micError
* @param {JitsiMediaDevicesError} cameraError
*/
UI.showDeviceErrorDialog = function (micError, cameraError) {
let localStoragePropName = "doNotShowErrorAgain";
let isMicJitsiTrackErrorAndHasName = micError && micError.name &&
micError instanceof JitsiMeetJS.JitsiTrackError;
let isCameraJitsiTrackErrorAndHasName = cameraError && cameraError.name &&
cameraError instanceof JitsiMeetJS.JitsiTrackError;
let isMicJitsiMediaDevicesErrorAndHasName = micError && micError.name &&
micError instanceof JitsiMeetJS.errorTypes.JitsiMediaDevicesError;
let isCameraJitsiMediaDevicesErrorAndHasName = cameraError &&
cameraError.name &&
cameraError instanceof JitsiMeetJS.errorTypes.JitsiMediaDevicesError;
let showDoNotShowWarning = false;
if (micError && cameraError && isMicJitsiTrackErrorAndHasName &&
isCameraJitsiTrackErrorAndHasName) {
if (micError && cameraError && isMicJitsiMediaDevicesErrorAndHasName &&
isCameraJitsiMediaDevicesErrorAndHasName) {
showDoNotShowWarning = true;
} else if (micError && isMicJitsiTrackErrorAndHasName && !cameraError) {
} else if (micError && isMicJitsiMediaDevicesErrorAndHasName &&
!cameraError) {
showDoNotShowWarning = true;
} else if (cameraError && isCameraJitsiTrackErrorAndHasName && !micError) {
} else if (cameraError && isCameraJitsiMediaDevicesErrorAndHasName &&
!micError) {
showDoNotShowWarning = true;
}
@ -1240,25 +1243,27 @@ UI.showDeviceErrorDialog = function (micError, cameraError) {
let title = getTitleKey();
let titleMsg = `<span data-i18n="${title}"></span>`;
let cameraJitsiTrackErrorMsg = cameraError
? JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.camera[cameraError.name]
let cameraJitsiMediaDevicesErrorMsg = cameraError
? JITSI_MEDIA_DEVICES_ERROR_TO_MESSAGE_KEY_MAP.camera[cameraError.name]
: undefined;
let micJitsiTrackErrorMsg = micError
? JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.microphone[micError.name]
let micJitsiMediaDevicesErrorMsg = micError
? JITSI_MEDIA_DEVICES_ERROR_TO_MESSAGE_KEY_MAP.microphone[micError.name]
: undefined;
let cameraErrorMsg = cameraError
? cameraJitsiTrackErrorMsg ||
JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.camera[TrackErrors.GENERAL]
? cameraJitsiMediaDevicesErrorMsg ||
JITSI_MEDIA_DEVICES_ERROR_TO_MESSAGE_KEY_MAP.
camera[JitsiMediaDevicesErrors.GENERAL]
: "";
let micErrorMsg = micError
? micJitsiTrackErrorMsg ||
JITSI_TRACK_ERROR_TO_MESSAGE_KEY_MAP.microphone[TrackErrors.GENERAL]
? micJitsiMediaDevicesErrorMsg ||
JITSI_MEDIA_DEVICES_ERROR_TO_MESSAGE_KEY_MAP.microphone[
JitsiMediaDevicesErrors.GENERAL]
: "";
let additionalCameraErrorMsg = !cameraJitsiTrackErrorMsg && cameraError &&
cameraError.message
let additionalCameraErrorMsg = !cameraJitsiMediaDevicesErrorMsg &&
cameraError && cameraError.message
? `<div>${cameraError.message}</div>`
: ``;
let additionalMicErrorMsg = !micJitsiTrackErrorMsg && micError &&
let additionalMicErrorMsg = !micJitsiMediaDevicesErrorMsg && micError &&
micError.message
? `<div>${micError.message}</div>`
: ``;
@ -1322,14 +1327,14 @@ UI.showDeviceErrorDialog = function (micError, cameraError) {
function getTitleKey() {
let title = "dialog.error";
if (micError && micError.name === TrackErrors.PERMISSION_DENIED) {
if (cameraError && cameraError.name === TrackErrors.PERMISSION_DENIED) {
if (micError && micError.name === JitsiMediaDevicesErrors.PERMISSION_DENIED) {
if (cameraError && cameraError.name === JitsiMediaDevicesErrors.PERMISSION_DENIED) {
title = "dialog.permissionDenied";
} else if (!cameraError) {
title = "dialog.permissionDenied";
}
} else if (cameraError &&
cameraError.name === TrackErrors.PERMISSION_DENIED) {
cameraError.name === JitsiMediaDevicesErrors.PERMISSION_DENIED) {
title = "dialog.permissionDenied";
}