浏览代码

Minor formatting fixes.

master
Boris Grozev 10 年前
父节点
当前提交
71229bdba9

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

1
+/* global $, $iq, config */
1
 var params = {};
2
 var params = {};
2
 function getConfigParamsFromUrl() {
3
 function getConfigParamsFromUrl() {
3
     if(!location.hash)
4
     if(!location.hash)

+ 8
- 12
modules/statistics/LocalStatsCollector.js 查看文件

1
+/* global config */
1
 /**
2
 /**
2
  * Provides statistics for the local stream.
3
  * Provides statistics for the local stream.
3
  */
4
  */
33
     }
34
     }
34
 
35
 
35
     return parseFloat(((maxVolume - 127) / 128).toFixed(3));
36
     return parseFloat(((maxVolume - 127) / 128).toFixed(3));
36
-};
37
+}
37
 
38
 
38
 /**
39
 /**
39
  * Animates audio level change
40
  * Animates audio level change
41
  * @param lastLevel the last audio level
42
  * @param lastLevel the last audio level
42
  * @returns {Number} the audio level to be set
43
  * @returns {Number} the audio level to be set
43
  */
44
  */
44
-function animateLevel(newLevel, lastLevel)
45
-{
45
+function animateLevel(newLevel, lastLevel) {
46
     var value = 0;
46
     var value = 0;
47
     var diff = lastLevel - newLevel;
47
     var diff = lastLevel - newLevel;
48
-    if(diff > 0.2)
49
-    {
48
+    if(diff > 0.2) {
50
         value = lastLevel - 0.2;
49
         value = lastLevel - 0.2;
51
     }
50
     }
52
-    else if(diff < -0.4)
53
-    {
51
+    else if(diff < -0.4) {
54
         value = lastLevel + 0.4;
52
         value = lastLevel + 0.4;
55
     }
53
     }
56
-    else
57
-    {
54
+    else {
58
         value = newLevel;
55
         value = newLevel;
59
     }
56
     }
60
 
57
 
85
  * Starts the collecting the statistics.
82
  * Starts the collecting the statistics.
86
  */
83
  */
87
 LocalStatsCollector.prototype.start = function () {
84
 LocalStatsCollector.prototype.start = function () {
88
-    if (config.disableAudioLevels || !window.AudioContext
89
-        || RTCBrowserType.isTemasysPluginUsed())
85
+    if (config.disableAudioLevels || !window.AudioContext ||
86
+        RTCBrowserType.isTemasysPluginUsed())
90
         return;
87
         return;
91
 
88
 
92
     var context = new AudioContext();
89
     var context = new AudioContext();
116
         },
113
         },
117
         this.intervalMilis
114
         this.intervalMilis
118
     );
115
     );
119
-
120
 };
116
 };
121
 
117
 
122
 /**
118
 /**

+ 9
- 22
modules/statistics/RTPStatsCollector.js 查看文件

49
  */
49
  */
50
 PeerStats.bitrate = {};
50
 PeerStats.bitrate = {};
51
 
51
 
52
-
53
-
54
 /**
52
 /**
55
  * The packet loss rate
53
  * The packet loss rate
56
  * @type {{}}
54
  * @type {{}}
235
 StatsCollector.prototype.start = function ()
233
 StatsCollector.prototype.start = function ()
236
 {
234
 {
237
     var self = this;
235
     var self = this;
238
-    if(!config.disableAudioLevels) {
236
+    if (!config.disableAudioLevels) {
239
         this.audioLevelsIntervalId = setInterval(
237
         this.audioLevelsIntervalId = setInterval(
240
             function () {
238
             function () {
241
                 // Interval updates
239
                 // Interval updates
675
 /**
673
 /**
676
  * Stats processing logic.
674
  * Stats processing logic.
677
  */
675
  */
