Fixes errors after review

JitsiConferenceErrors.js

@@ -57,7 +57,7 @@ var JitsiConferenceErrors = {
      */
     FOCUS_LEFT: "conference.focusLeft",
     /**
-     * Indicates that max users limit have been reached.
+     * Indicates that max users limit has been reached.
      */
     CONFERENCE_MAX_USERS: "conference.max_users"
     /**

doc/API.md

@@ -129,7 +129,7 @@ JitsiMeetJS.setLogLevel(JitsiMeetJS.logLevels.ERROR);
         - CHAT_ERROR - chat error happened
         - FOCUS_DISCONNECTED - focus error happened
         - FOCUS_DISCONNECTED - focus left the conference
-        - CONFERENCE_MAX_USERS - The maximum users limit is already reached
+        - CONFERENCE_MAX_USERS - The maximum users limit has been reached
     2. connection
         - PASSWORD_REQUIRED - passed when the connection to the server failed. You should try to authenticate with password.
         - CONNECTION_ERROR - indicates connection failures.

modules/xmpp/ChatRoom.js

@@ -482,7 +482,7 @@ ChatRoom.prototype.onPresenceError = function (pres, from) {
             this.eventEmitter.emit(XMPPEvents.ROOM_CONNECT_ERROR, pres);
         }
     } else if($(pres).find('>error>service-unavailable').length) {
-        logger.warn('Maximum users limit for the room is already reached',
+        logger.warn('Maximum users limit for the room has been reached',
             pres);
         this.eventEmitter.emit(XMPPEvents.ROOM_MAX_USERS_ERROR, pres);
     } else {

service/xmpp/XMPPEvents.js

@@ -1,4 +1,18 @@
 var XMPPEvents = {
+    /**
+     * Indicates error while adding ice candidate.
+     */
+    ADD_ICE_CANDIDATE_FAILED: "xmpp.add_ice_candidate_failed",
+    // Designates an event indicating that the focus has asked us to mute our
+    // audio.
+    AUDIO_MUTED_BY_FOCUS: "xmpp.audio_muted_by_focus",
+    AUTHENTICATION_REQUIRED: "xmpp.authentication_required",
+    BRIDGE_DOWN: "xmpp.bridge_down",
+    // Designates an event indicating that an offer (e.g. Jingle
+    // session-initiate) was received.
+    CALL_INCOMING: "xmpp.callincoming.jingle",
+    CHAT_ERROR_RECEIVED: "xmpp.chat_error_received",
+    CONFERENCE_SETUP_FAILED: "xmpp.conference_setup_failed",
     // Designates an event indicating that the connection to the XMPP server
     // failed.
     CONNECTION_FAILED: "xmpp.connection.failed",
@@ -8,11 +22,34 @@ var XMPPEvents = {
     // Designates an event indicating that the media (ICE) connection was
     // restored. This should go to the RTC module.
     CONNECTION_RESTORED: "xmpp.connection.restored",
-    // Designates an event indicating that an offer (e.g. Jingle
-    // session-initiate) was received.
-    CALL_INCOMING: "xmpp.callincoming.jingle",
+    // TODO: only used in a hack, should probably be removed.
+    CREATE_ANSWER_ERROR: 'xmpp.create_answer_error',
+    /**
+     * Indicates error while create answer call.
+     */
+    CREATE_ANSWER_FAILED: "xmpp.create_answer_failed",
+    /**
+     * Indicates error while create offer call.
+     */
+    CREATE_OFFER_FAILED: "xmpp.create_offer_failed",
+    // Designates an event indicating that the display name of a participant
+    // has changed.
+    DISPLAY_NAME_CHANGED: "xmpp.display_name_changed",
+    DISPOSE_CONFERENCE: "xmpp.dispose_conference",
+    ETHERPAD: "xmpp.etherpad",
+    FOCUS_DISCONNECTED: 'xmpp.focus_disconnected',
+    FOCUS_LEFT: "xmpp.focus_left",
+    GRACEFUL_SHUTDOWN: "xmpp.graceful_shutdown",
+    JINGLE_FATAL_ERROR: 'xmpp.jingle_fatal_error',
     // Designates an event indicating that we were kicked from the XMPP MUC.
     KICKED: "xmpp.kicked",
+    // Designates an event indicating that our role in the XMPP MUC has changed.
+    LOCAL_ROLE_CHANGED: "xmpp.localrole_changed",
+    // Designates an event indicating that an XMPP message in the MUC was
+    // received.
+    MESSAGE_RECEIVED: "xmpp.message_received",
+    // Designates an event indicating that the XMPP MUC was destroyed.
+    MUC_DESTROYED: "xmpp.muc_destroyed",
     // Designates an event indicating that we have joined the XMPP MUC.
     MUC_JOINED: "xmpp.muc_joined",
     // Designates an event indicating that a participant joined the XMPP MUC.
@@ -22,108 +59,70 @@ var XMPPEvents = {
     // Designates an event indicating that the MUC role of a participant has
     // changed.
     MUC_ROLE_CHANGED: "xmpp.muc_role_changed",
-    // Designates an event indicating that the XMPP MUC was destroyed.
-    MUC_DESTROYED: "xmpp.muc_destroyed",
-    // Designates an event indicating that the display name of a participant
-    // has changed.
-    DISPLAY_NAME_CHANGED: "xmpp.display_name_changed",
-    // Designates an event indicating that we received statistics from a
-    // participant in the MUC.
-    REMOTE_STATS: "xmpp.remote_stats",
-    // Designates an event indicating that our role in the XMPP MUC has changed.
-    LOCAL_ROLE_CHANGED: "xmpp.localrole_changed",
-    // Designates an event indicating that the subject of the XMPP MUC has
-    // changed.
-    SUBJECT_CHANGED: "xmpp.subject_changed",
-    // Designates an event indicating that an XMPP message in the MUC was
-    // received.
-    MESSAGE_RECEIVED: "xmpp.message_received",
-    // Designates an event indicating that we sent an XMPP message to the MUC.
-    SENDING_CHAT_MESSAGE: "xmpp.sending_chat_message",
-    // Designates an event indicating that the video type (e.g. 'camera' or
-    // 'screen') for a participant has changed.
-    // Note: currently this event fires every time we receive presence from
-    // someone (regardless of whether or not the "video type" changed).
-    PARTICIPANT_VIDEO_TYPE_CHANGED: "xmpp.video_type",
     // Designates an event indicating that a participant in the XMPP MUC has
     // advertised that they have audio muted (or unmuted).
     PARTICIPANT_AUDIO_MUTED: "xmpp.audio_muted",
     // Designates an event indicating that a participant in the XMPP MUC has
     // advertised that they have video muted (or unmuted).
     PARTICIPANT_VIDEO_MUTED: "xmpp.video_muted",
-    // Designates an event indicating that the focus has asked us to mute our
-    // audio.
-    AUDIO_MUTED_BY_FOCUS: "xmpp.audio_muted_by_focus",
-    // Designates an event indicating that we should join the conference with
-    // audio and/or video muted.
-    START_MUTED_FROM_FOCUS: "xmpp.start_muted_from_focus",
-
-
-    PEERCONNECTION_READY: "xmpp.peerconnection_ready",
-    CONFERENCE_SETUP_FAILED: "xmpp.conference_setup_failed",
+    // Designates an event indicating that the video type (e.g. 'camera' or
+    // 'screen') for a participant has changed.
+    // Note: currently this event fires every time we receive presence from
+    // someone (regardless of whether or not the "video type" changed).
+    PARTICIPANT_VIDEO_TYPE_CHANGED: "xmpp.video_type",
     PASSWORD_REQUIRED: "xmpp.password_required",
-    AUTHENTICATION_REQUIRED: "xmpp.authentication_required",
-    CHAT_ERROR_RECEIVED: "xmpp.chat_error_received",
-    ETHERPAD: "xmpp.etherpad",
-    BRIDGE_DOWN: "xmpp.bridge_down",
+    PEERCONNECTION_READY: "xmpp.peerconnection_ready",
+    /**
+     * Indicates that phone number changed.
+     */
+    PHONE_NUMBER_CHANGED: "conference.phoneNumberChanged",
     PRESENCE_STATUS: "xmpp.presence_status",
-    RESERVATION_ERROR: "xmpp.room_reservation_error",
-    DISPOSE_CONFERENCE: "xmpp.dispose_conference",
-    GRACEFUL_SHUTDOWN: "xmpp.graceful_shutdown",
-    // TODO: only used in a hack, should probably be removed.
-    SET_LOCAL_DESCRIPTION_ERROR: 'xmpp.set_local_description_error',
-    // TODO: only used in a hack, should probably be removed.
-    SET_REMOTE_DESCRIPTION_ERROR: 'xmpp.set_remote_description_error',
-    // TODO: only used in a hack, should probably be removed.
-    CREATE_ANSWER_ERROR: 'xmpp.create_answer_error',
-    JINGLE_FATAL_ERROR: 'xmpp.jingle_fatal_error',
     PROMPT_FOR_LOGIN: 'xmpp.prompt_for_login',
-    FOCUS_DISCONNECTED: 'xmpp.focus_disconnected',
-    ROOM_JOIN_ERROR: 'xmpp.room_join_error',
-    ROOM_CONNECT_ERROR: 'xmpp.room_connect_error',
     // xmpp is connected and obtained user media
     READY_TO_JOIN: 'xmpp.ready_to_join',
-    FOCUS_LEFT: "xmpp.focus_left",
-    REMOTE_STREAM_RECEIVED: "xmpp.remote_stream_received",
-    /**
-     * Indicates that remote stream has been removed from the conference.
-     */
-    REMOTE_STREAM_REMOVED: "xmpp.remote_stream_removed",
     /**
      * Indicates that recording state changed.
      */
     RECORDING_STATE_CHANGED: "xmpp.recordingStateChanged",
+    // Designates an event indicating that we received statistics from a
+    // participant in the MUC.
+    REMOTE_STATS: "xmpp.remote_stats",
+    REMOTE_STREAM_RECEIVED: "xmpp.remote_stream_received",
     /**
-     * Indicates that phone number changed.
+     * Indicates that remote stream has been removed from the conference.
      */
-    PHONE_NUMBER_CHANGED: "conference.phoneNumberChanged",
+    REMOTE_STREAM_REMOVED: "xmpp.remote_stream_removed",
+    RESERVATION_ERROR: "xmpp.room_reservation_error",
+    ROOM_CONNECT_ERROR: 'xmpp.room_connect_error',
+    ROOM_JOIN_ERROR: 'xmpp.room_join_error',
     /**
-     * Indicates error while create offer call.
+     * Indicates that max users limit has been reached.
      */
-    CREATE_OFFER_FAILED: "xmpp.create_offer_failed",
+    ROOM_MAX_USERS_ERROR: "xmpp.room_max_users_error",
+    // Designates an event indicating that we sent an XMPP message to the MUC.
+    SENDING_CHAT_MESSAGE: "xmpp.sending_chat_message",
     /**
-     * Indicates error while create answer call.
+     * Indicates that the local sendrecv streams in local SDP are changed.
      */
-    CREATE_ANSWER_FAILED: "xmpp.create_answer_failed",
+    SENDRECV_STREAMS_CHANGED: "xmpp.sendrecv_streams_changed",
+    // TODO: only used in a hack, should probably be removed.
+    SET_LOCAL_DESCRIPTION_ERROR: 'xmpp.set_local_description_error',
+
     /**
      * Indicates error while set local description.
      */
     SET_LOCAL_DESCRIPTION_FAILED: "xmpp.set_local_description_failed",
+    // TODO: only used in a hack, should probably be removed.
+    SET_REMOTE_DESCRIPTION_ERROR: 'xmpp.set_remote_description_error',
     /**
      * Indicates error while set remote description.
      */
     SET_REMOTE_DESCRIPTION_FAILED: "xmpp.set_remote_description_failed",
-    /**
-     * Indicates error while adding ice candidate.
-     */
-    ADD_ICE_CANDIDATE_FAILED: "xmpp.add_ice_candidate_failed",
-    /**
-     * Indicates that the local sendrecv streams in local SDP are changed.
-     */
-    SENDRECV_STREAMS_CHANGED: "xmpp.sendrecv_streams_changed",
-    /**
-     * Indicates that max users limit have been reached.
-     */
-    ROOM_MAX_USERS_ERROR: "xmpp.room_max_users_error"
+    // Designates an event indicating that we should join the conference with
+    // audio and/or video muted.
+    START_MUTED_FROM_FOCUS: "xmpp.start_muted_from_focus",
+    // Designates an event indicating that the subject of the XMPP MUC has
+    // changed.
+    SUBJECT_CHANGED: "xmpp.subject_changed"
 };
 module.exports = XMPPEvents;