瀏覽代碼

Minor formatting fixes, avoid using a global variable.

master
Boris Grozev 10 年之前
父節點
當前提交
fd5a739f3c

+ 23
- 43
external_api.js 查看文件

25
      * @param parent_node the node that will contain the iframe
25
      * @param parent_node the node that will contain the iframe
26
      * @constructor
26
      * @constructor
27
      */
27
      */
28
-    function JitsiMeetExternalAPI(domain, room_name, width, height, parent_node)
29
-    {
28
+    function JitsiMeetExternalAPI(domain, room_name, width, height, parentNode) {
30
         if(!width || width < MIN_WIDTH)
29
         if(!width || width < MIN_WIDTH)
31
             width = MIN_WIDTH;
30
             width = MIN_WIDTH;
32
         if(!height || height < MIN_HEIGHT)
31
         if(!height || height < MIN_HEIGHT)
33
             height = MIN_HEIGHT;
32
             height = MIN_HEIGHT;
34
 
33
 
35
         this.parentNode = null;
34
         this.parentNode = null;
36
-        if(parent_node) {
37
-            this.parentNode = parent_node;
35
+        if (parentNode) {
36
+            this.parentNode = parentNode;
38
         } else {
37
         } else {
39
             var scriptTag = document.scripts[document.scripts.length - 1];
38
             var scriptTag = document.scripts[document.scripts.length - 1];
40
             this.parentNode = scriptTag.parentNode;
39
             this.parentNode = scriptTag.parentNode;
78
      * Sends the passed object to Jitsi Meet
77
      * Sends the passed object to Jitsi Meet
79
      * @param object the object to be sent
78
      * @param object the object to be sent
80
      */
79
      */
81
-    JitsiMeetExternalAPI.prototype.sendMessage = function(object)
82
-    {
83
-        if(this.frameLoaded)
84
-        {
80
+    JitsiMeetExternalAPI.prototype.sendMessage = function(object) {
81
+        if (this.frameLoaded) {
85
             this.frame.contentWindow.postMessage(
82
             this.frame.contentWindow.postMessage(
86
                 JSON.stringify(object), this.frame.src);
83
                 JSON.stringify(object), this.frame.src);
87
         }
84
         }
88
-        else
89
-        {
85
+        else {
90
             this.initialCommands.push(object);
86
             this.initialCommands.push(object);
91
         }
87
         }
92
 
88
 
105
      * @param arguments array of arguments
101
      * @param arguments array of arguments
106
      */
102
      */
107
     JitsiMeetExternalAPI.prototype.executeCommand = function(name,
103
     JitsiMeetExternalAPI.prototype.executeCommand = function(name,
108
-                                                             argumentsList)
109
-    {
104
+                                                             argumentsList) {
110
         var argumentsArray = argumentsList;
105
         var argumentsArray = argumentsList;
111
-        if(!argumentsArray)
106
+        if (!argumentsArray)
112
             argumentsArray = [];
107
             argumentsArray = [];
113
         var object = {type: "command", action: "execute"};
108
         var object = {type: "command", action: "execute"};
114
         object[name] = argumentsArray;
109
         object[name] = argumentsArray;
133
     };
128
     };
134
 
129
 
135
     /**
130
     /**
136
-     * Adds event listeners to Meet Jitsi. The object key should be the name of the
137
-     * event and value - the listener.
131
+     * Adds event listeners to Meet Jitsi. The object key should be the name of
132
+     * the event and value - the listener.
138
      * Currently we support the following
133
      * Currently we support the following
139
      * events:
134
      * events:
140
      * incomingMessage - receives event notifications about incoming
135
      * incomingMessage - receives event notifications about incoming
168
      * @param object
163
      * @param object
169
      */
164
      */
170
     JitsiMeetExternalAPI.prototype.addEventListeners
165
     JitsiMeetExternalAPI.prototype.addEventListeners
171
-        = function (object)
172
-    {
166
+        = function (object) {
173
 
167
 
174
         var message = {type: "event", action: "add", events: []};
168
         var message = {type: "event", action: "add", events: []};
175
         for(var i in object)
169
         for(var i in object)
215
      * @param listener the listener
209
      * @param listener the listener
216
      */
210
      */
217
     JitsiMeetExternalAPI.prototype.addEventListener
211
     JitsiMeetExternalAPI.prototype.addEventListener
218
-        = function (event, listener)
219
-    {
212
+        = function (event, listener) {
220
 
213
 
221
         var message = {type: "event", action: "add", events: [event]};
214
         var message = {type: "event", action: "add", events: [event]};
222
         this.eventHandlers[event] = listener;
215
         this.eventHandlers[event] = listener;
228
      * @param event the name of the event.
221
      * @param event the name of the event.
229
      */
222
      */
230
     JitsiMeetExternalAPI.prototype.removeEventListener
223
     JitsiMeetExternalAPI.prototype.removeEventListener
231
-        = function (event)
232
-    {
224
+        = function (event) {
233
         if(!this.eventHandlers[event])
225
         if(!this.eventHandlers[event])
234
         {
226
         {
235
             console.error("The event " + event + " is not registered.");
227
             console.error("The event " + event + " is not registered.");
245
      * @param events array with the names of the events.
237
      * @param events array with the names of the events.
246
      */
238
      */
247
     JitsiMeetExternalAPI.prototype.removeEventListeners
239
     JitsiMeetExternalAPI.prototype.removeEventListeners
248
-        = function (events)
249
-    {
240
+        = function (events) {
250
         var eventsArray = [];
241
         var eventsArray = [];
251
         for(var i = 0; i < events.length; i++)
242
         for(var i = 0; i < events.length; i++)
252
         {
243
         {
272
      * Processes message events sent from Jitsi Meet
263
      * Processes message events sent from Jitsi Meet
273
      * @param event the event
264
      * @param event the event
274
      */
265
      */
275
-    JitsiMeetExternalAPI.prototype.processMessage = function(event)
276
-    {
266
+    JitsiMeetExternalAPI.prototype.processMessage = function(event) {
277
         var message;
267
         var message;
278
         try {
268
         try {
279
             message = JSON.parse(event.data);
269
             message = JSON.parse(event.data);
283
             console.error("Message without type is received.");
273
             console.error("Message without type is received.");
284
             return;
274
             return;
285
         }
275
         }
286
-        switch (message.type)
287
-        {
276
+        switch (message.type) {
288
             case "system":
277
             case "system":
289
-                if(message.loaded)
290
-                {
278
+                if(message.loaded) {
291
                     this.onFrameLoaded();
279
                     this.onFrameLoaded();
292
                 }
280
                 }
293
                 break;
281
                 break;
294
             case "event":
282
             case "event":
295
                 if(message.action != "result" ||
283
                 if(message.action != "result" ||
296
-                    !message.event || !this.eventHandlers[message.event])
297
-                {
284
+                    !message.event || !this.eventHandlers[message.event]) {
298
                     console.warn("The received event cannot be parsed.");
285
                     console.warn("The received event cannot be parsed.");
299
                     return;
286
                     return;
300
                 }
287
                 }
304
                 console.error("Unknown message type.");
291
                 console.error("Unknown message type.");
305
                 return;
292
                 return;
306
         }
293
         }
307
-
308
-
309
     };
294
     };
310
 
295
 
311
     /**
296
     /**
314
      */
299
      */
315
     JitsiMeetExternalAPI.prototype.onFrameLoaded = function () {
300
     JitsiMeetExternalAPI.prototype.onFrameLoaded = function () {
316
         this.frameLoaded = true;
301
         this.frameLoaded = true;
317
-        for (var i = 0; i < this.initialCommands.length; i++)
318
-        {
302
+        for (var i = 0; i < this.initialCommands.length; i++) {
319
             this.sendMessage(this.initialCommands[i]);
303
             this.sendMessage(this.initialCommands[i]);
320
         }
304
         }
321
         this.initialCommands = null;
305
         this.initialCommands = null;
329
         this.eventListener = function (event) {
313
         this.eventListener = function (event) {
330
             self.processMessage(event);
314
             self.processMessage(event);
331
         };
315
         };
332
-        if (window.addEventListener)
333
-        {
316
+        if (window.addEventListener) {
334
             window.addEventListener('message',
317
             window.addEventListener('message',
335
                 this.eventListener, false);
318
                 this.eventListener, false);
336
         }
319
         }
337
-        else
338
-        {
320
+        else {
339
             window.attachEvent('onmessage', this.eventListener);
321
             window.attachEvent('onmessage', this.eventListener);
340
         }
322
         }
341
     };
323
     };
344
      * Removes the listeners and removes the Jitsi Meet frame.
326
      * Removes the listeners and removes the Jitsi Meet frame.
345
      */
327
      */
346
     JitsiMeetExternalAPI.prototype.dispose = function () {
328
     JitsiMeetExternalAPI.prototype.dispose = function () {
347
-        if (window.removeEventListener)
348
-        {
329
+        if (window.removeEventListener) {
349
             window.removeEventListener('message',
330
             window.removeEventListener('message',
350
                 this.eventListener, false);
331
                 this.eventListener, false);
351
         }
332
         }
352
-        else
353
-        {
333
+        else {
354
             window.detachEvent('onmessage',
334
             window.detachEvent('onmessage',
355
                 this.eventListener);
335
                 this.eventListener);
356
         }
336
         }

+ 22
- 39
modules/API/API.js 查看文件

1
+/* global APP */
1
 /**
2
 /**
2
  * Implements API class that communicates with external api class
3
  * Implements API class that communicates with external api class
3
  * and provides interface to access Jitsi Meet features by external
4
  * and provides interface to access Jitsi Meet features by external
12
  *              displayName: inputDisplayNameHandler,
13
  *              displayName: inputDisplayNameHandler,
13
  *              muteAudio: toggleAudio,
14
  *              muteAudio: toggleAudio,
14
  *              muteVideo: toggleVideo,
15
  *              muteVideo: toggleVideo,
15
- *              filmStrip: toggleFilmStrip
16
+ *              toggleFilmStrip: toggleFilmStrip,
17
+ *              toggleChat: toggleChat,
18
+ *              toggleContactList: toggleContactList
16
  *          }}
19
  *          }}
17
  */
20
  */
18
 var commands = {};
21
 var commands = {};
19
 
22
 
20
 function initCommands() {
23
 function initCommands() {
21
-    commands =
22
-    {
24
+    commands = {
23
         displayName: APP.UI.inputDisplayNameHandler,
25
         displayName: APP.UI.inputDisplayNameHandler,
24
         muteAudio: APP.UI.toggleAudio,
26
         muteAudio: APP.UI.toggleAudio,
25
         muteVideo: APP.UI.toggleVideo,
27
         muteVideo: APP.UI.toggleVideo,
41
  *              participantLeft: boolean
43
  *              participantLeft: boolean
42
  *      }}
44
  *      }}
43
  */
45
  */
44
-var events =
45
-{
46
+var events = {
46
     incomingMessage: false,
47
     incomingMessage: false,
47
     outgoingMessage:false,
48
     outgoingMessage:false,
48
     displayNameChange: false,
49
     displayNameChange: false,
53
 var displayName = {};
54
 var displayName = {};
54
 
55
 
55
 /**
56
 /**
56
- * Processes commands from external applicaiton.
57
+ * Processes commands from external application.
57
  * @param message the object with the command
58
  * @param message the object with the command
58
  */
59
  */
59
-function processCommand(message)
60
-{
61
-    if(message.action != "execute")
62
-    {
60
+function processCommand(message) {
61
+    if (message.action != "execute") {
63
         console.error("Unknown action of the message");
62
         console.error("Unknown action of the message");
64
         return;
63
         return;
65
     }
64
     }
66
-    for(var key in message)
67
-    {
65
+    for (var key in message) {
68
         if(commands[key])
66
         if(commands[key])
69
             commands[key].apply(null, message[key]);
67
             commands[key].apply(null, message[key]);
70
     }
68
     }
75
  * @param event the event
73
  * @param event the event
76
  */
74
  */
77
 function processEvent(event) {
75
 function processEvent(event) {
78
-    if(!event.action)
79
-    {
76
+    if (!event.action) {
80
         console.error("Event with no action is received.");
77
         console.error("Event with no action is received.");
81
         return;
78
         return;
82
     }
79
     }
83
 
80
 
84
     var i = 0;
81
     var i = 0;
85
-    switch(event.action)
86
-    {
82
+    switch(event.action) {
87
         case "add":
83
         case "add":
88
-            for(; i < event.events.length; i++)
89
-            {
84
+            for (; i < event.events.length; i++) {
90
                 events[event.events[i]] = true;
85
                 events[event.events[i]] = true;
91
             }
86
             }
92
             break;
87
             break;
93
         case "remove":
88
         case "remove":
94
-            for(; i < event.events.length; i++)
95
-            {
89
+            for (; i < event.events.length; i++) {
96
                 events[event.events[i]] = false;
90
                 events[event.events[i]] = false;
97
             }
91
             }
98
             break;
92
             break;
99
         default:
93
         default:
100
             console.error("Unknown action for event.");
94
             console.error("Unknown action for event.");
101
     }
95
     }
102
-
103
 }
96
 }
104
 
97
 
105
 /**
98
 /**
114
  * Processes a message event from the external application
107
  * Processes a message event from the external application
115
  * @param event the message event
108
  * @param event the message event
116
  */
109
  */
117
-function processMessage(event)
118
-{
110
+function processMessage(event) {
119
     var message;
111
     var message;
120
     try {
112
     try {
121
         message = JSON.parse(event.data);
113
         message = JSON.parse(event.data);
123
 
115
 
124
     if(!message.type)
116
     if(!message.type)
125
         return;
117
         return;
126
-    switch (message.type)
127
-    {
118
+    switch (message.type) {
128
         case "command":
119
         case "command":
129
             processCommand(message);
120
             processCommand(message);
130
             break;
121
             break;
135
             console.error("Unknown type of the message");
126
             console.error("Unknown type of the message");
136
             return;
127
             return;
137
     }
128
     }
138
-
139
 }
129
 }
140
 
130
 
141
 function setupListeners() {
131
 function setupListeners() {
151
         API.triggerEvent("participantLeft", {jid: jid});
141
         API.triggerEvent("participantLeft", {jid: jid});
152
     });
142
     });
153
     APP.xmpp.addListener(XMPPEvents.DISPLAY_NAME_CHANGED, function (jid, newDisplayName) {
143
     APP.xmpp.addListener(XMPPEvents.DISPLAY_NAME_CHANGED, function (jid, newDisplayName) {
154
-        name = displayName[jid];
144
+        var name = displayName[jid];
155
         if(!name || name != newDisplayName) {
145
         if(!name || name != newDisplayName) {
156
             API.triggerEvent("displayNameChange", {jid: jid, displayname: newDisplayName});
146
             API.triggerEvent("displayNameChange", {jid: jid, displayname: newDisplayName});
157
             displayName[jid] = newDisplayName;
147
             displayName[jid] = newDisplayName;
169
      */
159
      */
170
     isEnabled: function () {
160
     isEnabled: function () {
171
         var hash = location.hash;
161
         var hash = location.hash;
172
-        if(hash && hash.indexOf("external") > -1 && window.postMessage)
162
+        if (hash && hash.indexOf("external") > -1 && window.postMessage)
173
             return true;
163
             return true;
174
         return false;
164
         return false;
175
     },
165
     },
181
      */
171
      */
182
     init: function () {
172
     init: function () {
183
         initCommands();
173
         initCommands();
184
-        if (window.addEventListener)
185
-        {
174
+        if (window.addEventListener) {
186
             window.addEventListener('message',
175
             window.addEventListener('message',
187
                 processMessage, false);
176
                 processMessage, false);
188
         }
177
         }
189
-        else
190
-        {
178
+        else {
191
             window.attachEvent('onmessage', processMessage);
179
             window.attachEvent('onmessage', processMessage);
192
         }
180
         }
193
         sendMessage({type: "system", loaded: true});
181
         sendMessage({type: "system", loaded: true});
218
      * Removes the listeners.
206
      * Removes the listeners.
219
      */
207
      */
220
     dispose: function () {
208
     dispose: function () {
221
-        if(window.removeEventListener)
222
-        {
209
+        if(window.removeEventListener) {
223
             window.removeEventListener("message",
210
             window.removeEventListener("message",
224
                 processMessage, false);
211
                 processMessage, false);
225
         }
212
         }
226
-        else
227
-        {
213
+        else {
228
             window.detachEvent('onmessage', processMessage);
214
             window.detachEvent('onmessage', processMessage);
229
         }
215
         }
230
-
231
     }
216
     }
232
-
233
-
234
 };
217
 };
235
 
218
 
236
 module.exports = API;
219
 module.exports = API;

+ 7
- 4
modules/UI/UI.js 查看文件

786
 };
786
 };
787
 
787
 
788
 UI.setInitialMuteFromFocus = function (muteAudio, muteVideo) {
788
 UI.setInitialMuteFromFocus = function (muteAudio, muteVideo) {
789
-    if(muteAudio || muteVideo) notifyForInitialMute();
790
-    if(muteAudio) UI.setAudioMuted(true);
791
-    if(muteVideo) UI.setVideoMute(true);
792
-}
789
+    if (muteAudio || muteVideo)
790
+        notifyForInitialMute();
791
+    if (muteAudio)
792
+        UI.setAudioMuted(true);
793
+    if (muteVideo)
794
+        UI.setVideoMute(true);
795
+};
793
 
796
 
794
 /**
797
 /**
795
  * Mutes/unmutes the local video.
798
  * Mutes/unmutes the local video.

+ 2
- 2
modules/connectionquality/connectionquality.js 查看文件

1
+/* global APP, require */
1
 var EventEmitter = require("events");
2
 var EventEmitter = require("events");
2
 var eventEmitter = new EventEmitter();
3
 var eventEmitter = new EventEmitter();
3
 var CQEvents = require("../../service/connectionquality/CQEvents");
4
 var CQEvents = require("../../service/connectionquality/CQEvents");
53
 }
54
 }
54
 
55
 
55
 /**
56
 /**
56
- * Converts statitistics to format used by VideoLayout
57
+ * Converts statistics to format used by VideoLayout
57
  * @param stats
58
  * @param stats
58
  * @returns {{bitrate: {download: *, upload: *}, packetLoss: {total: *, download: *, upload: *}}}
59
  * @returns {{bitrate: {download: *, upload: *}, packetLoss: {total: *, download: *, upload: *}}}
59
  */
60
  */
71
     };
72
     };
72
 }
73
 }
73
 
74
 
74
-
75
 var ConnectionQuality = {
75
 var ConnectionQuality = {
76
     init: function () {
76
     init: function () {
77
         APP.xmpp.addListener(XMPPEvents.REMOTE_STATS, this.updateRemoteStats);
77
         APP.xmpp.addListener(XMPPEvents.REMOTE_STATS, this.updateRemoteStats);

+ 1
- 0
modules/keyboardshortcut/keyboardshortcut.js 查看文件

1
+/* global APP, $ */
1
 //maps keycode to character, id of popover for given function and function
2
 //maps keycode to character, id of popover for given function and function
2
 var shortcuts = {};
3
 var shortcuts = {};
3
 function initShortcutHandlers() {
4
 function initShortcutHandlers() {

+ 4
- 5
modules/members/MemberList.js 查看文件

1
-/* global APP */
1
+/* global APP, require, $ */
2
 
2
 
3
 /**
3
 /**
4
  * This module is meant to (eventually) contain and manage all information
4
  * This module is meant to (eventually) contain and manage all information
87
  * Checks each member's 'supportsDtmf' field and updates
87
  * Checks each member's 'supportsDtmf' field and updates
88
  * 'atLastOneSupportsDtmf'.
88
  * 'atLastOneSupportsDtmf'.
89
  */
89
  */
90
-function updateAtLeastOneDtmf(){
90
+function updateAtLeastOneDtmf() {
91
     var newAtLeastOneDtmf = false;
91
     var newAtLeastOneDtmf = false;
92
     for (var key in members) {
92
     for (var key in members) {
93
         if (typeof members[key].supportsDtmf !== 'undefined'
93
         if (typeof members[key].supportsDtmf !== 'undefined'
108
  * Exported interface.
108
  * Exported interface.
109
  */
109
  */
110
 var Members = {
110
 var Members = {
111
-    start: function(){
111
+    start: function() {
112
         registerListeners();
112
         registerListeners();
113
     },
113
     },
114
-    addListener: function(type, listener)
115
-    {
114
+    addListener: function(type, listener) {
116
         eventEmitter.on(type, listener);
115
         eventEmitter.on(type, listener);
117
     },
116
     },
118
     removeListener: function (type, listener) {
117
     removeListener: function (type, listener) {

+ 2
- 4
modules/settings/Settings.js 查看文件

35
     userId = generateUniqueId();
35
     userId = generateUniqueId();
36
 }
36
 }
37
 
37
 
38
-var Settings =
39
-{
38
+var Settings = {
40
     setDisplayName: function (newDisplayName) {
39
     setDisplayName: function (newDisplayName) {
41
         displayName = newDisplayName;
40
         displayName = newDisplayName;
42
         window.localStorage.displayname = displayName;
41
         window.localStorage.displayname = displayName;
43
         return displayName;
42
         return displayName;
44
     },
43
     },
45
-    setEmail: function (newEmail)
46
-    {
44
+    setEmail: function (newEmail) {
47
         email = newEmail;
45
         email = newEmail;
48
         window.localStorage.email = newEmail;
46
         window.localStorage.email = newEmail;
49
         return email;
47
         return email;

+ 9
- 8
modules/statistics/CallStats.js 查看文件

1
+/* global config, $, APP, Strophe, callstats */
1
 var callStats = null;
2
 var callStats = null;
2
 
3
 
3
 function initCallback (err, msg) {
4
 function initCallback (err, msg) {
38
             this.pcCallback.bind(this));
39
             this.pcCallback.bind(this));
39
     },
40
     },
40
     pcCallback: function (err, msg) {
41
     pcCallback: function (err, msg) {
41
-        if(!callStats)
42
+        if (!callStats)
42
             return;
43
             return;
43
         console.log("Monitoring status: "+ err + " msg: " + msg);
44
         console.log("Monitoring status: "+ err + " msg: " + msg);
44
         callStats.sendFabricEvent(this.peerconnection,
45
         callStats.sendFabricEvent(this.peerconnection,
45
             callStats.fabricEvent.fabricSetup, this.confID);
46
             callStats.fabricEvent.fabricSetup, this.confID);
46
     },
47
     },
47
     sendMuteEvent: function (mute, type) {
48
     sendMuteEvent: function (mute, type) {
48
-        if(!callStats)
49
+        if (!callStats)
49
             return;
50
             return;
50
         var event = null;
51
         var event = null;
51
-        if(type === "video")
52
-        {
52
+        if (type === "video") {
53
             event = (mute? callStats.fabricEvent.videoPause :
53
             event = (mute? callStats.fabricEvent.videoPause :
54
                 callStats.fabricEvent.videoResume);
54
                 callStats.fabricEvent.videoResume);
55
         }
55
         }
56
-        else
57
-        {
56
+        else {
58
             event = (mute? callStats.fabricEvent.audioMute :
57
             event = (mute? callStats.fabricEvent.audioMute :
59
                 callStats.fabricEvent.audioUnmute);
58
                 callStats.fabricEvent.audioUnmute);
60
         }
59
         }
61
         callStats.sendFabricEvent(this.peerconnection, event, this.confID);
60
         callStats.sendFabricEvent(this.peerconnection, event, this.confID);
62
     },
61
     },
63
     sendTerminateEvent: function () {
62
     sendTerminateEvent: function () {
64
-        if(!callStats)
63
+        if(!callStats) {
65
             return;
64
             return;
65
+        }
66
         callStats.sendFabricEvent(this.peerconnection,
66
         callStats.sendFabricEvent(this.peerconnection,
67
             callStats.fabricEvent.fabricTerminated, this.confID);
67
             callStats.fabricEvent.fabricTerminated, this.confID);
68
     },
68
     },
69
     sendSetupFailedEvent: function () {
69
     sendSetupFailedEvent: function () {
70
-        if(!callStats)
70
+        if(!callStats) {
71
             return;
71
             return;
72
+        }
72
         callStats.sendFabricEvent(this.peerconnection,
73
         callStats.sendFabricEvent(this.peerconnection,
73
             callStats.fabricEvent.fabricSetupFailed, this.confID);
74
             callStats.fabricEvent.fabricSetupFailed, this.confID);
74
     }
75
     }

Loading…
取消
儲存