fix(eslint): Add no-extra-parens rule

.eslintrc.js

@@ -39,6 +39,11 @@ module.exports = {
         'no-empty': 2,
         'no-empty-character-class': 2,
         'no-ex-assign': 2,
-        'no-extra-boolean-cast': 2
+        'no-extra-boolean-cast': 2,
+        'no-extra-parens': [
+            'error',
+            'all',
+            { 'nestedBinaryExpressions': false }
+        ]
     }
 };

JitsiConference.js

@@ -1185,7 +1185,7 @@ JitsiConference.prototype.isDTMFSupported = function () {
  * @return {string} local user's ID
  */
 JitsiConference.prototype.myUserId = function () {
-    return (this.room && this.room.myroomjid)? Strophe.getResourceFromJid(this.room.myroomjid) : null;
+    return this.room && this.room.myroomjid? Strophe.getResourceFromJid(this.room.myroomjid) : null;
 };
 
 JitsiConference.prototype.sendTones = function (tones, duration, pause) {
@@ -1227,14 +1227,14 @@ JitsiConference.prototype.isRecordingSupported = function () {
  * and "off" if the recording is not started.
  */
 JitsiConference.prototype.getRecordingState = function () {
-    return (this.room) ? this.room.getRecordingState() : undefined;
+    return this.room ? this.room.getRecordingState() : undefined;
 };
 
 /**
  * Returns the url of the recorded video.
  */
 JitsiConference.prototype.getRecordingURL = function () {
-    return (this.room) ? this.room.getRecordingURL() : null;
+    return this.room ? this.room.getRecordingURL() : null;
 };
 
 /**

modules/DTMF/JitsiDTMFManager.js

@@ -12,5 +12,5 @@ function JitsiDTMFManager (localAudio, peerConnection) {
 
 
 JitsiDTMFManager.prototype.sendTones = function (tones, duration, pause) {
-    this.dtmfSender.insertDTMF(tones, (duration || 200), (pause || 200));
+    this.dtmfSender.insertDTMF(tones, duration || 200, pause || 200);
 };

modules/RTC/DataChannels.js

@@ -85,7 +85,7 @@ DataChannels.prototype.onDataChannel = function (event) {
                 dataChannel,
                 e);
         }
-        if (('undefined' !== typeof(obj)) && (null !== obj)) {
+        if (('undefined' !== typeof obj) && (null !== obj)) {
             var colibriClass = obj.colibriClass;
 
             if ("DominantSpeakerEndpointChangeEvent" === colibriClass) {
@@ -107,14 +107,14 @@ DataChannels.prototype.onDataChannel = function (event) {
 
                 if ((type = typeof oldValue) !== 'boolean') {
                     if (type === 'string') {
-                        oldValue = (oldValue == "true");
+                        oldValue = oldValue == "true";
                     } else {
                         oldValue = new Boolean(oldValue).valueOf();
                     }
                 }
                 if ((type = typeof newValue) !== 'boolean') {
                     if (type === 'string') {
-                        newValue = (newValue == "true");
+                        newValue = newValue == "true";
                     } else {
                         newValue = new Boolean(newValue).valueOf();
                     }
@@ -225,9 +225,9 @@ DataChannels.prototype._onXXXEndpointChanged = function (xxx, userResource) {
 
     var jsonObject = {};
 
-    jsonObject.colibriClass = (upper + 'EndpointChangedEvent');
+    jsonObject.colibriClass = upper + 'EndpointChangedEvent';
     jsonObject[lower + "Endpoint"]
-        = (userResource ? userResource : null);
+        = userResource ? userResource : null;
 
     this.send(jsonObject);
 

modules/RTC/JitsiLocalTrack.js

@@ -647,8 +647,8 @@ JitsiLocalTrack.prototype._isReceivingData = function () {
     // the users for error if the stream is muted or ended on it's
     // creation.
     return this.stream.getTracks().some(track =>
-        ((!("readyState" in track) || track.readyState === "live")
-            && (!("muted" in track) || track.muted !== true)));
+        (!("readyState" in track) || track.readyState === "live")
+            && (!("muted" in track) || track.muted !== true));
 };
 
 module.exports = JitsiLocalTrack;

modules/RTC/JitsiRemoteTrack.js

@@ -135,7 +135,7 @@ JitsiRemoteTrack.prototype._setVideoType = function (type) {
 };
 
 JitsiRemoteTrack.prototype._playCallback = function () {
-    var type = (this.isVideoTrack() ? 'video' : 'audio');
+    var type = this.isVideoTrack() ? 'video' : 'audio';
 
     var now = window.performance.now();
     console.log("(TIME) Render " + type + ":\t", now);

modules/RTC/JitsiTrack.js

@@ -124,7 +124,7 @@ JitsiTrack.prototype._setHandler = function (type, handler) {
 JitsiTrack.prototype._setStream = function (stream) {
     this.stream = stream;
     Object.keys(this.handlers).forEach(function (type) {
-        typeof(this.handlers[type]) === "function" &&
+        typeof this.handlers[type] === "function" &&
             this._setHandler(type, this.handlers[type]);
     }, this);
 };
@@ -378,7 +378,7 @@ JitsiTrack.prototype.setAudioLevel = function (audioLevel) {
 JitsiTrack.prototype.getMSID = function () {
     var streamId = this.getStreamId();
     var trackId = this.getTrackId();
-    return (streamId && trackId) ? (streamId + " " + trackId) : null;
+    return streamId && trackId ? streamId + " " + trackId : null;
 };
 
 /**

modules/RTC/RTC.js

@@ -590,8 +590,8 @@ export default class RTC extends Listenable {
      * @returns {boolean}
      */
     static isUserStreamById (streamId) {
-        return (streamId && streamId !== "mixedmslabel"
-            && streamId !== "default");
+        return streamId && streamId !== "mixedmslabel"
+            && streamId !== "default";
     }
 
     /**

modules/RTC/RTCBrowserType.js

@@ -232,7 +232,7 @@ function detectFirefox() {
 }
 
 function detectSafari() {
-    if ((/^((?!chrome).)*safari/i.test(navigator.userAgent))) {
+    if (/^((?!chrome).)*safari/i.test(navigator.userAgent)) {
         currentBrowser = RTCBrowserType.RTC_BROWSER_SAFARI;
         logger.info("This appears to be Safari");
         // FIXME detect Safari version when needed

modules/RTC/RTCUtils.js

@@ -79,7 +79,7 @@ function initRawEnumerateDevicesWithCallback() {
         // "ReferenceError: Can't find variable: MediaStreamTrack"
         // when Temasys plugin is not installed yet, have to delay this call
         // until WebRTC is ready.
-        : (MediaStreamTrack && MediaStreamTrack.getSources)
+        : MediaStreamTrack && MediaStreamTrack.getSources
         ? function (callback) {
             MediaStreamTrack.getSources(function (sources) {
                 callback(sources.map(convertMediaStreamTrackSource));
@@ -538,7 +538,7 @@ function convertMediaStreamTrackSource(source) {
         // not return 'audiooutput' devices but let's handle it in any
         // case
         kind: kind
-            ? (kind === 'audiooutput' ? kind : kind + 'input')
+            ? kind === 'audiooutput' ? kind : kind + 'input'
             : null,
         deviceId: source.id,
         groupId: source.groupId || null
@@ -737,11 +737,11 @@ class RTCUtils extends Listenable {
     }
 
     init(options) {
-        if (typeof(options.disableAEC) === "boolean") {
+        if (typeof options.disableAEC === "boolean") {
             disableAEC = options.disableAEC;
             logger.info("Disable AEC: " + disableAEC);
         }
-        if (typeof(options.disableNS) === "boolean") {
+        if (typeof options.disableNS === "boolean") {
             disableNS = options.disableNS;
             logger.info("Disable NS: " + disableNS);
         }
@@ -824,7 +824,7 @@ class RTCUtils extends Listenable {
                     // semicolon insertion (ASI). No line terminator is allowed
                     // between the return keyword and the expression.
                     return (
-                        (typeof id === 'number')
+                        typeof id === 'number'
                             ? id
                             : SDPUtil.filter_special_chars(id));
                 };
@@ -1154,8 +1154,8 @@ class RTCUtils extends Listenable {
         if (isEnumerateDevicesAvailable) {
             return true;
         }
-        return (typeof MediaStreamTrack !== "undefined" &&
-            MediaStreamTrack.getSources)? true : false;
+        return typeof MediaStreamTrack !== "undefined" &&
+            MediaStreamTrack.getSources? true : false;
     }
 
     /**

modules/RTC/ScreenObtainer.js

@@ -105,7 +105,7 @@ var ScreenObtainer = {
                             jitsiError = new JitsiTrackError(
                                 error, constraints, ["desktop"]);
                         }
-                        (typeof(onFailure) === "function") &&
+                        (typeof onFailure === "function") &&
                             onFailure(jitsiError);
                     });
             };
@@ -276,8 +276,8 @@ var ScreenObtainer = {
         if ((CHROME_EXTENSION_POPUP_ERROR === e
              || CHROME_EXTENSION_IFRAME_ERROR === e)
                 && options.interval > 0
-                && typeof(options.checkAgain) === "function"
-                && typeof(options.listener) === "function") {
+                && typeof options.checkAgain === "function"
+                && typeof options.listener === "function") {
             options.listener("waitingForExtension", webStoreInstallUrl);
             this.checkForChromeExtensionOnInterval(options, streamCallback,
                 failCallback, e);
@@ -555,7 +555,7 @@ function initFirefoxExtensionDetection(options) {
     // Where EXT_ID is the ID of the extension with "@" replaced by ".", and
     // DOMAIN is a domain whitelisted by the extension.
     var src = "chrome://" +
-        (options.desktopSharingFirefoxExtId.replace('@', '.')) +
+        options.desktopSharingFirefoxExtId.replace('@', '.') +
         "/content/" + document.location.hostname + ".png";
     img.setAttribute('src', src);
 }

modules/statistics/CallStats.js

@@ -71,7 +71,7 @@ function initCallback (err, msg) {
         this.confID,
         this.pcCallback.bind(this));
 
-    var fabricInitialized = (ret.status === 'success');
+    var fabricInitialized = ret.status === 'success';
 
     if(!fabricInitialized) {
         CallStats.initializeFailed = true;

modules/statistics/RTPStatsCollector.js

@@ -492,8 +492,8 @@ StatsCollector.prototype.processStatsReport = function () {
 
         // TODO: clean this mess up!
         var nowBytesTransmitted = getStatValue(now, "bytesSent");
-        if(typeof(nowBytesTransmitted) === "number" ||
-            typeof(nowBytesTransmitted) === "string") {
+        if(typeof nowBytesTransmitted === "number" ||
+            typeof nowBytesTransmitted === "string") {
             nowBytesTransmitted = Number(nowBytesTransmitted);
             if(!isNaN(nowBytesTransmitted)){
                 byteSentStats[ssrc] = nowBytesTransmitted;

modules/transcription/audioRecorder.js

@@ -294,10 +294,10 @@ audioRecorder.prototype.getFileType = function () {
  */
 function createEmptyStream() {
     // Firefox supports the MediaStream object, Chrome webkitMediaStream
-    if(typeof(MediaStream) !== 'undefined') {
+    if(typeof MediaStream !== 'undefined') {
         return new MediaStream();
     }
-    else if(typeof(webkitMediaStream) !== 'undefined') {
+    else if(typeof webkitMediaStream !== 'undefined') {
         return new webkitMediaStream(); // eslint-disable-line new-cap
     }
     else {

modules/transcription/transcriptionServices/SphinxTranscriptionService.js

@@ -79,7 +79,7 @@ SphinxService.prototype.formatResponse = function(response) {
 SphinxService.prototype.verify = function(response){
     console.log("response from server:" + response.toString());
     //test if server responded with a string object
-    if(typeof(response) !== "string"){
+    if(typeof response !== "string"){
         return false;
     }
     //test if the string can be parsed into valid JSON

modules/util/EventEmitterForwarder.js

@@ -6,8 +6,8 @@
  * implements emit method which will emit an event.
  */
 function EventEmitterForwarder (src, dest) {
-    if (!src || !dest || typeof(src.addListener) !== "function" ||
-        typeof(dest.emit) !== "function")
+    if (!src || !dest || typeof src.addListener !== "function" ||
+        typeof dest.emit !== "function")
         throw new Error("Invalid arguments passed to EventEmitterForwarder");
     this.src = src;
     this.dest = dest;

modules/xmpp/Caps.js

@@ -103,10 +103,10 @@ export default class Caps extends Listenable {
      */
     getFeatures(jid, timeout = 5000) {
         let user
-            = (jid in this.jidToVersion) ? this.jidToVersion[jid] : null;
+            = jid in this.jidToVersion ? this.jidToVersion[jid] : null;
         if(!user || !(user.version in this.versionToCapabilities))
         {
-            const node = (user)? user.node + "#" + user.version : null;
+            const node = user? user.node + "#" + user.version : null;
             return new Promise ( (resolve, reject) =>
                 this.disco.info(jid, node, response => {
                         const features = new Set();

modules/xmpp/ChatRoom.js

@@ -790,14 +790,14 @@ export default class ChatRoom extends Listenable {
      * and "off" if the recording is not started.
      */
     getRecordingState () {
-        return (this.recording) ? this.recording.getState() : undefined;
+        return this.recording ? this.recording.getState() : undefined;
     }
 
     /**
      * Returns the url of the recorded video.
      */
     getRecordingURL () {
-        return (this.recording) ? this.recording.getURL() : null;
+        return this.recording ? this.recording.getURL() : null;
     }
 
     /**

modules/xmpp/JingleSessionPC.js

@@ -266,7 +266,7 @@ export default class JingleSessionPC extends JingleSession {
                 cand.c('content', {
                     creator: this.initiator == this.localJid
                                     ? 'initiator' : 'responder',
-                    name: (cands[0].sdpMid ? cands[0].sdpMid : mline.media)
+                    name: cands[0].sdpMid ? cands[0].sdpMid : mline.media
                 }).c('transport', ice);
                 for (let i = 0; i < cands.length; i++) {
                     const candidate

modules/xmpp/SDP.js

@@ -398,8 +398,8 @@ SDP.prototype.transportToJingle = function (mediaindex, elem) {
                 if (self.failICE) {
                     candidate.ip = "1.1.1.1";
                 }
-                var protocol = (candidate &&
-                        typeof candidate.protocol === 'string')
+                var protocol = candidate &&
+                        typeof candidate.protocol === 'string'
                     ? candidate.protocol.toLowerCase() : '';
                 if ((self.removeTcpCandidates
                         && (protocol === 'tcp' || protocol === 'ssltcp')) ||
@@ -587,7 +587,7 @@ SDP.prototype.jingle2media = function (content) {
             media += 'a=fmtp:' + this.getAttribute('id') + ' ';
             media += $(this).find('parameter').map(function () {
                 return (this.getAttribute('name')
-                        ? (this.getAttribute('name') + '=') : '') +
+                        ? this.getAttribute('name') + '=' : '') +
                     this.getAttribute('value');
             }).get().join('; ');
             media += '\r\n';
@@ -607,7 +607,7 @@ SDP.prototype.jingle2media = function (content) {
 
     content.find('>transport[xmlns="urn:xmpp:jingle:transports:ice-udp:1"]>candidate').each(function () {
         var protocol = this.getAttribute('protocol');
-        protocol = (typeof protocol === 'string') ? protocol.toLowerCase(): '';
+        protocol = typeof protocol === 'string' ? protocol.toLowerCase(): '';
 
         if ((self.removeTcpCandidates
                 && (protocol === 'tcp' || protocol === 'ssltcp')) ||

modules/xmpp/recording.js

@@ -17,9 +17,9 @@ function Recording(type, eventEmitter, connection, focusMucJid, jirecon,
     this.url = null;
     this.type = type;
     this._isSupported
-        = ( type === Recording.types.JIRECON && !this.jirecon
+        =  type === Recording.types.JIRECON && !this.jirecon
             || (type !== Recording.types.JIBRI
-                && type !== Recording.types.COLIBRI))
+                && type !== Recording.types.COLIBRI)
             ? false : true;
 
     /**
@@ -94,7 +94,7 @@ Recording.prototype.setRecordingJibri
     var iq = $iq({to: this.focusMucJid, type: 'set'})
         .c('jibri', {
         "xmlns": 'http://jitsi.org/protocol/jibri',
-        "action": (state === Recording.status.ON)
+        "action": state === Recording.status.ON
                     ? Recording.action.START
                     : Recording.action.STOP,
         "streamid": options.streamId,
@@ -124,7 +124,7 @@ Recording.prototype.setRecordingJirecon =
 
     var iq = $iq({to: this.jirecon, type: 'set'})
         .c('recording', {xmlns: 'http://jitsi.org/protocol/jirecon',
-            action: (state === Recording.status.ON)
+            action: state === Recording.status.ON
                 ? Recording.action.START
                 : Recording.action.STOP,
             mucjid: this.roomjid});
@@ -141,7 +141,7 @@ Recording.prototype.setRecordingJirecon =
             // provisional?
             self.jireconRid = $(result).find('recording').attr('rid');
             logger.log('Recording ' +
-                ((state === Recording.status.ON) ? 'started' : 'stopped') +
+                (state === Recording.status.ON ? 'started' : 'stopped') +
                 '(jirecon)' + result);
             self.state = state;
             if (state === Recording.status.OFF){
@@ -244,8 +244,8 @@ Recording.prototype.toggleRecording = function (options, statusChangeHandler) {
         return;
     }
 
-    var newState = (oldState === Recording.status.AVAILABLE
-                    || oldState === Recording.status.OFF)
+    var newState = oldState === Recording.status.AVAILABLE
+                    || oldState === Recording.status.OFF
                     ? Recording.status.ON
                     : Recording.status.OFF;
 

modules/xmpp/xmpp.js

@@ -266,7 +266,7 @@ export default class XMPP extends Listenable {
         let mucNickname = Strophe.getNodeFromJid(this.connection.jid);
         let roomjid = roomName  + "@" + this.options.hosts.muc + "/";
         let cfgNickname
-            = (options.useNicks && options.nick) ? options.nick : null;
+            = options.useNicks && options.nick ? options.nick : null;
 
         if (cfgNickname) {
             // Use nick if it's defined