Merge branch 'master' into eslint_rules

.eslintrc.js

@@ -192,6 +192,7 @@ module.exports = {
         'max-len': [ 'error', 80 ],
         'max-lines': 0,
         'max-nested-callbacks': 2,
+        'max-params': 2,
         'max-statements': 0,
         'max-statements-per-line': 2,
         'multiline-ternary': 0,

JitsiConference.js

@@ -675,6 +675,8 @@ JitsiConference.prototype._setupNewTrack = function(newTrack) {
     this.eventEmitter.emit(JitsiConferenceEvents.TRACK_ADDED, newTrack);
 };
 
+/* eslint-disable max-params */
+
 /**
  * Adds loca WebRTC stream to the conference.
  * @param {MediaStream} stream new stream that will be added.
@@ -688,17 +690,25 @@ JitsiConference.prototype._setupNewTrack = function(newTrack) {
  * called. The option is used for adding stream, before the Jingle call is
  * started. That is before the 'session-accept' is sent.
  */
-JitsiConference.prototype._addLocalStream
-    = function(stream, callback, errorCallback, ssrcInfo, dontModifySources) {
-        if (this.jingleSession) {
-            this.jingleSession.addStream(
-            stream, callback, errorCallback, ssrcInfo, dontModifySources);
-        } else {
+JitsiConference.prototype._addLocalStream = function(
+        stream,
+        callback,
+        errorCallback,
+        ssrcInfo,
+        dontModifySources) {
+    if (this.jingleSession) {
+        this.jingleSession.addStream(
+            stream,
+            callback,
+            errorCallback,
+            ssrcInfo,
+            dontModifySources);
+    } else {
         // We are done immediately
-            logger.warn('Add local MediaStream - no JingleSession started yet');
-            callback();
-        }
-    };
+        logger.warn('Add local MediaStream - no JingleSession started yet');
+        callback();
+    }
+};
 
 /**
  * Remove local WebRTC media stream.
@@ -708,18 +718,25 @@ JitsiConference.prototype._addLocalStream
  * @param {object} ssrcInfo object with information about the SSRCs associated
  * with the stream.
  */
-JitsiConference.prototype.removeLocalStream
-    = function(stream, callback, errorCallback, ssrcInfo) {
-        if (this.jingleSession) {
-            this.jingleSession.removeStream(
-            stream, callback, errorCallback, ssrcInfo);
-        } else {
-            // We are done immediately
-            logger.warn(
-                'Remove local MediaStream - no JingleSession started yet');
-            callback();
-        }
-    };
+JitsiConference.prototype.removeLocalStream = function(
+        stream,
+        callback,
+        errorCallback,
+        ssrcInfo) {
+    if (this.jingleSession) {
+        this.jingleSession.removeStream(
+            stream,
+            callback,
+            errorCallback,
+            ssrcInfo);
+    } else {
+        // We are done immediately
+        logger.warn('Remove local MediaStream - no JingleSession started yet');
+        callback();
+    }
+};
+
+/* eslint-enable max-params */
 
 /**
  * Generate ssrc info object for a stream with the following properties:
@@ -887,6 +904,8 @@ JitsiConference.prototype.muteParticipant = function(id) {
     this.room.muteParticipant(participant.getJid(), true);
 };
 
+/* eslint-disable max-params */
+
 /**
  * Notifies this JitsiConference that a new member has joined its chat room.
  *
@@ -898,26 +917,29 @@ JitsiConference.prototype.muteParticipant = function(id) {
  * @param isHidden indicates if this is a hidden participant (system
  * participant for example a recorder).
  */
-JitsiConference.prototype.onMemberJoined
-    = function(jid, nick, role, isHidden) {
-        const id = Strophe.getResourceFromJid(jid);
+JitsiConference.prototype.onMemberJoined = function(jid, nick, role, isHidden) {
+    const id = Strophe.getResourceFromJid(jid);
 
-        if (id === 'focus' || this.myUserId() === id) {
-            return;
-        }
-        const participant = new JitsiParticipant(jid, this, nick, isHidden);
+    if (id === 'focus' || this.myUserId() === id) {
+        return;
+    }
+    const participant = new JitsiParticipant(jid, this, nick, isHidden);
 
-        participant._role = role;
-        this.participants[id] = participant;
-        this.eventEmitter.emit(
-            JitsiConferenceEvents.USER_JOINED,
-            id,
-            participant);
-        this.xmpp.caps.getFeatures(jid).then(features => {
+    participant._role = role;
+    this.participants[id] = participant;
+    this.eventEmitter.emit(
+        JitsiConferenceEvents.USER_JOINED,
+        id,
+        participant);
+    this.xmpp.caps.getFeatures(jid)
+        .then(features => {
             participant._supportsDTMF = features.has('urn:xmpp:jingle:dtmf:0');
             this.updateDTMFSupport();
-        }, error => logger.error(error));
-    };
+        },
+        error => logger.error(error));
+};
+
+/* eslint-enable max-params */
 
 JitsiConference.prototype.onMemberLeft = function(jid) {
     const id = Strophe.getResourceFromJid(jid);

JitsiConferenceEventManager.js

@@ -256,11 +256,15 @@ JitsiConferenceEventManager.prototype.setupChatRoomListeners = function() {
                 authIdentity);
         });
 