678
-StatsCollector.prototype.processAudioLevelReport = function ()
679
-{
680
-    if (!this.baselineAudioLevelsReport)
681
-    {
676
+StatsCollector.prototype.processAudioLevelReport = function () {
677
+    if (!this.baselineAudioLevelsReport) {
682
         return;
678
         return;
683
     }
679
     }
684
 
680
 
685
-    for (var idx in this.currentAudioLevelsReport)
686
-    {
681
+    for (var idx in this.currentAudioLevelsReport) {
687
         var now = this.currentAudioLevelsReport[idx];
682
         var now = this.currentAudioLevelsReport[idx];
688
 
683
 
689
-        if (now.type != 'ssrc')
690
-        {
684
+        if (now.type != 'ssrc') {
691
             continue;
685
             continue;
692
         }
686
         }
693
 
687
 
694
         var before = this.baselineAudioLevelsReport[idx];
688
         var before = this.baselineAudioLevelsReport[idx];
695
-        if (!before)
696
-        {
689
+        if (!before) {
697
             console.warn(getStatValue(now, 'ssrc') + ' not enough data');
690
             console.warn(getStatValue(now, 'ssrc') + ' not enough data');
698
             continue;
691
             continue;
699
         }
692
         }
700
 
693
 
701
         var ssrc = getStatValue(now, 'ssrc');
694
         var ssrc = getStatValue(now, 'ssrc');
702
         var jid = APP.xmpp.getJidFromSSRC(ssrc);
695
         var jid = APP.xmpp.getJidFromSSRC(ssrc);
703
-        if (!jid)
704
-        {
696
+        if (!jid) {
705
             if((Date.now() - now.timestamp) < 3000)
697
             if((Date.now() - now.timestamp) < 3000)
706
                 console.warn("No jid for ssrc: " + ssrc);
698
                 console.warn("No jid for ssrc: " + ssrc);
707
             continue;
699
             continue;
708
         }
700
         }
709
 
701
 
710
         var jidStats = this.jid2stats[jid];
702
         var jidStats = this.jid2stats[jid];
711
-        if (!jidStats)
712
-        {
703
+        if (!jidStats) {
713
             jidStats = new PeerStats();
704
             jidStats = new PeerStats();
714
             this.jid2stats[jid] = jidStats;
705
             this.jid2stats[jid] = jidStats;
715
         }
706
         }
728
             return;
719
             return;
729
         }
720
         }
730
 
721
 
731
-        if (audioLevel)
732
-        {
722
+        if (audioLevel) {
733
             // TODO: can't find specs about what this value really is,
723
             // TODO: can't find specs about what this value really is,
734
             // but it seems to vary between 0 and around 32k.
724
             // but it seems to vary between 0 and around 32k.
735
             audioLevel = audioLevel / 32767;
725
             audioLevel = audioLevel / 32767;
737
             if(jid != APP.xmpp.myJid())
727
             if(jid != APP.xmpp.myJid())
738
                 this.eventEmitter.emit("statistics.audioLevel", jid, audioLevel);
728
                 this.eventEmitter.emit("statistics.audioLevel", jid, audioLevel);
739
         }
729
         }
740
-
741
     }
730
     }
742
-
743
-
744
 };
731
 };

+ 12
- 20
modules/statistics/statistics.js 查看文件

1
+/* global require, APP */
1
 /**
2
 /**
2
  * Created by hristo on 8/4/14.
3
  * Created by hristo on 8/4/14.
3
  */
4
  */
15
 
16
 
16
 var rtpStats = null;
17
 var rtpStats = null;
17
 
18
 
18
-function stopLocal()
19
-{
20
-    if(localStats)
21
-    {
19
+function stopLocal() {
20
+    if (localStats) {
22
         localStats.stop();
21
         localStats.stop();
23
         localStats = null;
22
         localStats = null;
24
     }
23
     }
25
 }
24
 }
26
 
25
 
27
-function stopRemote()
28
-{
29
-    if(rtpStats)
30
-    {
26
+function stopRemote() {
27
+    if (rtpStats) {
31
         rtpStats.stop();
28
         rtpStats.stop();
32
         eventEmitter.emit("statistics.stop");
29
         eventEmitter.emit("statistics.stop");
33
         rtpStats = null;
30
         rtpStats = null;
35
 }
32
 }
36
 
33
 
37
 function startRemoteStats (peerconnection) {
34
 function startRemoteStats (peerconnection) {
38
-    if(rtpStats)
39
-    {
35
+    if (rtpStats) {
40
         rtpStats.stop();
36
         rtpStats.stop();
41
-        rtpStats = null;
42
     }
37
     }
43
 
38
 
44
     rtpStats = new RTPStats(peerconnection, 200, 2000, eventEmitter);
39
     rtpStats = new RTPStats(peerconnection, 200, 2000, eventEmitter);
45
     rtpStats.start();
40
     rtpStats.start();
46
 }
41
 }
47
 
42
 
48
-function onStreamCreated(stream)
49
-{
50
-    if(stream.getOriginalStream().getAudioTracks().length === 0)
43
+function onStreamCreated(stream) {
44
+    if(stream.getOriginalStream().getAudioTracks().length === 0) {
51
         return;
45
         return;
46
+    }
52
 
47
 
53
     localStats = new LocalStats(stream.getOriginalStream(), 200, statistics,
48
     localStats = new LocalStats(stream.getOriginalStream(), 200, statistics,
54
         eventEmitter);
49
         eventEmitter);
64
     }
59
     }
65
 }
60
 }
