Fixes issues related to PR #451
This commit is contained in:
hristoterezov
parent
68459ce3a1
commit
a06fcec188
|
|
@ -5,7 +5,6 @@ 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 EventEmitter = require("events");
|
||||
var JitsiConferenceEvents = require("./JitsiConferenceEvents");
|
||||
var JitsiConferenceErrors = require("./JitsiConferenceErrors");
|
||||
|
|
@ -819,7 +818,7 @@ function setupListeners(conference) {
|
|||
conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_FAILED, JitsiConferenceErrors.CONFERENCE_DESTROYED, reason);
|
||||
});
|
||||
conference.room.addListener(XMPPEvents.CHAT_ERROR_RECEIVED, function (err, msg) {
|
||||
conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_FAILED, JitsiConferenceErrors.CHAT_ERROR, err, msg);
|
||||
conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_ERROR, 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);
|
||||
|
|
@ -885,10 +884,6 @@ function setupListeners(conference) {
|
|||
conference.eventEmitter.emit(JitsiConferenceEvents.USER_STATUS_CHANGED, id, status);
|
||||
});
|
||||
|
||||
conference.rtc.addListener(DSEvents.FIREFOX_EXTENSION_NEEDED, function (url) {
|
||||
conference.eventEmitter.emit(JitsiConferenceEvents.FIREFOX_EXTENSION_NEEDED, url);
|
||||
});
|
||||
|
||||
conference.rtc.addListener(RTCEvents.DOMINANTSPEAKER_CHANGED, function (id) {
|
||||
if(conference.lastDominantSpeaker !== id && conference.room) {
|
||||
conference.lastDominantSpeaker = id;
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ var JitsiConferenceErrors = {
|
|||
*/
|
||||
CONFERENCE_DESTROYED: "conference.destroyed",
|
||||
/**
|
||||
* Indicates that chat error occured.
|
||||
* Indicates that chat error occurred.
|
||||
*/
|
||||
CHAT_ERROR: "conference.chatError",
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -76,6 +76,10 @@ var JitsiConferenceEvents = {
|
|||
* Indicates that conference failed.
|
||||
*/
|
||||
CONFERENCE_FAILED: "conference.failed",
|
||||
/**
|
||||
* Indicates that an error occured.
|
||||
*/
|
||||
CONFERENCE_ERROR: "conference.error",
|
||||
/**
|
||||
* Indicates that conference has been joined.
|
||||
*/
|
||||
|
|
@ -108,11 +112,6 @@ var JitsiConferenceEvents = {
|
|||
* Indicates that phone number changed.
|
||||
*/
|
||||
PHONE_NUMBER_CHANGED: "conference.phoneNumberChanged",
|
||||
/**
|
||||
* Indicates that to proceed with screen sharing
|
||||
* browser extension must be installed first.
|
||||
*/
|
||||
FIREFOX_EXTENSION_NEEDED: "conference.firefoxExtensionRequired",
|
||||
/**
|
||||
* Indicates that available devices changed.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -91,10 +91,10 @@ JitsiMeetJS.setLogLevel(JitsiMeetJS.logLevels.ERROR);
|
|||
- USER_ROLE_CHANGED - notifies that role of some user changed. (parameters - id(string), role(string))
|
||||
- USER_STATUS_CHANGED - notifies that status of some user changed. (parameters - id(string), status(string))
|
||||
- CONFERENCE_FAILED - notifies that user failed to join the conference. (parameters - errorCode(JitsiMeetJS.errors.conference))
|
||||
- CONFERENCE_ERROR - notifies that error occurred. (parameters - errorCode(JitsiMeetJS.errors.conference))
|
||||
- KICKED - notifies that user has been kicked from the conference.
|
||||
- START_MUTED_POLICY_CHANGED - notifies that all new participants will join with muted audio/video stream (parameters - JS object with 2 properties - audio(boolean), video(boolean))
|
||||
- STARTED_MUTED - notifies that the local user has started muted
|
||||
- FIREFOX_EXTENSION_NEEDED - notifies that browser extension must be installed to proceed with screen sharing (parameters - extension url(string))
|
||||
- AVAILABLE_DEVICES_CHANGED - notifies that available participant devices changed (camera or microphone was added or removed) (parameters - id(string), devices(JS object with 2 properties - audio(boolean), video(boolean)))
|
||||
|
||||
2. connection
|
||||
|
|
@ -106,7 +106,7 @@ JitsiMeetJS.setLogLevel(JitsiMeetJS.logLevels.ERROR);
|
|||
* ```JitsiMeetJS.errors``` - JS object that contains all errors used by the API. You can use that object to check the reported errors from the API
|
||||
We have two error types - connection and conference. You can access the events with the following code ```JitsiMeetJS.errors.<error_type>.<error_name>```.
|
||||
For example if you want to use the conference event that is fired when somebody leave conference you can use the following code - ```JitsiMeetJS.errors.conference.PASSWORD_REQUIRED```.
|
||||
We support the following events:
|
||||
We support the following errors:
|
||||
1. conference
|
||||
- CONNECTION_ERROR - the connection with the conference is lost.
|
||||
- SETUP_FAILED - conference setup failed
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ 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 EventEmitter = require("events");
|
||||
var JitsiConferenceEvents = require("./JitsiConferenceEvents");
|
||||
var JitsiConferenceErrors = require("./JitsiConferenceErrors");
|
||||
|
|
@ -821,7 +820,7 @@ function setupListeners(conference) {
|
|||
conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_FAILED, JitsiConferenceErrors.CONFERENCE_DESTROYED, reason);
|
||||
});
|
||||
conference.room.addListener(XMPPEvents.CHAT_ERROR_RECEIVED, function (err, msg) {
|
||||
conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_FAILED, JitsiConferenceErrors.CHAT_ERROR, err, msg);
|
||||
conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_ERROR, 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);
|
||||
|
|
@ -887,10 +886,6 @@ function setupListeners(conference) {
|
|||
conference.eventEmitter.emit(JitsiConferenceEvents.USER_STATUS_CHANGED, id, status);
|
||||
});
|
||||
|
||||
conference.rtc.addListener(DSEvents.FIREFOX_EXTENSION_NEEDED, function (url) {
|
||||
conference.eventEmitter.emit(JitsiConferenceEvents.FIREFOX_EXTENSION_NEEDED, url);
|
||||
});
|
||||
|
||||
conference.rtc.addListener(RTCEvents.DOMINANTSPEAKER_CHANGED, function (id) {
|
||||
if(conference.lastDominantSpeaker !== id && conference.room) {
|
||||
conference.lastDominantSpeaker = id;
|
||||
|
|
@ -1078,7 +1073,7 @@ function setupListeners(conference) {
|
|||
module.exports = JitsiConference;
|
||||
|
||||
}).call(this,"/JitsiConference.js")
|
||||
},{"./JitsiConferenceErrors":2,"./JitsiConferenceEvents":3,"./JitsiParticipant":8,"./JitsiTrackEvents":10,"./modules/DTMF/JitsiDTMFManager":11,"./modules/RTC/RTC":16,"./modules/settings/Settings":21,"./modules/statistics/statistics":25,"./service/RTC/RTCEvents":133,"./service/authentication/AuthenticationEvents":135,"./service/desktopsharing/DesktopSharingEventTypes":136,"./service/xmpp/XMPPEvents":139,"events":46,"jitsi-meet-logger":50}],2:[function(require,module,exports){
|
||||
},{"./JitsiConferenceErrors":2,"./JitsiConferenceEvents":3,"./JitsiParticipant":8,"./JitsiTrackEvents":10,"./modules/DTMF/JitsiDTMFManager":11,"./modules/RTC/RTC":16,"./modules/settings/Settings":21,"./modules/statistics/statistics":25,"./service/RTC/RTCEvents":133,"./service/authentication/AuthenticationEvents":135,"./service/xmpp/XMPPEvents":139,"events":46,"jitsi-meet-logger":50}],2:[function(require,module,exports){
|
||||
/**
|
||||
* Enumeration with the errors for the conference.
|
||||
* @type {{string: string}}
|
||||
|
|
@ -1126,7 +1121,7 @@ var JitsiConferenceErrors = {
|
|||
*/
|
||||
CONFERENCE_DESTROYED: "conference.destroyed",
|
||||
/**
|
||||
* Indicates that chat error occured.
|
||||
* Indicates that chat error occurred.
|
||||
*/
|
||||
CHAT_ERROR: "conference.chatError",
|
||||
/**
|
||||
|
|
@ -1219,6 +1214,10 @@ var JitsiConferenceEvents = {
|
|||
* Indicates that conference failed.
|
||||
*/
|
||||
CONFERENCE_FAILED: "conference.failed",
|
||||
/**
|
||||
* Indicates that an error occured.
|
||||
*/
|
||||
CONFERENCE_ERROR: "conference.error",
|
||||
/**
|
||||
* Indicates that conference has been joined.
|
||||
*/
|
||||
|
|
@ -1251,11 +1250,6 @@ var JitsiConferenceEvents = {
|
|||
* Indicates that phone number changed.
|
||||
*/
|
||||
PHONE_NUMBER_CHANGED: "conference.phoneNumberChanged",
|
||||
/**
|
||||
* Indicates that to proceed with screen sharing
|
||||
* browser extension must be installed first.
|
||||
*/
|
||||
FIREFOX_EXTENSION_NEEDED: "conference.firefoxExtensionRequired",
|
||||
/**
|
||||
* Indicates that available devices changed.
|
||||
*/
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue