From 2d7d350db67382c036695c909c28834ca62c88fa Mon Sep 17 00:00:00 2001 From: isymchych Date: Wed, 13 Jan 2016 17:11:28 +0200 Subject: [PATCH] handle FOCUS_DISCONNECTED error --- JitsiConference.js | 5 ++++- JitsiConferenceErrors.js | 6 +++++- doc/API.md | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/JitsiConference.js b/JitsiConference.js index 47cb8c164..531aa070e 100644 --- a/JitsiConference.js +++ b/JitsiConference.js @@ -5,7 +5,7 @@ var RTC = require("./modules/RTC/RTC"); var XMPPEvents = require("./service/xmpp/XMPPEvents"); var AuthenticationEvents = require("./service/authentication/AuthenticationEvents"); var RTCEvents = require("./service/RTC/RTCEvents"); -var DSEvents = require("../../service/desktopsharing/DesktopSharingEventTypes"); +var DSEvents = require("./service/desktopsharing/DesktopSharingEventTypes"); var EventEmitter = require("events"); var JitsiConferenceEvents = require("./JitsiConferenceEvents"); var JitsiConferenceErrors = require("./JitsiConferenceErrors"); @@ -817,6 +817,9 @@ function setupListeners(conference) { conference.room.addListener(XMPPEvents.CHAT_ERROR_RECEIVED, function (err, msg) { conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_FAILED, JitsiConferenceErrors.CHAT_ERROR, err, msg); }); + conference.room.addListener(XMPPEvents.FOCUS_DISCONNECTED, function (focus, retrySec) { + conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_FAILED, JitsiConferenceErrors.FOCUS_DISCONNECTED, focus, retrySec); + }); // FIXME // conference.room.addListener(XMPPEvents.MUC_JOINED, function () { // conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_LEFT); diff --git a/JitsiConferenceErrors.js b/JitsiConferenceErrors.js index c13e62f1d..3407f04f8 100644 --- a/JitsiConferenceErrors.js +++ b/JitsiConferenceErrors.js @@ -47,7 +47,11 @@ var JitsiConferenceErrors = { /** * Indicates that chat error occured. */ - CHAT_ERROR: "conference.chatError" + CHAT_ERROR: "conference.chatError", + /** + * Indicates that focus error happened. + */ + FOCUS_DISCONNECTED: "conference.focusDisconnected" /** * Many more errors TBD here. */ diff --git a/doc/API.md b/doc/API.md index 5cce6c031..3d26a95ee 100644 --- a/doc/API.md +++ b/doc/API.md @@ -116,6 +116,7 @@ JitsiMeetJS.setLogLevel(JitsiMeetJS.logLevels.ERROR); - JINGLE_FATAL_ERROR - error in jingle - CONFERENCE_DESTROYED - conference has been destroyed - CHAT_ERROR - chat error happened + - FOCUS_DISCONNECTED - focus error happened 2. connection - PASSWORD_REQUIRED - passed when the connection to the server failed. You should try to authenticate with password. - CONNECTION_ERROR - indicates connection failures.