66
 
61
 
67
-
68
-var statistics =
69
-{
62
+var statistics = {
70
     /**
63
     /**
71
      * Indicates that this audio level is for local jid.
64
      * Indicates that this audio level is for local jid.
72
      * @type {string}
65
      * @type {string}
129
         });
122
         });
130
         APP.xmpp.addListener(XMPPEvents.PEERCONNECTION_READY, function (session) {
123
         APP.xmpp.addListener(XMPPEvents.PEERCONNECTION_READY, function (session) {
131
             CallStats.init(session);
124
             CallStats.init(session);
132
-        })
125
+        });
133
         APP.RTC.addListener(RTCEvents.AUDIO_MUTE, function (mute) {
126
         APP.RTC.addListener(RTCEvents.AUDIO_MUTE, function (mute) {
134
             CallStats.sendMuteEvent(mute, "audio");
127
             CallStats.sendMuteEvent(mute, "audio");
135
         });
128
         });
136
         APP.xmpp.addListener(XMPPEvents.CONFERENCE_SETUP_FAILED, function () {
129
         APP.xmpp.addListener(XMPPEvents.CONFERENCE_SETUP_FAILED, function () {
137
             CallStats.sendSetupFailedEvent();
130
             CallStats.sendSetupFailedEvent();
138
-        })
131
+        });
139
         APP.RTC.addListener(RTCEvents.VIDEO_MUTE, function (mute) {
132
         APP.RTC.addListener(RTCEvents.VIDEO_MUTE, function (mute) {
140
             CallStats.sendMuteEvent(mute, "video");
133
             CallStats.sendMuteEvent(mute, "video");
141
         });
134
         });
142
     }
135
     }
143
-
144
 };
136
 };
145
 
137
 
146
 
138
 

+ 2
- 3
modules/translation/translation.js 查看文件

1
+/* global $, require, config, interfaceConfig */
1
 var i18n = require("i18next-client");
2
 var i18n = require("i18next-client");
2
 var languages = require("../../service/translation/languages");
3
 var languages = require("../../service/translation/languages");
3
 var Settings = require("../settings/Settings");
4
 var Settings = require("../settings/Settings");
23
     fallbackOnNull: true,
24
     fallbackOnNull: true,
24
     fallbackOnEmpty: true,
25
     fallbackOnEmpty: true,
25
     useDataAttrOptions: true,
26
     useDataAttrOptions: true,
26
-    defaultValueFromContent: false,
27
     app: interfaceConfig.APP_NAME,
27
     app: interfaceConfig.APP_NAME,
28
     getAsync: false,
28
     getAsync: false,
29
     defaultValueFromContent: false,
29
     defaultValueFromContent: false,
63
 //                localStorageExpirationTime: 86400000 // in ms, default 1 week
63
 //                localStorageExpirationTime: 86400000 // in ms, default 1 week
64
 };
64
 };
65
 
65
 
66
-function initCompleted(t)
67
-{
66
+function initCompleted(t) {
68
     $("[data-i18n]").i18n();
67
     $("[data-i18n]").i18n();
69
 }
68
 }
70
 
69
 

+ 6
- 6
modules/xmpp/moderator.js 查看文件

1
-/* global $, $iq, APP, config, connection, messageHandler,
1
+/* global $, $iq, APP, config, messageHandler,
2
  roomName, sessionTerminated, Strophe, Util */
2
  roomName, sessionTerminated, Strophe, Util */
3
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
3
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
4
 var Settings = require("../settings/Settings");
4
 var Settings = require("../settings/Settings");
