diff --git a/JitsiConference.js b/JitsiConference.js index 0e77a18b8..47cb8c164 100644 --- a/JitsiConference.js +++ b/JitsiConference.js @@ -5,6 +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 EventEmitter = require("events"); var JitsiConferenceEvents = require("./JitsiConferenceEvents"); var JitsiConferenceErrors = require("./JitsiConferenceErrors"); @@ -867,6 +868,10 @@ function setupListeners(conference) { conference.eventEmitter.emit(JitsiConferenceEvents.MESSAGE_RECEIVED, id, txt, ts); }); + 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; diff --git a/JitsiConferenceEvents.js b/JitsiConferenceEvents.js index b80d3f0dd..15d58986e 100644 --- a/JitsiConferenceEvents.js +++ b/JitsiConferenceEvents.js @@ -103,7 +103,12 @@ var JitsiConferenceEvents = { /** * Indicates that phone number changed. */ - PHONE_NUMBER_CHANGED: "conference.phoneNumberChanged" + PHONE_NUMBER_CHANGED: "conference.phoneNumberChanged", + /** + * Indicates that to proceed with screen sharing + * browser extension must be installed first. + */ + FIREFOX_EXTENSION_NEEDED: "conference.firefoxExtensionRequired" }; module.exports = JitsiConferenceEvents; diff --git a/doc/API.md b/doc/API.md index a22ff89f5..5cce6c031 100644 --- a/doc/API.md +++ b/doc/API.md @@ -92,6 +92,7 @@ JitsiMeetJS.setLogLevel(JitsiMeetJS.logLevels.ERROR); - 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)) 2. connection - CONNECTION_FAILED - indicates that the server connection failed. diff --git a/modules/RTC/RTC.js b/modules/RTC/RTC.js index c158fa3b0..9b91c5b6d 100644 --- a/modules/RTC/RTC.js +++ b/modules/RTC/RTC.js @@ -6,8 +6,6 @@ var JitsiTrack = require("./JitsiTrack"); var JitsiLocalTrack = require("./JitsiLocalTrack.js"); var DataChannels = require("./DataChannels"); var JitsiRemoteTrack = require("./JitsiRemoteTrack.js"); -var DesktopSharingEventTypes - = require("../../service/desktopsharing/DesktopSharingEventTypes"); var MediaStreamType = require("../../service/RTC/MediaStreamTypes"); var RTCEvents = require("../../service/RTC/RTCEvents.js");