Ver código fonte

Minor formatting fixes, avoid using a global variable.

master
Boris Grozev 10 anos atrás
pai
commit
fd5a739f3c

+ 23
- 43
external_api.js Ver arquivo

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

+ 22
- 39
modules/API/API.js Ver arquivo

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

+ 7
- 4
modules/UI/UI.js Ver arquivo

@@ -786,10 +786,13 @@ UI.getRoomName = function () {
786 786
 };
787 787
 
788 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 798
  * Mutes/unmutes the local video.

+ 2
- 2
modules/connectionquality/connectionquality.js Ver arquivo

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

+ 1
- 0
modules/keyboardshortcut/keyboardshortcut.js Ver arquivo

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

+ 4
- 5
modules/members/MemberList.js Ver arquivo

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

+ 2
- 4
modules/settings/Settings.js Ver arquivo

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

+ 9
- 8
modules/statistics/CallStats.js Ver arquivo

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

Carregando…
Cancelar
Salvar