69
         function listener(event) {
69
         function listener(event) {
70
             if (event.data && event.data.sessionId) {
70
             if (event.data && event.data.sessionId) {
71
                 if (event.origin !== window.location.origin) {
71
                 if (event.origin !== window.location.origin) {
72
-                    console.warn(
73
-                        "Ignoring sessionId from different origin: " + event.origin);
72
+                    console.warn("Ignoring sessionId from different origin: " +
73
+                        event.origin);
74
                     return;
74
                     return;
75
                 }
75
                 }
76
                 localStorage.setItem('sessionId', event.data.sessionId);
76
                 localStorage.setItem('sessionId', event.data.sessionId);
219
 
219
 
220
         console.info("Authentication enabled: " + authenticationEnabled);
220
         console.info("Authentication enabled: " + authenticationEnabled);
221
 
221
 
222
-        externalAuthEnabled
223
-            = $(resultIq).find(
222
+        externalAuthEnabled = $(resultIq).find(
224
                 '>conference>property' +
223
                 '>conference>property' +
225
                 '[name=\'externalAuth\'][value=\'true\']').length > 0;
224
                 '[name=\'externalAuth\'][value=\'true\']').length > 0;
226
 
225
 
333
                 // Do not show in case of session invalid
332
                 // Do not show in case of session invalid
334
                 // which means just a retry
333
                 // which means just a retry
335
                 if (!invalidSession) {
334
                 if (!invalidSession) {
336
-                    eventEmitter.emit(XMPPEvents.FOCUS_DISCONNECTED, focusComponent, retrySec);
335
+                    eventEmitter.emit(XMPPEvents.FOCUS_DISCONNECTED,
336
+                        focusComponent, retrySec);
337
                 }
337
                 }
338
                 // Reset response timeout
338
                 // Reset response timeout
339
                 getNextTimeout(true);
339
                 getNextTimeout(true);

+ 10
- 10
modules/xmpp/recording.js 查看文件

1
-/* global $, $iq, config, connection, focusMucJid, messageHandler, Moderator,
1
+/* global $, $iq, config, connection, focusMucJid, messageHandler,
2
    Toolbar, Util */
2
    Toolbar, Util */
3
 var Moderator = require("./moderator");
3
 var Moderator = require("./moderator");
4
 
4
 
23
     recordingToken = token;
23
     recordingToken = token;
24
 }
24
 }
25
 
25
 
26
-function setRecording(state, token, callback, connection) {
27
-    if (useJirecon){
28
-        setRecordingJirecon(state, token, callback, connection);
29
-    } else {
30
-        setRecordingColibri(state, token, callback, connection);
31
-    }
32
-}
33
-
34
 function setRecordingJirecon(state, token, callback, connection) {
26
 function setRecordingJirecon(state, token, callback, connection) {
35
     if (state == recordingEnabled){
27
     if (state == recordingEnabled){
36
         return;
28
         return;
93
     );
85
     );
94
 }
86
 }
95
 
87
 
88
+function setRecording(state, token, callback, connection) {
89
+    if (useJirecon){
90
+        setRecordingJirecon(state, token, callback, connection);
91
+    } else {
92
+        setRecordingColibri(state, token, callback, connection);
93
+    }
94
+}
95
+
96
 var Recording = {
96
 var Recording = {
97
     toggleRecording: function (tokenEmptyCallback,
97
     toggleRecording: function (tokenEmptyCallback,
98
                                startingCallback, startedCallback, connection) {
98
                                startingCallback, startedCallback, connection) {
150
         );
150
         );
151
     }
151
     }
152
 
152
 
153
-}
153
+};
154
 
154
 
155
 module.exports = Recording;
155
 module.exports = Recording;

+ 10
- 15
modules/xmpp/strophe.emuc.js 查看文件

5
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
5
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
6
 var Moderator = require("./moderator");
6
 var Moderator = require("./moderator");
7
 
7
 
