fix(eslint): Add no-else-return rule

.eslintrc.js

@@ -81,6 +81,7 @@ module.exports = {
         'no-caller': 2,
         'no-case-declarations': 2,
         'no-div-regex': 0,
+        'no-else-return': 2,
         'no-empty-pattern': 2,
         'no-eval': 2,
         'no-extend-native': 2,

JitsiConference.js

@@ -444,10 +444,10 @@ JitsiConference.prototype.addTrack = function(track) {
             // to attempt to add the same local video track twice.
             if (track === localVideoTrack) {
                 return Promise.resolve(track);
-            } else {
-                return Promise.reject(new Error(
-                    'cannot add second video track to the conference'));
             }
+            return Promise.reject(new Error(
+                    'cannot add second video track to the conference'));
+
         }
     }
 
@@ -576,9 +576,9 @@ JitsiConference.prototype.replaceTrack = function(oldTrack, newTrack) {
 JitsiConference.prototype._doReplaceTrack = function(oldTrack, newTrack) {
     if (this.jingleSession) {
         return this.jingleSession.replaceTrack(oldTrack, newTrack);
-    } else {
-        return Promise.resolve();
     }
+    return Promise.resolve();
+
 };
 
 /**
@@ -1326,9 +1326,9 @@ JitsiConference.prototype.getPhonePin = function() {
 JitsiConference.prototype.getConnectionState = function() {
     if (this.jingleSession) {
         return this.jingleSession.getIceConnectionState();
-    } else {
-        return null;
     }
+    return null;
+
 };
 
 /**

modules/RTC/DataChannels.js

@@ -237,12 +237,12 @@ DataChannels.prototype._some = function(callback, thisArg) {
     if (dataChannels && dataChannels.length !== 0) {
         if (thisArg) {
             return dataChannels.some(callback, thisArg);
-        } else {
-            return dataChannels.some(callback);
         }
-    } else {
-        return false;
+        return dataChannels.some(callback);
+
     }
+    return false;
+
 };
 
 /**

modules/RTC/JitsiLocalTrack.js

@@ -484,9 +484,9 @@ JitsiLocalTrack.prototype.isMuted = function() {
     }
     if (this.isVideoTrack() && !this.isActive()) {
         return true;
-    } else {
-        return !this.track || !this.track.enabled;
     }
+    return !this.track || !this.track.enabled;
+
 };
 
 /**
@@ -527,9 +527,9 @@ JitsiLocalTrack.prototype.getSSRC = function() {
         return this.ssrc.groups[0].ssrcs[0];
     } else if(this.ssrc && this.ssrc.ssrcs && this.ssrc.ssrcs.length) {
         return this.ssrc.ssrcs[0];
-    } else {
-        return null;
     }
+    return null;
+
 };
 
 /**

modules/RTC/JitsiTrack.js

@@ -210,9 +210,9 @@ JitsiTrack.prototype.getTrackId = function() {
 JitsiTrack.prototype.getUsageLabel = function() {
     if (this.isAudioTrack()) {
         return 'mic';
-    } else {
-        return this.videoType ? this.videoType : 'default';
     }
+    return this.videoType ? this.videoType : 'default';
+
 };
 
 /**
@@ -319,9 +319,9 @@ JitsiTrack.prototype.isScreenSharing = function() {
 JitsiTrack.prototype.getId = function() {
     if(this.stream) {
         return RTCUtils.getStreamID(this.stream);
-    } else {
-        return null;
     }
+    return null;
+
 };
 
 /**
@@ -333,9 +333,9 @@ JitsiTrack.prototype.getId = function() {
 JitsiTrack.prototype.isActive = function() {
     if(typeof this.stream.active !== 'undefined') {
         return this.stream.active;
-    } else {
-        return true;
     }
+    return true;
+
 };
 
 /**

modules/RTC/RTC.js

@@ -247,9 +247,9 @@ export default class RTC extends Listenable {
             // NOTE Remote tracks are not removed here.
             this.peerConnections.delete(id);
             return true;
-        } else {
-            return false;
         }
+        return false;
+
     }
 
     addLocalTrack(track) {
@@ -334,9 +334,9 @@ export default class RTC extends Listenable {
     getRemoteTrackByType(type, resource) {
         if (this.remoteTracks[resource]) {
             return this.remoteTracks[resource][type];
-        } else {
-            return null;
         }
+        return null;
+
     }
 
     /**
@@ -461,9 +461,9 @@ export default class RTC extends Listenable {
                         && mediaTrack.getTrackId() == trackId) {
                         result = mediaTrack;
                         return true;
-                    } else {
-                        return false;
                     }
+                    return false;
+
                 });
         });
 

modules/RTC/RTCUIHelper.js

@@ -25,18 +25,18 @@ var RTCUIHelper = {
         var videoElemName = RTCUIHelper.getVideoElementName();
         if (!RTCBrowserType.isTemasysPluginUsed()) {
             return $(containerElement).find(videoElemName)[0];
-        } else {
-            var matching = $(containerElement).find(
+        }
+        var matching = $(containerElement).find(
                 ' ' + videoElemName + '>param[value="video"]');
-            if (matching.length) {
-                if (matching.length > 1) {
-                    logger.warn(
+        if (matching.length) {
+            if (matching.length > 1) {
+                logger.warn(
                         'Container with more than one video elements: ',
                         containerElement);
-                }
-                return matching.parent()[0];
             }
+            return matching.parent()[0];
         }
+
         return undefined;
     },
     /**

modules/RTC/RTCUtils.js

@@ -1160,17 +1160,17 @@ class RTCUtils extends Listenable {
     onRTCReady() {
         if (rtcReady) {
             return Promise.resolve();
-        } else {
-            return new Promise(resolve => {
-                const listener = () => {
-                    eventEmitter.removeListener(RTCEvents.RTC_READY, listener);
-                    resolve();
-                };
-                eventEmitter.addListener(RTCEvents.RTC_READY, listener);
+        }
+        return new Promise(resolve => {
+            const listener = () => {
+                eventEmitter.removeListener(RTCEvents.RTC_READY, listener);
+                resolve();
+            };
+            eventEmitter.addListener(RTCEvents.RTC_READY, listener);
                 // We have no failed event, so... it either resolves or nothing
                 // happens
-            });
-        }
+        });
+
     }
 
     /**

modules/statistics/RTPStatsCollector.js

@@ -316,9 +316,9 @@ StatsCollector.prototype._defineGetStatValueMethod = function(keys) {
         var key = keys[name];
         if (key) {
             return key;
-        } else {
-            throw 'The property \'' + name + '\' isn\'t supported!';
         }
+        throw 'The property \'' + name + '\' isn\'t supported!';
+
     };
 
     // Define the function which retrieves the value from a specific report
@@ -349,9 +349,9 @@ StatsCollector.prototype._defineGetStatValueMethod = function(keys) {
                 if (pair.hasOwnProperty(key)) {
                     value = pair[key];
                     return true;
-                } else {
-                    return false;
                 }
+                return false;
+
             });
             return value;
         };

modules/transcription/audioRecorder.js

@@ -93,10 +93,10 @@ function determineCorrectFileType() {
         return AUDIO_WEBM;
     } else if(MediaRecorder.isTypeSupported(AUDIO_OGG)) {
         return AUDIO_OGG;
-    } else {
-        throw new Error('unable to create a MediaRecorder with the'
-            + 'right mimetype!');
     }
+    throw new Error('unable to create a MediaRecorder with the'
+            + 'right mimetype!');
+
 }
 
 /**
@@ -295,9 +295,9 @@ function createEmptyStream() {
         return new MediaStream();
     } else if(typeof webkitMediaStream !== 'undefined') {
         return new webkitMediaStream(); // eslint-disable-line new-cap
-    } else {
-        throw new Error('cannot create a clean mediaStream');
     }
+    throw new Error('cannot create a clean mediaStream');
+
 }
 
 /**

modules/transcription/transcriptionServices/SphinxTranscriptionService.js

@@ -117,9 +117,9 @@ function getURL() {
         var toReturn = config.sphinxURL;
         if(toReturn.includes !== undefined && toReturn.includes('https://')) {
             return toReturn;
-        } else{
-            console.log(message);
         }
+        console.log(message);
+
     }
 }
 

modules/xmpp/ChatRoom.js

@@ -682,9 +682,9 @@ export default class ChatRoom extends Listenable {
         var member = this.members[mucJid];
         if (member) {
             return member.isFocus;
-        } else {
-            return null;
         }
+        return null;
+
     }
 
     isModerator() {

modules/xmpp/RtxModifier.spec.js

@@ -40,14 +40,14 @@ function getPrimaryVideoSsrcs(parsedSdp) {
     const videoMLine = parsedSdp.media.find(m => m.type === 'video');
     if (numVideoSsrcs(parsedSdp) === 1) {
         return [videoMLine.ssrcs[0].id];
-    } else {
-        const simGroups = getVideoGroups(parsedSdp, 'SIM');
-        if (simGroups.length > 1) {
-            return;
-        }
-        const simGroup = simGroups[0];
-        return SDPUtil.parseGroupSsrcs(simGroup);
     }
+    const simGroups = getVideoGroups(parsedSdp, 'SIM');
+    if (simGroups.length > 1) {
+        return;
+    }
+    const simGroup = simGroups[0];
+    return SDPUtil.parseGroupSsrcs(simGroup);
+
 }
 
 /**

modules/xmpp/SdpTransformUtil.js

@@ -26,12 +26,12 @@ export function parseSecondarySSRC(group) {
 function _getSSRCCount(mLine) {
     if (!mLine.ssrcs) {
         return 0;
-    } else {
-        return mLine.ssrcs
+    }
+    return mLine.ssrcs
             .map(ssrcInfo => ssrcInfo.id)
             .filter((ssrc, index, array) => array.indexOf(ssrc) === index)
             .length;
-    }
+
 }
 
 /**
@@ -269,19 +269,19 @@ class MLineWrap {
         if (numSsrcs === 1) {
             // Not using _ssrcs on purpose here
             return this.mLine.ssrcs[0].id;
-        } else {
+        }
             // Look for a SIM or FID group
-            if (this.mLine.ssrcGroups) {
-                const simGroup = this.findGroup('SIM');
-                if (simGroup) {
-                    return parsePrimarySSRC(simGroup);
-                }
-                const fidGroup = this.findGroup('FID');
-                if (fidGroup) {
-                    return parsePrimarySSRC(fidGroup);
-                }
+        if (this.mLine.ssrcGroups) {
+            const simGroup = this.findGroup('SIM');
+            if (simGroup) {
+                return parsePrimarySSRC(simGroup);
+            }
+            const fidGroup = this.findGroup('FID');
+            if (fidGroup) {
+                return parsePrimarySSRC(fidGroup);
             }
         }
+
     }
 
     /**