Parcourir la source

Simplify, clarify source code

master
Lyubomir Marinov il y a 9 ans
Parent
révision
e165952a5d

+ 0
- 1
modules/RTC/JitsiRemoteTrack.js Voir le fichier

@@ -30,7 +30,6 @@ JitsiRemoteTrack.prototype.constructor = JitsiRemoteTrack;
30 30
  * @param value the muted status.
31 31
  */
32 32
 JitsiRemoteTrack.prototype.setMute = function (value) {
33
-
34 33
     if(this.muted === value)
35 34
         return;
36 35
 

+ 2
- 4
modules/RTC/JitsiTrack.js Voir le fichier

@@ -227,8 +227,7 @@ JitsiTrack.prototype.dispose = function () {
227 227
  * Returns true if this is a video track and the source of the video is a
228 228
  * screen capture as opposed to a camera.
229 229
  */
230
-JitsiTrack.prototype.isScreenSharing = function(){
231
-
230
+JitsiTrack.prototype.isScreenSharing = function() {
232 231
 };
233 232
 
234 233
 /**
@@ -258,7 +257,7 @@ JitsiTrack.prototype.getId = function () {
258 257
  * @returns {boolean} whether MediaStream is active.
259 258
  */
260 259
 JitsiTrack.prototype.isActive = function () {
261
-    if((typeof this.stream.active !== "undefined"))
260
+    if(typeof this.stream.active !== "undefined")
262 261
         return this.stream.active;
263 262
     else
264 263
         return true;
@@ -289,7 +288,6 @@ JitsiTrack.prototype.off = function (eventId, handler) {
289 288
 JitsiTrack.prototype.addEventListener = JitsiTrack.prototype.on;
290 289
 JitsiTrack.prototype.removeEventListener = JitsiTrack.prototype.off;
291 290
 
292
-
293 291
 /**
294 292
  * Sets the audio level for the stream
295 293
  * @param audioLevel the new audio level

+ 2
- 7
modules/RTC/RTCUtils.js Voir le fichier

@@ -642,16 +642,11 @@ var RTCUtils = {
642 642
                     return SDPUtil.filter_special_chars(stream.id);
643 643
                 };
644 644
                 this.getVideoSrc = function (element) {
645
-                    if (!element)
646
-                        return null;
647
-                    return element.getAttribute("src");
645
+                    return element ? element.getAttribute("src") : null;
648 646
                 };
649 647
                 this.setVideoSrc = function (element, src) {
650
-                    if (!src) {
651
-                        src = '';
652
-                    }
653 648
                     if (element)
654
-                        element.setAttribute("src", src);
649
+                        element.setAttribute("src", src || '');
655 650
                 };
656 651
                 // DTLS should now be enabled by default but..
657 652
                 this.pc_constraints = {'optional': [

+ 1
- 1
modules/xmpp/ChatRoom.js Voir le fichier

@@ -704,8 +704,8 @@ ChatRoom.prototype.removeListener = function (type, listener) {
704 704
 ChatRoom.prototype.remoteTrackAdded = function(data) {
705 705
     // Will figure out current muted status by looking up owner's presence
706 706
     var pres = this.lastPresences[data.owner];
707
-    var mediaType = data.mediaType;
708 707
     if(pres) {
708
+        var mediaType = data.mediaType;
709 709
         var mutedNode = null;
710 710
         if (mediaType === MediaType.AUDIO) {
711 711
             mutedNode = filterNodeFromPresenceJSON(pres, "audiomuted");

+ 3
- 6
modules/xmpp/JingleSessionPC.js Voir le fichier

@@ -1257,7 +1257,7 @@ JingleSessionPC.prototype.remoteTrackAdded = function (stream, track) {
1257 1257
     }
1258 1258
 
1259 1259
     var remoteSDP = new SDP(this.peerconnection.remoteDescription.sdp);
1260
-    var medialines = remoteSDP.media.filter(function (mediaLines){
1260
+    var medialines = remoteSDP.media.filter(function (mediaLines) {
1261 1261
         return mediaLines.startsWith("m=" + mediaType);
1262 1262
     });
1263 1263
 
@@ -1268,11 +1268,8 @@ JingleSessionPC.prototype.remoteTrackAdded = function (stream, track) {
1268 1268
 
1269 1269
     var ssrclines = SDPUtil.find_lines(medialines[0], 'a=ssrc:');
1270 1270
     ssrclines = ssrclines.filter(function (line) {
1271
-        if (RTCBrowserType.isTemasysPluginUsed()) {
1272
-            return ((line.indexOf('mslabel:' + streamId) !== -1));
1273
-        } else {
1274
-            return ((line.indexOf('msid:' + streamId) !== -1));
1275
-        }
1271
+        var msid = RTCBrowserType.isTemasysPluginUsed() ? 'mslabel' : 'msid';
1272
+        return line.indexOf(msid + ':' + streamId) !== -1;
1276 1273
     });
1277 1274
 
1278 1275
     var thessrc;

Chargement…
Annuler
Enregistrer