[eslint] no-lonely-if

.eslintrc.js

@@ -151,6 +151,7 @@ module.exports = {
         'new-parens': 2,
         'no-array-constructor': 2,
         'no-inline-comments': 0,
+        'no-lonely-if': 2,
         'no-mixed-operators': 2,
         'no-mixed-spaces-and-tabs': 2,
         'no-multiple-empty-lines': 2,

modules/RTC/JitsiLocalTrack.js

@@ -296,57 +296,55 @@ JitsiLocalTrack.prototype._setMute = function(mute) {
         if(this.track) {
             this.track.enabled = !mute;
         }
-    } else {
-        if(mute) {
-            this.dontFireRemoveEvent = true;
-            promise = new Promise((resolve, reject) => {
-                this._removeStreamFromConferenceAsMute(() => {
-                    // FIXME: Maybe here we should set the SRC for the containers
-                    // to something
-                    this._stopMediaStream();
-                    this._setStream(null);
-                    resolve();
-                }, err => {
-                    reject(err);
-                });
+    } else if (mute) {
+        this.dontFireRemoveEvent = true;
+        promise = new Promise((resolve, reject) => {
+            this._removeStreamFromConferenceAsMute(() => {
+                // FIXME: Maybe here we should set the SRC for the containers
+                // to something
+                this._stopMediaStream();
+                this._setStream(null);
+                resolve();
+            }, err => {
+                reject(err);
             });
-        } else {
-            // This path is only for camera.
-            const streamOptions = {
-                cameraDeviceId: this.getDeviceId(),
-                devices: [ MediaType.VIDEO ],
-                facingMode: this.getCameraFacingMode()
-            };
-            if (this.resolution) {
-                streamOptions.resolution = this.resolution;
-            }
+        });
+    } else {
+        // This path is only for camera.
+        const streamOptions = {
+            cameraDeviceId: this.getDeviceId(),
+            devices: [ MediaType.VIDEO ],
+            facingMode: this.getCameraFacingMode()
+        };
+        if (this.resolution) {
+            streamOptions.resolution = this.resolution;
+        }
 
-            promise = RTCUtils.obtainAudioAndVideoPermissions(streamOptions)
-                .then(streamsInfo => {
-                    const mediaType = self.getType();
-                    const streamInfo = streamsInfo.find(info => info.mediaType === mediaType);
-
-                    if (streamInfo) {
-                        self._setStream(streamInfo.stream);
-                        self.track = streamInfo.track;
-                        // This is not good when video type changes after
-                        // unmute, but let's not crash here
-                        if (self.videoType !== streamInfo.videoType) {
-                            logger.warn(
-                                'Video type has changed after unmute!',
-                                self.videoType, streamInfo.videoType);
-                            self.videoType = streamInfo.videoType;
-                        }
-                    }else {
-                        throw new JitsiTrackError(
-                            JitsiTrackErrors.TRACK_NO_STREAM_FOUND);
+        promise = RTCUtils.obtainAudioAndVideoPermissions(streamOptions)
+            .then(streamsInfo => {
+                const mediaType = self.getType();
+                const streamInfo = streamsInfo.find(info => info.mediaType === mediaType);
+
+                if (streamInfo) {
+                    self._setStream(streamInfo.stream);
+                    self.track = streamInfo.track;
+                    // This is not good when video type changes after
+                    // unmute, but let's not crash here
+                    if (self.videoType !== streamInfo.videoType) {
+                        logger.warn(
+                            'Video type has changed after unmute!',
+                            self.videoType, streamInfo.videoType);
+                        self.videoType = streamInfo.videoType;
                     }
+                }else {
+                    throw new JitsiTrackError(
+                        JitsiTrackErrors.TRACK_NO_STREAM_FOUND);
+                }
 
-                    self.containers = self.containers.map(cont => RTCUtils.attachMediaStream(cont, self.stream));
+                self.containers = self.containers.map(cont => RTCUtils.attachMediaStream(cont, self.stream));
 
-                    return self._addStreamToConferenceAsUnmute();
-                });
-        }
+                return self._addStreamToConferenceAsUnmute();
+            });
     }
 
     return promise

modules/xmpp/SDPUtil.js

@@ -382,7 +382,8 @@ const SDPUtil = {
             .map(ssrcInfo => ssrcInfo.id)
             .filter((ssrc, index, array) => array.indexOf(ssrc) === index)
             .length;
-        const numGroups = (videoMLine.ssrcGroups && videoMLine.ssrcGroups.length) || 0;
+        const numGroups
+            = (videoMLine.ssrcGroups && videoMLine.ssrcGroups.length) || 0;
         if (numSsrcs > 1 && numGroups === 0) {
             // Ambiguous, can't figure out the primary
             return;
@@ -390,21 +391,21 @@ const SDPUtil = {
         let primarySsrc = null;
         if (numSsrcs === 1) {
             primarySsrc = videoMLine.ssrcs[0].id;
-        } else {
-            if (numSsrcs === 2) {
-                // Can figure it out if there's an FID group
-                const fidGroup = videoMLine.ssrcGroups
-                    .find(group => group.semantics === 'FID');
-                if (fidGroup) {
-                    primarySsrc = fidGroup.ssrcs.split(' ')[0];
-                }
-            } else if (numSsrcs >= 3) {
-                // Can figure it out if there's a sim group
-                const simGroup = videoMLine.ssrcGroups
-                    .find(group => group.semantics === 'SIM');
-                if (simGroup) {
-                    primarySsrc = simGroup.ssrcs.split(' ')[0];
-                }
+        } else if (numSsrcs === 2) {
+            // Can figure it out if there's an FID group
+            const fidGroup
+                = videoMLine.ssrcGroups.find(
+                    group => group.semantics === 'FID');
+            if (fidGroup) {
+                primarySsrc = fidGroup.ssrcs.split(' ')[0];
+            }
+        } else if (numSsrcs >= 3) {
+            // Can figure it out if there's a sim group
+            const simGroup
+                = videoMLine.ssrcGroups.find(
+                    group => group.semantics === 'SIM');
+            if (simGroup) {
+                primarySsrc = simGroup.ssrcs.split(' ')[0];
             }
         }
         return primarySsrc;