-    chatRoom.addListener(XMPPEvents.MESSAGE_RECEIVED,
+    chatRoom.addListener(
+        XMPPEvents.MESSAGE_RECEIVED,
+
+        // eslint-disable-next-line max-params
         (jid, displayName, txt, myJid, ts) => {
             const id = Strophe.getResourceFromJid(jid);
 
-            conference.eventEmitter.emit(JitsiConferenceEvents.MESSAGE_RECEIVED,
+            conference.eventEmitter.emit(
+                JitsiConferenceEvents.MESSAGE_RECEIVED,
                 id, txt, ts);
         });
 

JitsiMeetJS.js

@@ -390,6 +390,8 @@ const LibJitsiMeet = {
         this.mediaDevices.enumerateDevices(callback);
     },
 
+    /* eslint-disable max-params */
+
     /**
      * @returns function that can be used to be attached to window.onerror and
      * if options.enableWindowOnErrorHandler is enabled returns
@@ -406,6 +408,8 @@ const LibJitsiMeet = {
         Statistics.reportGlobalError(error);
     },
 
+    /* eslint-enable max-params */
+
     /**
      * Returns current machine id saved from the local storage.
      * @returns {string} the machine id

JitsiParticipant.js

@@ -6,6 +6,9 @@ import * as MediaType from './service/RTC/MediaType';
  * Represents a participant in (i.e. a member of) a conference.
  */
 export default class JitsiParticipant {
+
+    /* eslint-disable max-params */
+
     /**
      * Initializes a new JitsiParticipant instance.
      *
@@ -34,6 +37,8 @@ export default class JitsiParticipant {
         this._properties = {};
     }
 
+    /* eslint-enable max-params */
+
     /**
      * @returns {JitsiConference} The conference that this participant belongs
      * to.

modules/RTC/JitsiLocalTrack.js

@@ -15,6 +15,8 @@ import VideoType from '../../service/RTC/VideoType';
 
 const logger = getLogger(__filename);
 
+/* eslint-disable max-params */
+
 /**
  * Represents a single media track(either audio or video).
  * One <tt>JitsiLocalTrack</tt> corresponds to one WebRTC MediaStreamTrack.
@@ -27,20 +29,28 @@ const logger = getLogger(__filename);
  * @param facingMode the camera facing mode used in getUserMedia call
  * @constructor
  */
-function JitsiLocalTrack(stream, track, mediaType, videoType, resolution,
-                         deviceId, facingMode) {
-    const self = this;
-
-    JitsiTrack.call(this,
-        null /* RTC */, stream, track,
+function JitsiLocalTrack(
+        stream,
+        track,
+        mediaType,
+        videoType,
+        resolution,
+        deviceId,
+        facingMode) {
+    JitsiTrack.call(
+        this,
+        null /* RTC */,
+        stream,
+        track,
         () => {
             if (!this.dontFireRemoveEvent) {
-                this.eventEmitter.emit(
-                    JitsiTrackEvents.LOCAL_TRACK_STOPPED);
+                this.eventEmitter.emit(JitsiTrackEvents.LOCAL_TRACK_STOPPED);
             }
             this.dontFireRemoveEvent = false;
         } /* inactiveHandler */,
-        mediaType, videoType, null /* ssrc */);
+        mediaType,
+        videoType,
+        null /* ssrc */);
     this.dontFireRemoveEvent = false;
     this.resolution = resolution;
 
@@ -98,16 +108,16 @@ function JitsiLocalTrack(stream, track, mediaType, videoType, resolution,
      */
     this._noDataFromSourceTimeout = null;
 
-    this._onDeviceListChanged = function(devices) {
-        self._setRealDeviceIdFromDeviceList(devices);
+    this._onDeviceListChanged = devices => {
+        this._setRealDeviceIdFromDeviceList(devices);
 
         // Mark track as ended for those browsers that do not support
         // "readyState" property. We do not touch tracks created with default
         // device ID "".
-        if (typeof self.getTrack().readyState === 'undefined'
-            && typeof self._realDeviceId !== 'undefined'
-            && !devices.find(d => d.deviceId === self._realDeviceId)) {
-            self._trackEnded = true;
+        if (typeof this.getTrack().readyState === 'undefined'
+                && typeof this._realDeviceId !== 'undefined'
+                && !devices.find(d => d.deviceId === this._realDeviceId)) {
+            this._trackEnded = true;
         }
     };
 
@@ -117,17 +127,20 @@ function JitsiLocalTrack(stream, track, mediaType, videoType, resolution,
     // because there might be local tracks not attached to a conference.
     if (this.isAudioTrack() && RTCUtils.isDeviceChangeAvailable('output')) {
         this._onAudioOutputDeviceChanged = this.setAudioOutput.bind(this);
-
-        RTCUtils.addListener(RTCEvents.AUDIO_OUTPUT_DEVICE_CHANGED,
+        RTCUtils.addListener(
+            RTCEvents.AUDIO_OUTPUT_DEVICE_CHANGED,
             this._onAudioOutputDeviceChanged);
     }
 
-    RTCUtils.addListener(RTCEvents.DEVICE_LIST_CHANGED,
+    RTCUtils.addListener(
+        RTCEvents.DEVICE_LIST_CHANGED,
         this._onDeviceListChanged);
 
     this._initNoDataFromSourceHandlers();
 }
 
+/* eslint-enable max-params */
+
 JitsiLocalTrack.prototype = Object.create(JitsiTrack.prototype);
 JitsiLocalTrack.prototype.constructor = JitsiLocalTrack;
 

modules/RTC/JitsiRemoteTrack.js

@@ -9,6 +9,8 @@ const Statistics = require('../statistics/statistics');
 let ttfmTrackerAudioAttached = false;
 let ttfmTrackerVideoAttached = false;
 
+/* eslint-disable max-params */
+
 /**
  * Represents a single media track (either audio or video).
  * @param {RTC} rtc the RTC service instance.
@@ -24,8 +26,16 @@ let ttfmTrackerVideoAttached = false;
  * @param {boolean} muted the initial muted state
  * @constructor
  */
-function JitsiRemoteTrack(rtc, conference, ownerEndpointId, stream, track,
-                          mediaType, videoType, ssrc, muted) {
+function JitsiRemoteTrack(
+        rtc,
+        conference,
+        ownerEndpointId,
+        stream,
+        track,
+        mediaType,
+        videoType,
+        ssrc,
+        muted) {
     JitsiTrack.call(
         this,
         conference,
@@ -52,6 +62,8 @@ function JitsiRemoteTrack(rtc, conference, ownerEndpointId, stream, track,
     }
 }
 
+/* eslint-enable max-params */
+
 JitsiRemoteTrack.prototype = Object.create(JitsiTrack.prototype);
 JitsiRemoteTrack.prototype.constructor = JitsiRemoteTrack;
 

modules/RTC/JitsiTrack.js

@@ -54,6 +54,8 @@ function addMediaStreamInactiveHandler(mediaStream, handler) {
     }
 }
 
+/* eslint-disable max-params */
+
 /**
  * Represents a single media track (either audio or video).
  * @constructor
@@ -101,6 +103,8 @@ function JitsiTrack(
     this._setHandler('inactive', streamInactiveHandler);
 }
 
+/* eslint-enable max-params */
+
 /**
  * Sets handler to the WebRTC MediaStream or MediaStreamTrack object depending
  * on the passed type.

modules/RTC/RTC.js

@@ -411,6 +411,8 @@ export default class RTC extends Listenable {
         this.localTracks.splice(pos, 1);
     }
 
+    /* eslint-disable max-params */
+
     /**
      * Initializes a new JitsiRemoteTrack instance with the data provided by
      * the signaling layer and SDP.
@@ -423,25 +425,42 @@ export default class RTC extends Listenable {
      * @param {string} ssrc
      * @param {boolean} muted
      */
-    _createRemoteTrack(ownerEndpointId,
-                        stream, track, mediaType, videoType, ssrc, muted) {
+    _createRemoteTrack(
+            ownerEndpointId,
+            stream,
+            track,
+            mediaType,
+            videoType,
+            ssrc,
+            muted) {
         const remoteTrack
             = new JitsiRemoteTrack(
-                this, this.conference, ownerEndpointId, stream, track,
-                mediaType, videoType, ssrc, muted);
+                this,
+                this.conference,
+                ownerEndpointId,
+                stream,
+                track,
+                mediaType,
+                videoType,
+                ssrc,
+                muted);
         const remoteTracks
             = this.remoteTracks[ownerEndpointId]
                 || (this.remoteTracks[ownerEndpointId] = {});
 
         if (remoteTracks[mediaType]) {
             logger.error(
-                'Overwriting remote track!', ownerEndpointId, mediaType);
+                'Overwriting remote track!',
+                ownerEndpointId,
+                mediaType);
         }
         remoteTracks[mediaType] = remoteTrack;
 
         this.eventEmitter.emit(RTCEvents.REMOTE_TRACK_ADDED, remoteTrack);
     }
 
+    /* eslint-enable max-params */
+
     /**
      * Removes all JitsiRemoteTracks associated with given MUC nickname
      * (resource part of the JID). Returns array of removed tracks.

modules/RTC/RTCUtils.js

@@ -894,6 +894,8 @@ class RTCUtils extends Listenable {
         });
     }
 
+    /* eslint-disable max-params */
+
     /**
     * @param {string[]} um required user media types
     * @param {function} successCallback
@@ -942,6 +944,8 @@ class RTCUtils extends Listenable {
         }
     }
 
+    /* eslint-enable max-params */
+
     /**
      * Creates the local MediaStreams.
      * @param {Object} [options] optional parameters

modules/RTC/ScreenObtainer.js

@@ -290,6 +290,8 @@ const ScreenObtainer = {
         }
     },
 
+    /* eslint-disable max-params */
+
     handleExtensionInstallationError(options, streamCallback, failCallback, e) {
         const webStoreInstallUrl = getWebStoreInstallUrl(this.options);
 
@@ -314,6 +316,8 @@ const ScreenObtainer = {
             msg));
     },
 
+    /* eslint-enable max-params */
+
     checkForChromeExtensionOnInterval(options, streamCallback, failCallback) {
         if (options.checkAgain() === false) {
             failCallback(new JitsiTrackError(

modules/RTC/TraceablePeerConnection.js

@@ -17,6 +17,8 @@ import transform from 'sdp-transform';
 const logger = getLogger(__filename);
 const SIMULCAST_LAYERS = 3;
 
+/* eslint-disable max-params */
+
 /**
  * Creates new instance of 'TraceablePeerConnection'.
  *
@@ -39,16 +41,19 @@ const SIMULCAST_LAYERS = 3;
  *
  * @constructor
  */
-function TraceablePeerConnection(rtc, id, signalingLayer, iceConfig,
-                                 constraints, options) {
-    const self = this;
+function TraceablePeerConnection(
+        rtc,
+        id,
+        signalingLayer,
+        iceConfig,
+        constraints,
+        options) {
 
     /**
      * The parent instance of RTC service which created this
      * <tt>TracablePeerConnection</tt>.
      * @type {RTC}
      */
-
     this.rtc = rtc;
 
     /**
@@ -98,7 +103,7 @@ function TraceablePeerConnection(rtc, id, signalingLayer, iceConfig,
     this.rtxModifier = new RtxModifier();
 
     // override as desired
-    this.trace = function(what, info) {
+    this.trace = (what, info) => {
         /* logger.warn('WTRACE', what, info);
         if (info && RTCBrowserType.isIExplorer()) {
             if (info.length > 1024) {
@@ -108,78 +113,76 @@ function TraceablePeerConnection(rtc, id, signalingLayer, iceConfig,
                 logger.warn('WTRACE', what, info.substr(2048));
             }
         }*/
-        self.updateLog.push({
+        this.updateLog.push({
             time: new Date(),
             type: what,
             value: info || ''
         });
     };
     this.onicecandidate = null;
-    this.peerconnection.onicecandidate = function(event) {
+    this.peerconnection.onicecandidate = event => {
         // FIXME: this causes stack overflow with Temasys Plugin
         if (!RTCBrowserType.isTemasysPluginUsed()) {
-            self.trace(
+            this.trace(
                 'onicecandidate',
                 JSON.stringify(event.candidate, null, ' '));
         }
 
-        if (self.onicecandidate !== null) {
-            self.onicecandidate(event);
+        if (this.onicecandidate !== null) {
+            this.onicecandidate(event);
         }
     };
     this.onaddstream = null;
-    this.peerconnection.onaddstream = function(event) {
-        self.trace('onaddstream', event.stream.id);
-        if (self.onaddstream !== null) {
-            self.onaddstream(event);
+    this.peerconnection.onaddstream = event => {
+        this.trace('onaddstream', event.stream.id);
+        if (this.onaddstream !== null) {
+            this.onaddstream(event);
         }
     };
     this.onremovestream = null;
-    this.peerconnection.onremovestream = function(event) {
-        self.trace('onremovestream', event.stream.id);
-        if (self.onremovestream !== null) {
-            self.onremovestream(event);
+    this.peerconnection.onremovestream = event => {
+        this.trace('onremovestream', event.stream.id);
+        if (this.onremovestream !== null) {
+            this.onremovestream(event);
         }
     };
-    this.peerconnection.onaddstream = function(event) {
-        self._remoteStreamAdded(event.stream);
-    };
-    this.peerconnection.onremovestream = function(event) {
-        self._remoteStreamRemoved(event.stream);
-    };
+    this.peerconnection.onaddstream
+        = event => this._remoteStreamAdded(event.stream);
+    this.peerconnection.onremovestream
+        = event => this._remoteStreamRemoved(event.stream);
     this.onsignalingstatechange = null;
-    this.peerconnection.onsignalingstatechange = function(event) {
-        self.trace('onsignalingstatechange', self.signalingState);
-        if (self.onsignalingstatechange !== null) {
-            self.onsignalingstatechange(event);
+    this.peerconnection.onsignalingstatechange = event => {
+        this.trace('onsignalingstatechange', this.signalingState);
+        if (this.onsignalingstatechange !== null) {
+            this.onsignalingstatechange(event);
         }
     };
     this.oniceconnectionstatechange = null;
-    this.peerconnection.oniceconnectionstatechange = function(event) {
-        self.trace('oniceconnectionstatechange', self.iceConnectionState);
-        if (self.oniceconnectionstatechange !== null) {
-            self.oniceconnectionstatechange(event);
+    this.peerconnection.oniceconnectionstatechange = event => {
+        this.trace('oniceconnectionstatechange', this.iceConnectionState);
+        if (this.oniceconnectionstatechange !== null) {
+            this.oniceconnectionstatechange(event);
         }
     };
     this.onnegotiationneeded = null;
-    this.peerconnection.onnegotiationneeded = function(event) {
-        self.trace('onnegotiationneeded');
-        if (self.onnegotiationneeded !== null) {
-            self.onnegotiationneeded(event);
+    this.peerconnection.onnegotiationneeded = event => {
+        this.trace('onnegotiationneeded');
+        if (this.onnegotiationneeded !== null) {
+            this.onnegotiationneeded(event);
         }
     };
-    self.ondatachannel = null;
-    this.peerconnection.ondatachannel = function(event) {
-        self.trace('ondatachannel', event);
-        if (self.ondatachannel !== null) {
-            self.ondatachannel(event);
+    this.ondatachannel = null;
+    this.peerconnection.ondatachannel = event => {
+        this.trace('ondatachannel', event);
+        if (this.ondatachannel !== null) {
+            this.ondatachannel(event);
         }
     };
 
     // XXX: do all non-firefox browsers which we support also support this?
     if (!RTCBrowserType.isFirefox() && this.maxstats) {
         this.statsinterval = window.setInterval(() => {
-            self.peerconnection.getStats(stats => {
+            this.peerconnection.getStats(stats => {
                 const results = stats.result();
                 const now = new Date();
 
@@ -187,10 +190,10 @@ function TraceablePeerConnection(rtc, id, signalingLayer, iceConfig,
                     results[i].names().forEach(name => {
                         // eslint-disable-next-line no-shadow
                         const id = `${results[i].id}-${name}`;
-                        let s = self.stats[id];
+                        let s = this.stats[id];
 
                         if (!s) {
-                            self.stats[id] = s = {
+                            this.stats[id] = s = {
                                 startTime: now,
                                 endTime: now,
                                 values: [],
@@ -199,7 +202,7 @@ function TraceablePeerConnection(rtc, id, signalingLayer, iceConfig,
                         }
                         s.values.push(results[i].stat(name));
                         s.times.push(now.getTime());
-                        if (s.values.length > self.maxstats) {
+                        if (s.values.length > this.maxstats) {
                             s.values.shift();
                             s.times.shift();
                         }
@@ -207,11 +210,12 @@ function TraceablePeerConnection(rtc, id, signalingLayer, iceConfig,
                     });
                 }
             });
-
         }, 1000);
     }
 }
 
+/* eslint-enable max-params */
+
 /**
  * Returns a string representation of a SessionDescription object.
  */

modules/statistics/CallStats.js

@@ -189,6 +189,8 @@ CallStats.prototype.pcCallback = tryCatch((err, msg) => {
     }
 });
 
+/* eslint-disable max-params */
+
 /**
  * Lets CallStats module know where is given SSRC rendered by providing renderer
  * tag ID.
@@ -201,8 +203,11 @@ CallStats.prototype.pcCallback = tryCatch((err, msg) => {
  * @param containerId {string} the id of media 'audio' or 'video' tag which
  *        renders the stream.
  */
-CallStats.prototype.associateStreamWithVideoTag
-= function(ssrc, isLocal, usageLabel, containerId) {
+CallStats.prototype.associateStreamWithVideoTag = function(
+        ssrc,
+        isLocal,
+        usageLabel,
+        containerId) {
     if (!callStats) {
         return;
     }
@@ -242,6 +247,8 @@ CallStats.prototype.associateStreamWithVideoTag
     })();
 };
 
+/* eslint-enable max-params */
+
 /**
  * Notifies CallStats for mute events
  * @param mute {boolean} true for muted and false for not muted

modules/statistics/RTPStatsCollector.js

@@ -149,6 +149,8 @@ function ConferenceStats() {
     this.transport = [];
 }
 
+/* eslint-disable max-params */
+
 /**
  * <tt>StatsCollector</tt> registers for stats updates of given
  * <tt>peerconnection</tt> in given <tt>interval</tt>. On each update particular
@@ -218,6 +220,8 @@ function StatsCollector(
     this.ssrc2stats = {};
 }
 
+/* eslint-enable max-params */
+
 module.exports = StatsCollector;
 
 /**

modules/statistics/statistics.js

@@ -321,6 +321,8 @@ Statistics.sendActiveDeviceListEvent = function(devicesData) {
     }
 };
 
+/* eslint-disable max-params */
+
 /**
  * Lets the underlying statistics module know where is given SSRC rendered by
  * providing renderer tag ID.
@@ -332,13 +334,19 @@ Statistics.sendActiveDeviceListEvent = function(devicesData) {
  * @param containerId {string} the id of media 'audio' or 'video' tag which
  *        renders the stream.
  */
-Statistics.prototype.associateStreamWithVideoTag
-= function(ssrc, isLocal, usageLabel, containerId) {
-    if (this.callstats) {
-        this.callstats.associateStreamWithVideoTag(
-            ssrc, isLocal, usageLabel, containerId);
-    }
-};
+Statistics.prototype.associateStreamWithVideoTag = function(
+        ssrc,
+        isLocal,
+        usageLabel,
+        containerId) {
+    this.callstats && this.callstats.associateStreamWithVideoTag(
+        ssrc,
+        isLocal,
+        usageLabel,
+        containerId);
+};
+
+/* eslint-enable max-params */
 
 /**
  * Notifies CallStats that getUserMedia failed.

modules/transcription/recordingResult.js

@@ -1,3 +1,5 @@
+/* eslint-disable max-params */
+
 /**
  * This object stores variables needed around the recording of an audio stream
  * and passing this recording along with additional information along to
@@ -15,4 +17,6 @@ const RecordingResult = function(blob, name, startTime, wordArray) {
     this.wordArray = wordArray;
 };
 
+/* eslint-enable max-params */
+
 module.exports = RecordingResult;

modules/util/GlobalOnErrorHandler.js

@@ -18,11 +18,9 @@ const oldOnErrorHandler = window.onerror;
  * Custom error handler that calls the old global error handler and executes
  * all handlers that were previously added.
  */
-function JitsiGlobalErrorHandler(message, source, lineno, colno, error) {
-    handlers.forEach(handler => handler(message, source, lineno, colno, error));
-    if (oldOnErrorHandler) {
-        oldOnErrorHandler(message, source, lineno, colno, error);
-    }
+function JitsiGlobalErrorHandler(...args) {
+    handlers.forEach(handler => handler(...args));
+    oldOnErrorHandler && oldOnErrorHandler(...args);
 }
 
 // If an old handler exists, also fire its events.

modules/util/ScriptUtil.js

@@ -1,5 +1,6 @@
 const currentExecutingScript = require('current-executing-script');
 
+/* eslint-disable max-params */
 
 /**
  * Implements utility functions which facilitate the dealing with scripts such
@@ -21,8 +22,13 @@ const ScriptUtil = {
      * @param loadCallback on load callback function
      * @param errorCallback callback to be called on error loading the script
      */
-    loadScript(src, async, prepend, relativeURL,
-                          loadCallback, errorCallback) {
+    loadScript(
+            src,
+            async,
+            prepend,
+            relativeURL,
+            loadCallback,
+            errorCallback) {
         const d = document;
         const tagName = 'script';
         const script = d.createElement(tagName);
@@ -63,4 +69,6 @@ const ScriptUtil = {
     }
 };
 
+/* eslint-enable max-params */
+
 module.exports = ScriptUtil;

modules/xmpp/ChatRoom.js

@@ -84,6 +84,9 @@ function filterNodeFromPresenceJSON(pres, nodeName) {
 /* eslint-disable newline-per-chained-call */
 
 export default class ChatRoom extends Listenable {
+
+    /* eslint-disable max-params */
+
     constructor(connection, jid, password, XMPP, options) {
         super();
         this.xmpp = XMPP;
@@ -115,6 +118,8 @@ export default class ChatRoom extends Listenable {
         this.locked = false;
     }
 
+    /* eslint-enable max-params */
+
     initPresenceMap() {
         this.presMap.to = this.myroomjid;
         this.presMap.xns = 'http://jabber.org/protocol/muc';
@@ -724,6 +729,8 @@ export default class ChatRoom extends Listenable {
             error => logger.log('Kick participant error: ', error));
     }
 
+    /* eslint-disable max-params */
+
     lockRoom(key, onSuccess, onError, onNotSupported) {
         // http://xmpp.org/extensions/xep-0045.html#roomconfig
         this.connection.sendIQ(
@@ -782,6 +789,8 @@ export default class ChatRoom extends Listenable {
             onError);
     }
 
+    /* eslint-enable max-params */
+
     addToPresence(key, values) {
         values.tagName = key;
         this.removeFromPresence(key);

modules/xmpp/JingleSession.js

@@ -11,6 +11,8 @@ const logger = getLogger(__filename);
  */
 export default class JingleSession {
 
+    /* eslint-disable max-params */
+
     /**
      * Creates new <tt>JingleSession</tt>.
      * @param {string} sid the Jingle session identifier
@@ -22,8 +24,13 @@ export default class JingleSession {
      * @param {Object} iceConfig the ICE servers config object as defined by
      * the WebRTC. Passed to the PeerConnection's constructor.
      */
-    constructor(sid,
-                localJid, peerjid, connection, mediaConstraints, iceConfig) {
+    constructor(
+            sid,
+            localJid,
+            peerjid,
+            connection,
+            mediaConstraints,
+            iceConfig) {
         this.sid = sid;
         this.localJid = localJid;
         this.peerjid = peerjid;
@@ -61,6 +68,8 @@ export default class JingleSession {
         this.rtc = null;
     }
 
+    /* eslint-enable max-params */
+
     /**
      * Prepares this object to initiate a session.
      * @param {boolean} isInitiator whether we will be the Jingle initiator.
@@ -133,7 +142,7 @@ export default class JingleSession {
      * @param failure a callback called when either timeout occurs or ERROR
      * response is received.
      */
-    // eslint-disable-next-line no-unused-vars, no-empty-function
+    // eslint-disable-next-line max-params, no-unused-vars, no-empty-function
     terminate(reason, text, success, failure) { }
 
     /**

modules/xmpp/JingleSessionPC.js

@@ -24,6 +24,8 @@ const IQ_TIMEOUT = 10000;
 
 export default class JingleSessionPC extends JingleSession {
 
+    /* eslint-disable max-params */
+
     /**
      * Creates new <tt>JingleSessionPC</tt>
      * @param {string} sid the Jingle Session ID - random string which
@@ -48,8 +50,14 @@ export default class JingleSessionPC extends JingleSession {
      *
      * @implements {SignalingLayer}
      */
-    constructor(sid, me, peerjid, connection,
-                mediaConstraints, iceConfig, options) {
+    constructor(
+            sid,
+            me,
+            peerjid,
+            connection,
+            mediaConstraints,
+            iceConfig,
+            options) {
         super(sid, me, peerjid, connection, mediaConstraints, iceConfig);
 
         this.lasticecandidate = false;
@@ -98,6 +106,8 @@ export default class JingleSessionPC extends JingleSession {
             = async.queue(this._processQueueTasks.bind(this), 1);
     }
 
+    /* eslint-enable max-params */
+
     doInitialize() {
         this.lasticecandidate = false;
 
@@ -623,6 +633,8 @@ export default class JingleSessionPC extends JingleSession {
             IQ_TIMEOUT);
     }
 
+    /* eslint-disable max-params */
+
     /**
      * @inheritDoc
      */
@@ -658,6 +670,8 @@ export default class JingleSessionPC extends JingleSession {
         this.connection.jingle.terminate(this.sid);
     }
 
+    /* eslint-enable max-params */
+
     onTerminated(reasonCondition, reasonText) {
         this.state = 'ended';
 
@@ -1156,6 +1170,8 @@ export default class JingleSessionPC extends JingleSession {
         return removeSsrcInfo;
     }
 
+    /* eslint-disable max-params */
+
     /**
      * Adds stream.
      * @param stream new stream that will be added.
@@ -1175,7 +1191,6 @@ export default class JingleSessionPC extends JingleSession {
      *  the 'doReplaceStream' task or the 'doAddStream' task (for example)
      */
     addStream(stream, callback, errorCallback, ssrcInfo, dontModifySources) {
-
         const workFunction = finishedCallback => {
             if (!this.peerconnection) {
                 finishedCallback(
@@ -1221,6 +1236,8 @@ export default class JingleSessionPC extends JingleSession {
             });
     }
 
+    /* eslint-enable max-params */
+
     /**
      * Generate ssrc info object for a stream with the following properties:
      * - ssrcs - Array of the ssrcs associated with the stream.
@@ -1300,6 +1317,8 @@ export default class JingleSessionPC extends JingleSession {
         }
     }
 
+    /* eslint-disable max-params */
+
     /**
      * Remove streams.
      * @param stream stream that will be removed.
@@ -1348,6 +1367,8 @@ export default class JingleSessionPC extends JingleSession {
             });
     }
 
+    /* eslint-enable max-params */
+
     /**
      * Figures out added/removed ssrcs and send update IQs.
      * @param oldSDP SDP object for old description.

modules/xmpp/moderator.js

@@ -11,7 +11,6 @@ import Settings from '../settings/Settings';
 function createExpBackoffTimer(step) {
     let count = 1;
 
-
     return function(reset) {
         // Reset call
         if (reset) {
@@ -29,6 +28,8 @@ function createExpBackoffTimer(step) {
     };
 }
 
+/* eslint-disable max-params */
+
 function Moderator(roomName, xmpp, emitter, options) {
     this.roomName = roomName;
     this.xmppService = xmpp;
@@ -42,8 +43,9 @@ function Moderator(roomName, xmpp, emitter, options) {
     // Sip gateway can be enabled by configuring Jigasi host in config.js or
     // it will be enabled automatically if focus detects the component through
     // service discovery.
-    this.sipGatewayEnabled = this.options.connection.hosts
-        && this.options.connection.hosts.call_control !== undefined;
+    this.sipGatewayEnabled
+        = this.options.connection.hosts
+            && this.options.connection.hosts.call_control !== undefined;
 
     this.eventEmitter = emitter;
 
@@ -74,6 +76,8 @@ function Moderator(roomName, xmpp, emitter, options) {
     }
 }
 
+/* eslint-enable max-params */
+
 Moderator.prototype.isExternalAuthEnabled = function() {
     return this.externalAuthEnabled;
 };

modules/xmpp/recording.js

@@ -6,8 +6,15 @@ const XMPPEvents = require('../../service/xmpp/XMPPEvents');
 const JitsiRecorderErrors = require('../../JitsiRecorderErrors');
 const GlobalOnErrorHandler = require('../util/GlobalOnErrorHandler');
 
-function Recording(type, eventEmitter, connection, focusMucJid, jirecon,
-    roomjid) {
+/* eslint-disable max-params */
+
+function Recording(
+        type,
+        eventEmitter,
+        connection,
+        focusMucJid,
+        jirecon,
+        roomjid) {
     this.eventEmitter = eventEmitter;
     this.connection = connection;
     this.state = null;
@@ -30,6 +37,8 @@ function Recording(type, eventEmitter, connection, focusMucJid, jirecon,
     this.roomjid = roomjid;
 }
 
+/* eslint-enable max-params */
+
 Recording.types = {
     COLIBRI: 'colibri',
     JIRECON: 'jirecon',
@@ -84,42 +93,50 @@ Recording.prototype.handleJibriPresence = function(jibri) {
     this.eventEmitter.emit(XMPPEvents.RECORDER_STATE_CHANGED, this.state);
 };
 
-Recording.prototype.setRecordingJibri
-    = function(state, callback, errCallback, options = {}) {
+/* eslint-disable max-params */
 
-        if (state === this.state) {
-            errCallback(JitsiRecorderErrors.INVALID_STATE);
-        }
-
-        // FIXME jibri does not accept IQ without 'url' attribute set ?
-        const iq
-            = $iq({ to: this.focusMucJid,
-                type: 'set' })
-                .c('jibri', {
-                    'xmlns': 'http://jitsi.org/protocol/jibri',
-                    'action': state === Recording.status.ON
-                            ? Recording.action.START
-                            : Recording.action.STOP,
-                    'streamid': options.streamId
-                })
-                .up();
-
-        logger.log(`Set jibri recording: ${state}`, iq.nodeTree);
-        logger.log(iq.nodeTree);
-        this.connection.sendIQ(
-        iq,
-        result => {
-            logger.log('Result', result);
+Recording.prototype.setRecordingJibri = function(
+        state,
+        callback,
+        errCallback,
+        options = {}) {
+    if (state === this.state) {
+        errCallback(JitsiRecorderErrors.INVALID_STATE);
+    }
 
-            const jibri = $(result).find('jibri');
+    // FIXME jibri does not accept IQ without 'url' attribute set ?
+    const iq
+        = $iq({
+            to: this.focusMucJid,
+            type: 'set'
+        })
+            .c('jibri', {
+                'xmlns': 'http://jitsi.org/protocol/jibri',
+                'action': state === Recording.status.ON
+                        ? Recording.action.START
+                        : Recording.action.STOP,
+                'streamid': options.streamId
+            })
+            .up();
+
+    logger.log(`Set jibri recording: ${state}`, iq.nodeTree);
+    logger.log(iq.nodeTree);
+    this.connection.sendIQ(
+    iq,
+    result => {
+        logger.log('Result', result);
+
+        const jibri = $(result).find('jibri');
+
+        callback(jibri.attr('state'), jibri.attr('url'));
+    },
+    error => {
+        logger.log('Failed to start recording, error: ', error);
+        errCallback(error);
+    });
+};
 
-            callback(jibri.attr('state'), jibri.attr('url'));
-        },
-        error => {
-            logger.log('Failed to start recording, error: ', error);
-            errCallback(error);
-        });
-    };
+/* eslint-enable max-params */
 
 Recording.prototype.setRecordingJirecon
     = function(state, callback, errCallback) {
@@ -166,23 +183,33 @@ Recording.prototype.setRecordingJirecon
         });
     };
 
+/* eslint-disable max-params */
+
 // Sends a COLIBRI message which enables or disables (according to 'state')
 // the recording on the bridge. Waits for the result IQ and calls 'callback'
 // with the new recording state, according to the IQ.
-Recording.prototype.setRecordingColibri
-= function(state, callback, errCallback, options) {
-    const elem = $iq({ to: this.focusMucJid,
-        type: 'set' });
+Recording.prototype.setRecordingColibri = function(
+        state,
+        callback,
+        errCallback,
+        options) {
+    const elem = $iq({
+        to: this.focusMucJid,
+        type: 'set'
+    });
 
     elem.c('conference', {
         xmlns: 'http://jitsi.org/protocol/colibri'
     });
-    elem.c('recording', { state,
-        token: options.token });
+    elem.c('recording', {
+        state,
+        token: options.token
+    });
 
     const self = this;
 
-    this.connection.sendIQ(elem,
+    this.connection.sendIQ(
+        elem,
         result => {
             logger.log('Set recording "', state, '". Result:', result);
             const recordingElem = $(result).find('>conference>recording');
@@ -210,17 +237,18 @@ Recording.prototype.setRecordingColibri
     );
 };
 
-Recording.prototype.setRecording
-= function(state, callback, errCallback, options) {
+/* eslint-enable max-params */
+
+Recording.prototype.setRecording = function(...args) {
     switch (this.type) {
     case Recording.types.JIRECON:
-        this.setRecordingJirecon(state, callback, errCallback, options);
+        this.setRecordingJirecon(...args);
         break;
     case Recording.types.COLIBRI:
-        this.setRecordingColibri(state, callback, errCallback, options);
+        this.setRecordingColibri(...args);
         break;
     case Recording.types.JIBRI:
-        this.setRecordingJibri(state, callback, errCallback, options);
+        this.setRecordingJibri(...args);
         break;
     default: {
         const errmsg = 'Unknown recording type!';

modules/xmpp/strophe.ping.js

@@ -47,23 +47,28 @@ class PingConnectionPlugin extends ConnectionPlugin {
         Strophe.addNamespace('PING', 'urn:xmpp:ping');
     }
 
+    /* eslint-disable max-params */
+
     /**
      * Sends "ping" to given <tt>jid</tt>
      * @param jid the JID to which ping request will be sent.
      * @param success callback called on success.
      * @param error callback called on error.
      * @param timeout ms how long are we going to wait for the response. On
-     *        timeout <tt>error<//t> callback is called with undefined error
-     *        argument.
+     * timeout <tt>error<//t> callback is called with undefined error argument.
      */
     ping(jid, success, error, timeout) {
-        const iq = $iq({ type: 'get',
-            to: jid });
+        const iq = $iq({
+            type: 'get',
+            to: jid
+        });
 
         iq.c('ping', { xmlns: Strophe.NS.PING });
         this.connection.sendIQ(iq, success, error, timeout);
     }
 
+    /* eslint-enable max-params */
+
     /**
      * Checks if given <tt>jid</tt> has XEP-0199 ping support.
      * @param jid the JID to be checked for ping support.

modules/xmpp/strophe.rayo.js

@@ -19,6 +19,8 @@ class RayoConnectionPlugin extends ConnectionPlugin {
         logger.info('Rayo IQ', iq);
     }
 
+    /* eslint-disable max-params */
+
     dial(to, from, roomName, roomPass, focusMucJid) {
         return new Promise((resolve, reject) => {
             if (!focusMucJid) {
@@ -48,22 +50,27 @@ class RayoConnectionPlugin extends ConnectionPlugin {
                 }).up();
             }
 
-            this.connection.sendIQ(req, result => {
-                logger.info('Dial result ', result);
-
-                // eslint-disable-next-line newline-per-chained-call
-                const resource = $(result).find('ref').attr('uri');
-
-                this.callResource = resource.substr('xmpp:'.length);
-                logger.info(`Received call resource: ${this.callResource}`);
-                resolve();
-            }, error => {
-                logger.info('Dial error ', error);
-                reject(error);
-            });
+            this.connection.sendIQ(
+                req,
+                result => {
+                    logger.info('Dial result ', result);
+
+                    // eslint-disable-next-line newline-per-chained-call
+                    const resource = $(result).find('ref').attr('uri');
+
+                    this.callResource = resource.substr('xmpp:'.length);
+                    logger.info(`Received call resource: ${this.callResource}`);
+                    resolve();
+                },
+                error => {
+                    logger.info('Dial error ', error);
+                    reject(error);
+                });
         });
     }
 
+    /* eslint-enable max-params */
+
     hangup() {
         return new Promise((resolve, reject) => {
             if (!this.callResource) {

modules/xmpp/xmpp.js

@@ -324,8 +324,8 @@ export default class XMPP extends Listenable {
         return (this.connection.logger || {}).log || null;
     }
 
-    dial(to, from, roomName, roomPass) {
-        this.connection.rayo.dial(to, from, roomName, roomPass);
+    dial(...args) {
+        this.connection.rayo.dial(...args);
     }
 
     setMute(jid, mute) {