8
-var bridgeIsDown = false;
9
-
10
 module.exports = function(XMPP, eventEmitter) {
8
 module.exports = function(XMPP, eventEmitter) {
11
     Strophe.addConnectionPlugin('emuc', {
9
     Strophe.addConnectionPlugin('emuc', {
12
         connection: null,
10
         connection: null,
20
         isOwner: false,
18
         isOwner: false,
21
         role: null,
19
         role: null,
22
         focusMucJid: null,
20
         focusMucJid: null,
21
+        bridgeIsDown: false,
23
         init: function (conn) {
22
         init: function (conn) {
24
             this.connection = conn;
23
             this.connection = conn;
25
         },
24
         },
26
         initPresenceMap: function (myroomjid) {
25
         initPresenceMap: function (myroomjid) {
27
             this.presMap['to'] = myroomjid;
26
             this.presMap['to'] = myroomjid;
28
             this.presMap['xns'] = 'http://jabber.org/protocol/muc';
27
             this.presMap['xns'] = 'http://jabber.org/protocol/muc';
29
-            if (APP.RTC.localAudio && APP.RTC.localAudio.isMuted())
30
-            {
28
+            if (APP.RTC.localAudio && APP.RTC.localAudio.isMuted()) {
31
                 this.addAudioInfoToPresence(true);
29
                 this.addAudioInfoToPresence(true);
32
             }
30
             }
33
-            if (APP.RTC.localVideo && APP.RTC.localVideo.isMuted())
34
-            {
31
+            if (APP.RTC.localVideo && APP.RTC.localVideo.isMuted()) {
35
                 this.addVideoInfoToPresence(true);
32
                 this.addVideoInfoToPresence(true);
36
             }
33
             }
37
         },
34
         },
591
 
588
 
592
             Moderator.onMucMemberLeft(jid);
589
             Moderator.onMucMemberLeft(jid);
593
         },
590
         },
594
-        parsePresence: function (from, memeber, pres) {
595
-            if($(pres).find(">bridgeIsDown").length > 0 && !bridgeIsDown) {
596
-                bridgeIsDown = true;
591
+        parsePresence: function (from, member, pres) {
592
+            if($(pres).find(">bridgeIsDown").length > 0 && !this.bridgeIsDown) {
593
+                this.bridgeIsDown = true;
597
                 eventEmitter.emit(XMPPEvents.BRIDGE_DOWN);
594
                 eventEmitter.emit(XMPPEvents.BRIDGE_DOWN);
598
             }
595
             }
599
 
596
 
600
-            if(memeber.isFocus)
597
+            if(member.isFocus)
601
                 return;
598
                 return;
602
 
599
 
603
             var displayName = !config.displayJids
600
             var displayName = !config.displayJids
604
-                ? memeber.displayName : Strophe.getResourceFromJid(from);
601
+                ? member.displayName : Strophe.getResourceFromJid(from);
605
 
602
 
606
-            if (displayName && displayName.length > 0)
607
-            {
603
+            if (displayName && displayName.length > 0) {
608
                 eventEmitter.emit(XMPPEvents.DISPLAY_NAME_CHANGED, from, displayName);
604
                 eventEmitter.emit(XMPPEvents.DISPLAY_NAME_CHANGED, from, displayName);
609
             }
605
             }
610
 
606
 
611
-
612
             var id = $(pres).find('>userID').text();
607
             var id = $(pres).find('>userID').text();
613
             var email = $(pres).find('>email');
608
             var email = $(pres).find('>email');
614
-            if(email.length > 0) {
609
+            if (email.length > 0) {
615
                 id = email.text();
610
                 id = email.text();
616
             }
611
             }
617
 
612
 

+ 3
- 5
modules/xmpp/strophe.jingle.js 查看文件

5
 var RTCBrowserType = require("../RTC/RTCBrowserType");
5
 var RTCBrowserType = require("../RTC/RTCBrowserType");
6
 
6
 
7
 
7
 
8
-module.exports = function(XMPP, eventEmitter)
9
-{
8
+module.exports = function(XMPP, eventEmitter) {
10
     function CallIncomingJingle(sid, connection) {
9
     function CallIncomingJingle(sid, connection) {
11
         var sess = connection.jingle.sessions[sid];
10
         var sess = connection.jingle.sessions[sid];
12
 
11
 
21
         sess.sendAnswer();
20
         sess.sendAnswer();
22
         sess.accept();
21
         sess.accept();
23
 
22
 
24
-    };
23
+    }
25
 
24
 
26
     Strophe.addConnectionPlugin('jingle', {
25
     Strophe.addConnectionPlugin('jingle', {
27
         connection: null,
26
         connection: null,
115
             switch (action) {
114
             switch (action) {
116
                 case 'session-initiate':
115
                 case 'session-initiate':
117
                     var startMuted = $(iq).find('jingle>startmuted');
116
                     var startMuted = $(iq).find('jingle>startmuted');
118
-                    if (startMuted && startMuted.length > 0)
119
-                    {
117
+                    if (startMuted && startMuted.length > 0) {
120
                         var audioMuted = startMuted.attr("audio");
118
                         var audioMuted = startMuted.attr("audio");
121
                         var videoMuted = startMuted.attr("video");
119
                         var videoMuted = startMuted.attr("video");
122
                         eventEmitter.emit(XMPPEvents.START_MUTED_FROM_FOCUS,
120
                         eventEmitter.emit(XMPPEvents.START_MUTED_FROM_FOCUS,

正在加载...
取消
保存