Browse Source

propagate FIREFOX_EXTENSION_NEEDED event

dev1
isymchych 9 years ago
parent
commit
ff3e05f5ea
4 changed files with 12 additions and 3 deletions
  1. 5
    0
      JitsiConference.js
  2. 6
    1
      JitsiConferenceEvents.js
  3. 1
    0
      doc/API.md
  4. 0
    2
      modules/RTC/RTC.js

+ 5
- 0
JitsiConference.js View File

5
 var XMPPEvents = require("./service/xmpp/XMPPEvents");
5
 var XMPPEvents = require("./service/xmpp/XMPPEvents");
6
 var AuthenticationEvents = require("./service/authentication/AuthenticationEvents");
6
 var AuthenticationEvents = require("./service/authentication/AuthenticationEvents");
7
 var RTCEvents = require("./service/RTC/RTCEvents");
7
 var RTCEvents = require("./service/RTC/RTCEvents");
8
+var DSEvents = require("../../service/desktopsharing/DesktopSharingEventTypes");
8
 var EventEmitter = require("events");
9
 var EventEmitter = require("events");
9
 var JitsiConferenceEvents = require("./JitsiConferenceEvents");
10
 var JitsiConferenceEvents = require("./JitsiConferenceEvents");
10
 var JitsiConferenceErrors = require("./JitsiConferenceErrors");
11
 var JitsiConferenceErrors = require("./JitsiConferenceErrors");
867
         conference.eventEmitter.emit(JitsiConferenceEvents.MESSAGE_RECEIVED, id, txt, ts);
868
         conference.eventEmitter.emit(JitsiConferenceEvents.MESSAGE_RECEIVED, id, txt, ts);
868
     });
869
     });
869
 
870
 
871
+    conference.rtc.addListener(DSEvents.FIREFOX_EXTENSION_NEEDED, function (url) {
872
+        conference.eventEmitter.emit(JitsiConferenceEvents.FIREFOX_EXTENSION_NEEDED, url);
873
+    });
874
+
870
     conference.rtc.addListener(RTCEvents.DOMINANTSPEAKER_CHANGED, function (id) {
875
     conference.rtc.addListener(RTCEvents.DOMINANTSPEAKER_CHANGED, function (id) {
871
         if(conference.lastDominantSpeaker !== id && conference.room) {
876
         if(conference.lastDominantSpeaker !== id && conference.room) {
872
             conference.lastDominantSpeaker = id;
877
             conference.lastDominantSpeaker = id;

+ 6
- 1
JitsiConferenceEvents.js View File

103
     /**
103
     /**
104
      * Indicates that phone number changed.
104
      * Indicates that phone number changed.
105
      */
105
      */
106
-    PHONE_NUMBER_CHANGED: "conference.phoneNumberChanged"
106
+    PHONE_NUMBER_CHANGED: "conference.phoneNumberChanged",
107
+    /**
108
+     * Indicates that to proceed with screen sharing
109
+     * browser extension must be installed first.
110
+     */
111
+    FIREFOX_EXTENSION_NEEDED: "conference.firefoxExtensionRequired"
107
 };
112
 };
108
 
113
 
109
 module.exports = JitsiConferenceEvents;
114
 module.exports = JitsiConferenceEvents;

+ 1
- 0
doc/API.md View File

93
         - KICKED - notifies that user has been kicked from the conference.
93
         - KICKED - notifies that user has been kicked from the conference.
94
         - 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))
94
         - 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))
95
         - STARTED_MUTED - notifies that the local user has started muted
95
         - STARTED_MUTED - notifies that the local user has started muted
96
+        - FIREFOX_EXTENSION_NEEDED - notifies that browser extension must be installed to proceed with screen sharing (parameters - extension url(string))
96
 
97
 
97
     2. connection
98
     2. connection
98
         - CONNECTION_FAILED - indicates that the server connection failed.
99
         - CONNECTION_FAILED - indicates that the server connection failed.

+ 0
- 2
modules/RTC/RTC.js View File

6
 var JitsiLocalTrack = require("./JitsiLocalTrack.js");
6
 var JitsiLocalTrack = require("./JitsiLocalTrack.js");
7
 var DataChannels = require("./DataChannels");
7
 var DataChannels = require("./DataChannels");
8
 var JitsiRemoteTrack = require("./JitsiRemoteTrack.js");
8
 var JitsiRemoteTrack = require("./JitsiRemoteTrack.js");
9
-var DesktopSharingEventTypes
10
-    = require("../../service/desktopsharing/DesktopSharingEventTypes");
11
 var MediaStreamType = require("../../service/RTC/MediaStreamTypes");
9
 var MediaStreamType = require("../../service/RTC/MediaStreamTypes");
12
 var RTCEvents = require("../../service/RTC/RTCEvents.js");
10
 var RTCEvents = require("../../service/RTC/RTCEvents.js");
13
 
11
 

Loading…
Cancel
Save