Merge branch 'master' into eslint_improvements

.eslintrc.js

@@ -82,6 +82,11 @@ module.exports = {
         'brace-style': 2,
         'indent': [ 'error', 4, { 'SwitchCase': 0 } ],
 
+        'object-shorthand': [
+            'error',
+            'always',
+            { 'avoidQuotes': true }
+        ],
         'prefer-const': 2,
         'prefer-reflect': 0,
         'prefer-spread': 2,

JitsiConference.js

@@ -1409,7 +1409,7 @@ JitsiConference.prototype.getConnectionTimes = function () {
  * Sets a property for the local participant.
  */
 JitsiConference.prototype.setLocalParticipantProperty = function(name, value) {
-    this.sendCommand("jitsi_participant_" + name, {value: value});
+    this.sendCommand("jitsi_participant_" + name, {value});
 };
 
 /**

JitsiConferenceEventManager.js

@@ -76,12 +76,12 @@ JitsiConferenceEventManager.prototype.setupChatRoomListeners = function () {
             for (key in chatRoom.connectionTimes){
                 value = chatRoom.connectionTimes[key];
                 Statistics.analytics.sendEvent('conference.' + key,
-                    {value: value});
+                    {value});
             }
             for (key in chatRoom.xmpp.connectionTimes){
                 value = chatRoom.xmpp.connectionTimes[key];
                 Statistics.analytics.sendEvent('xmpp.' + key,
-                    {value: value});
+                    {value});
             }
         });
 
@@ -234,7 +234,7 @@ JitsiConferenceEventManager.prototype.setupChatRoomListeners = function () {
                 function (status, error) {
                     var logObject = {
                         id: "recorder_status",
-                        status: status
+                        status
                     };
                     if (error) {
                         logObject.error = error;

JitsiConnection.js

@@ -34,7 +34,7 @@ function JitsiConnection(appID, token, options) {
                     'connection.disconnected.' + msg);
             }
             Statistics.sendLog(
-                JSON.stringify({id: "connection.disconnected", msg: msg}));
+                JSON.stringify({id: "connection.disconnected", msg}));
         });
 }
 
@@ -92,7 +92,7 @@ JitsiConnection.prototype.setToken = function (token) {
  * @returns {JitsiConference} returns the new conference object.
  */
 JitsiConnection.prototype.initJitsiConference = function (name, options) {
-    return new JitsiConference({name: name, config: options, connection: this});
+    return new JitsiConference({name, config: options, connection: this});
 };
 
 /**

JitsiMediaDevices.js

@@ -41,7 +41,7 @@ var JitsiMediaDevices = {
      * Executes callback with list of media devices connected.
      * @param {function} callback
      */
-    enumerateDevices: function (callback) {
+    enumerateDevices (callback) {
         RTC.enumerateDevices(callback);
     },
     /**
@@ -50,7 +50,7 @@ var JitsiMediaDevices = {
      * the WebRTC stack is ready, either with true if the device listing is
      * available available or with false otherwise.
      */
-    isDeviceListAvailable: function () {
+    isDeviceListAvailable () {
         return RTC.isDeviceListAvailable();
     },
     /**
@@ -60,7 +60,7 @@ var JitsiMediaDevices = {
      *      undefined or 'input', 'output' - for audio output device change.
      * @returns {boolean} true if available, false otherwise.
      */
-    isDeviceChangeAvailable: function (deviceType) {
+    isDeviceChangeAvailable (deviceType) {
         return RTC.isDeviceChangeAvailable(deviceType);
     },
     /**
@@ -69,7 +69,7 @@ var JitsiMediaDevices = {
      *      undefined stands for both 'audio' and 'video' together
      * @returns {boolean}
      */
-    isDevicePermissionGranted: function (type) {
+    isDevicePermissionGranted (type) {
         var permissions = RTC.getDeviceAvailability();
 
         switch(type) {
@@ -86,7 +86,7 @@ var JitsiMediaDevices = {
      * for default device
      * @returns {string}
      */
-    getAudioOutputDevice: function () {
+    getAudioOutputDevice () {
         return RTC.getAudioOutputDevice();
     },
     /**
@@ -97,7 +97,7 @@ var JitsiMediaDevices = {
      * @returns {Promise} - resolves when audio output is changed, is rejected
      *      otherwise
      */
-    setAudioOutputDevice: function (deviceId) {
+    setAudioOutputDevice (deviceId) {
 
         var availableDevices = RTC.getCurrentlyAvailableMediaDevices();
         if (availableDevices && availableDevices.length > 0) {
@@ -114,7 +114,7 @@ var JitsiMediaDevices = {
      * @param {string} event - event name
      * @param {function} handler - event handler
      */
-    addEventListener: function (event, handler) {
+    addEventListener (event, handler) {
         eventEmitter.addListener(event, handler);
     },
     /**
@@ -122,14 +122,14 @@ var JitsiMediaDevices = {
      * @param {string} event - event name
      * @param {function} handler - event handler
      */
-    removeEventListener: function (event, handler) {
+    removeEventListener (event, handler) {
         eventEmitter.removeListener(event, handler);
     },
     /**
      * Emits an event.
      * @param {string} event - event name
      */
-    emitEvent: function (event) { // eslint-disable-line no-unused-vars
+    emitEvent (event) { // eslint-disable-line no-unused-vars
         eventEmitter.emit(...arguments);
     }
 };

JitsiMeetJS.js

@@ -77,7 +77,7 @@ var LibJitsiMeet = {
 
     version: '{#COMMIT_HASH#}',
 
-    JitsiConnection: JitsiConnection,
+    JitsiConnection,
     events: {
         conference: JitsiConferenceEvents,
         connection: JitsiConnectionEvents,
@@ -92,12 +92,12 @@ var LibJitsiMeet = {
         track: JitsiTrackErrors
     },
     errorTypes: {
-        JitsiTrackError: JitsiTrackError
+        JitsiTrackError
     },
     logLevels: Logger.levels,
     mediaDevices: JitsiMediaDevices,
     analytics: null,
-    init: function (options) {
+    init (options) {
         let logObject, attr;
         Statistics.init(options);
 
@@ -140,10 +140,10 @@ var LibJitsiMeet = {
      * Returns whether the desktop sharing is enabled or not.
      * @returns {boolean}
      */
-    isDesktopSharingEnabled: function () {
+    isDesktopSharingEnabled () {
         return RTC.isDesktopSharingEnabled();
     },
-    setLogLevel: function (level) {
+    setLogLevel (level) {
         Logger.setLogLevel(level);
     },
     /**
@@ -153,7 +153,7 @@ var LibJitsiMeet = {
      * Usually it's the name of the JavaScript source file including the path
      * ex. "modules/xmpp/ChatRoom.js"
      */
-    setLogLevelById: function (level, id) {
+    setLogLevelById (level, id) {
         Logger.setLogLevelById(level, id);
     },
     /**
@@ -161,7 +161,7 @@ var LibJitsiMeet = {
      * @param globalTransport
      * @see Logger.addGlobalTransport
      */
-    addGlobalLogTransport: function (globalTransport) {
+    addGlobalLogTransport (globalTransport) {
         Logger.addGlobalTransport(globalTransport);
     },
     /**
@@ -169,7 +169,7 @@ var LibJitsiMeet = {
      * @param globalTransport
      * @see Logger.removeGlobalTransport
      */
-    removeGlobalLogTransport: function (globalTransport) {
+    removeGlobalLogTransport (globalTransport) {
         Logger.removeGlobalTransport(globalTransport);
     },
     /**
@@ -211,7 +211,7 @@ var LibJitsiMeet = {
      *     A promise that returns an array of created JitsiTracks if resolved,
      *     or a JitsiConferenceError if rejected.
      */
-    createLocalTracks: function (options, firePermissionPromptIsShownEvent) {
+    createLocalTracks (options, firePermissionPromptIsShownEvent) {
         var promiseFulfilled = false;
 
         if (firePermissionPromptIsShownEvent === true) {
@@ -332,7 +332,7 @@ var LibJitsiMeet = {
      * available available or with false otherwise.
      * @deprecated use JitsiMeetJS.mediaDevices.isDeviceListAvailable instead
      */
-    isDeviceListAvailable: function () {
+    isDeviceListAvailable () {
         logger.warn('This method is deprecated, use ' +
             'JitsiMeetJS.mediaDevices.isDeviceListAvailable instead');
         return this.mediaDevices.isDeviceListAvailable();
@@ -345,7 +345,7 @@ var LibJitsiMeet = {
      * @returns {boolean} true if available, false otherwise.
      * @deprecated use JitsiMeetJS.mediaDevices.isDeviceChangeAvailable instead
      */
-    isDeviceChangeAvailable: function (deviceType) {
+    isDeviceChangeAvailable (deviceType) {
         logger.warn('This method is deprecated, use ' +
             'JitsiMeetJS.mediaDevices.isDeviceChangeAvailable instead');
         return this.mediaDevices.isDeviceChangeAvailable(deviceType);
@@ -355,7 +355,7 @@ var LibJitsiMeet = {
      * @param {function} callback
      * @deprecated use JitsiMeetJS.mediaDevices.enumerateDevices instead
      */
-    enumerateDevices: function (callback) {
+    enumerateDevices (callback) {
         logger.warn('This method is deprecated, use ' +
             'JitsiMeetJS.mediaDevices.enumerateDevices instead');
         this.mediaDevices.enumerateDevices(callback);
@@ -366,7 +366,7 @@ var LibJitsiMeet = {
      * the function used by the lib.
      * (function(message, source, lineno, colno, error)).
      */
-    getGlobalOnErrorHandler: function (message, source, lineno, colno, error) {
+    getGlobalOnErrorHandler (message, source, lineno, colno, error) {
         logger.error(
             'UnhandledError: ' + message,
             'Script: ' + source,
@@ -380,7 +380,7 @@ var LibJitsiMeet = {
      * Returns current machine id saved from the local storage.
      * @returns {string} the machine id
      */
-    getMachineId: function() {
+    getMachineId() {
         return Settings.getMachineId();
     },
 
@@ -389,9 +389,9 @@ var LibJitsiMeet = {
      * interest to LibJitsiMeet clients.
      */
     util: {
-        ScriptUtil: ScriptUtil,
-        RTCUIHelper: RTCUIHelper,
-        AuthUtil: AuthUtil
+        ScriptUtil,
+        RTCUIHelper,
+        AuthUtil
     }
 };
 

modules/RTC/DataChannels.js

@@ -275,7 +275,7 @@ DataChannels.prototype.send = function (jsonObject) {
 DataChannels.prototype.sendDataChannelMessage = function (to, payload) {
     this.send({
         colibriClass: "EndpointMessage",
-        to: to,
+        to,
         msgPayload: payload
     });
 };

modules/RTC/RTCUIHelper.js

@@ -10,7 +10,7 @@ var RTCUIHelper = {
      * currently using.
      * @returns {string} 'video' or 'object' string name of WebRTC video element
      */
-    getVideoElementName: function () {
+    getVideoElementName () {
         return RTCBrowserType.isTemasysPluginUsed() ? 'object' : 'video';
     },
 
@@ -21,7 +21,7 @@ var RTCUIHelper = {
      * @returns {HTMLElement} video HTML element instance if found inside of the
      *          container or undefined otherwise.
      */
-    findVideoElement: function (containerElement) {
+    findVideoElement (containerElement) {
         var videoElemName = RTCUIHelper.getVideoElementName();
         if (!RTCBrowserType.isTemasysPluginUsed()) {
             return $(containerElement).find(videoElemName)[0];
@@ -45,7 +45,7 @@ var RTCUIHelper = {
      * @param streamElement HTML element to which the RTC stream is attached to.
      * @param volume the volume value to be set.
      */
-    setVolume: function (streamElement, volume) {
+    setVolume (streamElement, volume) {
         if (!RTCBrowserType.isIExplorer()) {
             streamElement.volume = volume;
         }
@@ -56,7 +56,7 @@ var RTCUIHelper = {
      * @param streamElement HTML element to which the RTC stream is attached to.
      * @param autoPlay 'true' or 'false'
      */
-    setAutoPlay: function (streamElement, autoPlay) {
+    setAutoPlay (streamElement, autoPlay) {
         if (!RTCBrowserType.isIExplorer()) {
             streamElement.autoplay = autoPlay;
         }

modules/RTC/RTCUtils.js

@@ -178,7 +178,7 @@ function getConstraints(um, options) {
                 constraints.video.facingMode = facingMode;
             }
             constraints.video.optional.push({
-                facingMode: facingMode
+                facingMode
             });
         }
 
@@ -639,7 +639,7 @@ function handleLocalStream(streams, resolution) {
             track: videoStream.getVideoTracks()[0],
             mediaType: MediaType.VIDEO,
             videoType: VideoType.CAMERA,
-            resolution: resolution
+            resolution
         });
     }
 
@@ -1034,9 +1034,9 @@ class RTCUtils extends Listenable {
                 obtainDevices({
                     devices: options.devices,
                     streams: [],
-                    successCallback: successCallback,
+                    successCallback,
                     errorCallback: reject,
-                    deviceGUM: deviceGUM
+                    deviceGUM
                 });
             } else {
                 var hasDesktop = options.devices.indexOf('desktop') > -1;
@@ -1108,7 +1108,7 @@ class RTCUtils extends Listenable {
                                     dsOptions,
                                     function (desktopStream) {
                                         successCallback({audioVideo: stream,
-                                            desktopStream: desktopStream});
+                                            desktopStream});
                                     }, function (error) {
                                         self.stopMediaStream(stream);
 

modules/RTC/TraceablePeerConnection.js

@@ -563,13 +563,13 @@ var normalizePlanB = function(desc) {
 };
 
 var getters = {
-    signalingState: function () {
+    signalingState () {
         return this.peerconnection.signalingState;
     },
-    iceConnectionState: function () {
+    iceConnectionState () {
         return this.peerconnection.iceConnectionState;
     },
-    localDescription:  function() {
+    localDescription() {
         var desc = this.peerconnection.localDescription;
 
         this.trace('getLocalDescription::preTransform', dumpSDP(desc));
@@ -582,7 +582,7 @@ var getters = {
         }
         return desc;
     },
-    remoteDescription:  function() {
+    remoteDescription() {
         var desc = this.peerconnection.remoteDescription;
         this.trace('getRemoteDescription::preTransform', dumpSDP(desc));
 

modules/statistics/AnalyticsAdapter.js

@@ -24,8 +24,8 @@ class CacheAnalytics extends AnalyticsAbstract {
      */
     sendEvent(action, data = {}) {
         this.eventCache.push({
-            action: action,
-            data: data
+            action,
+            data
         });
     }
 

modules/statistics/CallStats.js

@@ -357,7 +357,7 @@ CallStats._reportEvent = function (event, eventData) {
     } else {
         CallStats.reportsQueue.push({
             type: reportType.EVENT,
-            data: {event: event, eventData: eventData}
+            data: {event, eventData}
         });
         CallStats._checkInitialize();
     }
@@ -422,7 +422,7 @@ CallStats._reportError = function (type, e, pc) {
     } else {
         CallStats.reportsQueue.push({
             type: reportType.ERROR,
-            data: { type: type, error: e, pc: pc}
+            data: { type, error: e, pc}
         });
         CallStats._checkInitialize();
     }

modules/statistics/RTPStatsCollector.js

@@ -427,7 +427,7 @@ StatsCollector.prototype.processStatsReport = function () {
                 );
             })) {
                 conferenceStatsTransport.push(
-                    {ip: ip, type: type, localip: localip});
+                    {ip, type, localip});
             }
             continue;
         }
@@ -487,7 +487,7 @@ StatsCollector.prototype.processStatsReport = function () {
         ssrcStats.setLoss({
             packetsTotal: packetsDiff + packetsLostDiff,
             packetsLost: packetsLostDiff,
-            isDownloadStream: isDownloadStream
+            isDownloadStream
         });
 
         var bytesReceivedNow = getNonNegativeStat(now, 'bytesReceived');

modules/statistics/statistics.js

@@ -439,7 +439,7 @@ Statistics.prototype.sendFeedback = function(overall, detailed) {
         this.callstats.sendFeedback(overall, detailed);
     }
     Statistics.analytics.sendEvent("feedback.rating",
-        {value: overall, detailed: detailed});
+        {value: overall, detailed});
 };
 
 Statistics.LOCAL_JID = require("../../service/statistics/constants").LOCAL_JID;

modules/transcription/transcriberHolder.js

@@ -8,7 +8,7 @@
 var transcriberHolder = {
     transcribers : [],
 
-    add : function(transcriber){
+    add(transcriber){
         transcriberHolder.transcribers.push(transcriber);
     }
 };

modules/util/AuthUtil.js

@@ -20,7 +20,7 @@ var AuthUtil = {
      * <tt>null</tt> if 'urlPattern' is not a string and the URL can not be
      * constructed.
      */
-    getTokenAuthUrl: function (urlPattern, roomName, roleUpgrade) {
+    getTokenAuthUrl (urlPattern, roomName, roleUpgrade) {
         var url = urlPattern;
         if (typeof url !== "string") {
             return null;

modules/util/GlobalOnErrorHandler.js

@@ -53,14 +53,14 @@ var GlobalOnErrorHandler = {
      * Adds new error handlers.
      * @param handler the new handler.
      */
-    addHandler: function (handler) {
+    addHandler (handler) {
         handlers.push(handler);
     },
     /**
      * Calls the global error handler if there is one.
      * @param error the error to pass to the error handler
      */
-    callErrorHandler: function (error) {
+    callErrorHandler (error) {
         var errHandler = window.onerror;
         if(!errHandler) {
             return;
@@ -71,7 +71,7 @@ var GlobalOnErrorHandler = {
      * Calls the global rejection handler if there is one.
      * @param error the error to pass to the rejection handler.
      */
-    callUnhandledRejectionHandler: function (error) {
+    callUnhandledRejectionHandler (error) {
         var errHandler = window.onunhandledrejection;
         if(!errHandler) {
             return;

modules/util/RandomUtil.js

@@ -52,23 +52,23 @@ var RandomUtil = {
      * Returns a random hex digit.
      * @returns {*}
      */
-    randomHexDigit: function() {
+    randomHexDigit() {
         return randomElement(HEX_DIGITS);
     },
     /**
      * Returns a random string of hex digits with length 'len'.
      * @param len the length.
      */
-    randomHexString: function (len) {
+    randomHexString (len) {
         var ret = '';
         while (len--) {
             ret += this.randomHexDigit();
         }
         return ret;
     },
-    randomElement: randomElement,
-    randomAlphanumStr: randomAlphanumStr,
-    randomInt: randomInt
+    randomElement,
+    randomAlphanumStr,
+    randomInt
 };
 
 module.exports = RandomUtil;

modules/util/ScriptUtil.js

@@ -21,7 +21,7 @@ var ScriptUtil = {
      * @param loadCallback on load callback function
      * @param errorCallback callback to be called on error loading the script
      */
-    loadScript: function (src, async, prepend, relativeURL,
+    loadScript (src, async, prepend, relativeURL,
                           loadCallback, errorCallback) {
         var d = document;
         var tagName = 'script';

modules/util/UsernameGenerator.js

@@ -437,5 +437,5 @@ function generateUsername () {
 }
 
 module.exports = {
-    generateUsername: generateUsername
+    generateUsername
 };

modules/version/ComponentsVersions.js

@@ -69,7 +69,7 @@ ComponentsVersions.prototype.processPresence =
                 log.push({
                     id: "component_version",
                     component: componentName,
-                    version: version});
+                    version});
             }
         }.bind(this));
 

modules/xmpp/ChatRoom.js

@@ -10,12 +10,12 @@ import XMPPEvents from "../../service/xmpp/XMPPEvents";
 const logger = getLogger(__filename);
 
 var parser = {
-    packet2JSON: function (packet, nodes) {
+    packet2JSON (packet, nodes) {
         var self = this;
         $(packet).children().each(function () {
             var tagName = $(this).prop("tagName");
             const node = {
-                tagName: tagName
+                tagName
             };
             node.attributes = {};
             $($(this)[0].attributes).each(function( index, attr ) {
@@ -30,7 +30,7 @@ var parser = {
             self.packet2JSON($(this), node.children);
         });
     },
-    json2packet: function (nodes, packet) {
+    json2packet (nodes, packet) {
         for(let i = 0; i < nodes.length; i++) {
             const node = nodes[i];
             if(!node || node === null){
@@ -139,7 +139,7 @@ export default class ChatRoom extends Listenable {
             return;
         }
 
-        var pres = $pres({to: to });
+        var pres = $pres({to });
 
         // xep-0045 defines: "including in the initial presence stanza an empty
         // <x/> element qualified by the 'http://jabber.org/protocol/muc' namespace"
@@ -877,7 +877,7 @@ export default class ChatRoom extends Listenable {
             {to: this.focusMucJid, type: 'set'})
             .c('mute', {
                 xmlns: 'http://jitsi.org/jitmeet/audio',
-                jid: jid
+                jid
             })
             .t(mute.toString())
             .up();

modules/xmpp/RtxModifier.js

@@ -162,8 +162,8 @@ export default class RtxModifier {
                 videoMLine,
                 {
                     id: ssrc,
-                    cname: cname,
-                    msid: msid
+                    cname,
+                    msid
                 },
                 correspondingRtxSsrc);
         }

modules/xmpp/SDP.js

@@ -50,8 +50,8 @@ SDP.prototype.getMediaSsrcMap = function() {
         tmp = SDPUtil.find_lines(self.media[mediaindex], 'a=ssrc:');
         var mid = SDPUtil.parse_mid(SDPUtil.find_line(self.media[mediaindex], 'a=mid:'));
         var media = {
-            mediaindex: mediaindex,
-            mid: mid,
+            mediaindex,
+            mid,
             ssrcs: {},
             ssrcGroups: []
         };
@@ -74,8 +74,8 @@ SDP.prototype.getMediaSsrcMap = function() {
             var ssrcs = line.substr(14 + semantics.length).split(' ');
             if (ssrcs.length) {
                 media.ssrcGroups.push({
-                    semantics: semantics,
-                    ssrcs: ssrcs
+                    semantics,
+                    ssrcs
                 });
             }
         });
@@ -160,7 +160,7 @@ SDP.prototype.toJingle = function (elem, thecreator) {
         for (i = 0; i < lines.length; i++) {
             tmp = lines[i].split(' ');
             var semantics = tmp.shift().substr(8);
-            elem.c('group', {xmlns: 'urn:xmpp:jingle:apps:grouping:0', semantics:semantics});
+            elem.c('group', {xmlns: 'urn:xmpp:jingle:apps:grouping:0', semantics});
             for (j = 0; j < tmp.length; j++) {
                 elem.c('content', {name: tmp[j]}).up();
             }
@@ -194,7 +194,7 @@ SDP.prototype.toJingle = function (elem, thecreator) {
                 {xmlns: 'urn:xmpp:jingle:apps:rtp:1',
                     media: mline.media });
             if (ssrc) {
-                elem.attrs({ssrc: ssrc});
+                elem.attrs({ssrc});
             }
             for (j = 0; j < mline.fmt.length; j++) {
                 rtpmap = SDPUtil.find_line(this.media[i], 'a=rtpmap:' + mline.fmt[j]);
@@ -222,7 +222,7 @@ SDP.prototype.toJingle = function (elem, thecreator) {
 
             if (ssrc) {
                 // new style mapping
-                elem.c('source', { ssrc: ssrc, xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0' });
+                elem.c('source', { ssrc, xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0' });
                 // FIXME: group by ssrc and support multiple different ssrcs
                 var ssrclines = SDPUtil.find_lines(this.media[i], 'a=ssrc:');
                 if(ssrclines.length > 0) {
@@ -232,7 +232,7 @@ SDP.prototype.toJingle = function (elem, thecreator) {
                         if (linessrc != ssrc) {
                             elem.up();
                             ssrc = linessrc;
-                            elem.c('source', { ssrc: ssrc, xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0' });
+                            elem.c('source', { ssrc, xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0' });
                         }
                         var kv = line.substr(idx + 1);
                         elem.c('parameter');
@@ -250,7 +250,7 @@ SDP.prototype.toJingle = function (elem, thecreator) {
                     });
                 } else {
                     elem.up();
-                    elem.c('source', { ssrc: ssrc, xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0' });
+                    elem.c('source', { ssrc, xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0' });
                     elem.c('parameter');
                     elem.attrs({name: "cname", value:Math.random().toString(36).substring(7)});
                     elem.up();
@@ -285,9 +285,9 @@ SDP.prototype.toJingle = function (elem, thecreator) {
                     var semantics = line.substr(0, idx).substr(13);
                     var ssrcs = line.substr(14 + semantics.length).split(' ');
                     if (ssrcs.length) {
-                        elem.c('ssrc-group', { semantics: semantics, xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0' });
+                        elem.c('ssrc-group', { semantics, xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0' });
                         ssrcs.forEach(function(ssrc) {
-                            elem.c('source', { ssrc: ssrc })
+                            elem.c('source', { ssrc })
                                 .up();
                         });
                         elem.up();

modules/xmpp/SDPDiffer.js

@@ -134,8 +134,8 @@ SDPDiffer.prototype.toJingle = function(modify) {
                     var nv = kv.split(':', 2);
                     var name = nv[0];
                     var value = SDPUtil.filter_special_chars(nv[1]);
-                    modify.attrs({ name: name });
-                    modify.attrs({ value: value });
+                    modify.attrs({ name });
+                    modify.attrs({ value });
                 }
                 modify.up(); // end of parameter
             });
@@ -152,7 +152,7 @@ SDPDiffer.prototype.toJingle = function(modify) {
                 });
 
                 ssrcGroup.ssrcs.forEach(function (ssrc) {
-                    modify.c('source', { ssrc: ssrc })
+                    modify.c('source', { ssrc })
                         .up(); // end of source
                 });
                 modify.up(); // end of ssrc-group

modules/xmpp/SDPUtil.js

@@ -4,12 +4,12 @@ import RandomUtil from "../util/RandomUtil";
 var RTCBrowserType = require("../RTC/RTCBrowserType");
 
 var SDPUtil = {
-    filter_special_chars: function (text) {
+    filter_special_chars (text) {
         // XXX Neither one of the falsy values (e.g. null, undefined, false,
         // "", etc.) "contain" special chars.
         return text ? text.replace(/[\\\/\{,\}\+]/g, "") : text;
     },
-    iceparams: function (mediadesc, sessiondesc) {
+    iceparams (mediadesc, sessiondesc) {
         var data = null;
         var ufrag, pwd;
         if ((ufrag = SDPUtil.find_line(mediadesc, 'a=ice-ufrag:', sessiondesc))
@@ -21,22 +21,22 @@ var SDPUtil = {
         }
         return data;
     },
-    parse_iceufrag: function (line) {
+    parse_iceufrag (line) {
         return line.substring(12);
     },
-    build_iceufrag: function (frag) {
+    build_iceufrag (frag) {
         return 'a=ice-ufrag:' + frag;
     },
-    parse_icepwd: function (line) {
+    parse_icepwd (line) {
         return line.substring(10);
     },
-    build_icepwd: function (pwd) {
+    build_icepwd (pwd) {
         return 'a=ice-pwd:' + pwd;
     },
-    parse_mid: function (line) {
+    parse_mid (line) {
         return line.substring(6);
     },
-    parse_mline: function (line) {
+    parse_mline (line) {
         var parts = line.substring(2).split(' '),
             data = {};
         data.media = parts.shift();
@@ -48,10 +48,10 @@ var SDPUtil = {
         data.fmt = parts;
         return data;
     },
-    build_mline: function (mline) {
+    build_mline (mline) {
         return 'm=' + mline.media + ' ' + mline.port + ' ' + mline.proto + ' ' + mline.fmt.join(' ');
     },
-    parse_rtpmap: function (line) {
+    parse_rtpmap (line) {
         var parts = line.substring(9).split(' '),
             data = {};
         data.id = parts.shift();
@@ -66,7 +66,7 @@ var SDPUtil = {
      * @param line eg. "a=sctpmap:5000 webrtc-datachannel"
      * @returns [SCTP port number, protocol, streams]
      */
-    parse_sctpmap: function (line) {
+    parse_sctpmap (line) {
         var parts = line.substring(10).split(' ');
         var sctpPort = parts[0];
         var protocol = parts[1];
@@ -74,14 +74,14 @@ var SDPUtil = {
         var streamCount = parts.length > 2 ? parts[2] : null;
         return [sctpPort, protocol, streamCount];// SCTP port
     },
-    build_rtpmap: function (el) {
+    build_rtpmap (el) {
         var line = 'a=rtpmap:' + el.getAttribute('id') + ' ' + el.getAttribute('name') + '/' + el.getAttribute('clockrate');
         if (el.getAttribute('channels') && el.getAttribute('channels') != '1') {
             line += '/' + el.getAttribute('channels');
         }
         return line;
     },
-    parse_crypto: function (line) {
+    parse_crypto (line) {
         var parts = line.substring(9).split(' '),
             data = {};
         data.tag = parts.shift();
@@ -92,7 +92,7 @@ var SDPUtil = {
         }
         return data;
     },
-    parse_fingerprint: function (line) { // RFC 4572
+    parse_fingerprint (line) { // RFC 4572
         var parts = line.substring(14).split(' '),
             data = {};
         data.hash = parts.shift();
@@ -100,7 +100,7 @@ var SDPUtil = {
         // TODO assert that fingerprint satisfies 2UHEX *(":" 2UHEX) ?
         return data;
     },
-    parse_fmtp: function (line) {
+    parse_fmtp (line) {
         var parts = line.split(' '),
             i, key, value,
             data = [];
@@ -113,7 +113,7 @@ var SDPUtil = {
             }
             value = parts[i].split('=')[1];
             if (key && value) {
-                data.push({name: key, value: value});
+                data.push({name: key, value});
             } else if (key) {
                 // rfc 4733 (DTMF) style stuff
                 data.push({name: '', value: key});
@@ -121,7 +121,7 @@ var SDPUtil = {
         }
         return data;
     },
-    parse_icecandidate: function (line) {
+    parse_icecandidate (line) {
         var candidate = {},
             elems = line.split(' ');
         candidate.foundation = elems[0].substring(12);
@@ -155,7 +155,7 @@ var SDPUtil = {
         candidate.id = Math.random().toString(36).substr(2, 10); // not applicable to SDP -- FIXME: should be unique, not just random
         return candidate;
     },
-    build_icecandidate: function (cand) {
+    build_icecandidate (cand) {
         var line = ['a=candidate:' + cand.foundation, cand.component, cand.protocol, cand.priority, cand.ip, cand.port, 'typ', cand.type].join(' ');
         line += ' ';
         switch (cand.type) {
@@ -185,7 +185,7 @@ var SDPUtil = {
         line += cand.hasOwnAttribute('generation') ? cand.generation : '0';
         return line;
     },
-    parse_ssrc: function (desc) {
+    parse_ssrc (desc) {
         // proprietary mapping of a=ssrc lines
         // TODO: see "Jingle RTP Source Description" by Juberti and P. Thatcher on google docs
         // and parse according to that
@@ -199,7 +199,7 @@ var SDPUtil = {
         }
         return data;
     },
-    parse_rtcpfb: function (line) {
+    parse_rtcpfb (line) {
         var parts = line.substr(10).split(' ');
         var data = {};
         data.pt = parts.shift();
@@ -207,7 +207,7 @@ var SDPUtil = {
         data.params = parts;
         return data;
     },
-    parse_extmap: function (line) {
+    parse_extmap (line) {
         var parts = line.substr(9).split(' ');
         var data = {};
         data.value = parts.shift();
@@ -221,7 +221,7 @@ var SDPUtil = {
         data.params = parts;
         return data;
     },
-    find_line: function (haystack, needle, sessionpart) {
+    find_line (haystack, needle, sessionpart) {
         var lines = haystack.split('\r\n');
         for (var i = 0; i < lines.length; i++) {
             if (lines[i].substring(0, needle.length) == needle) {
@@ -240,7 +240,7 @@ var SDPUtil = {
         }
         return false;
     },
-    find_lines: function (haystack, needle, sessionpart) {
+    find_lines (haystack, needle, sessionpart) {
         var lines = haystack.split('\r\n'),
             needles = [];
         for (var i = 0; i < lines.length; i++) {
@@ -260,7 +260,7 @@ var SDPUtil = {
         }
         return needles;
     },
-    candidateToJingle: function (line) {
+    candidateToJingle (line) {
         // a=candidate:2979166662 1 udp 2113937151 192.168.2.100 57698 typ host generation 0
         //      <candidate component=... foundation=... generation=... id=... ip=... network=... port=... priority=... protocol=... type=.../>
         if (line.indexOf('candidate:') === 0) {
@@ -313,7 +313,7 @@ var SDPUtil = {
         candidate.id = Math.random().toString(36).substr(2, 10); // not applicable to SDP -- FIXME: should be unique, not just random
         return candidate;
     },
-    candidateFromJingle: function (cand) {
+    candidateFromJingle (cand) {
         var line = 'a=candidate:';
         line += cand.getAttribute('foundation');
         line += ' ';
@@ -370,7 +370,7 @@ var SDPUtil = {
      * @param {object} mLine object as parsed from transform.parse
      * @return {number} the primary video ssrc from the given m line
      */
-    parsePrimaryVideoSsrc: function(videoMLine) {
+    parsePrimaryVideoSsrc(videoMLine) {
         const numSsrcs = videoMLine.ssrcs
             .map(ssrcInfo => ssrcInfo.id)
             .filter((ssrc, index, array) => array.indexOf(ssrc) === index)
@@ -407,7 +407,7 @@ var SDPUtil = {
      * Generate an ssrc
      * @returns {number} an ssrc
      */
-    generateSsrc: function() {
+    generateSsrc() {
         return RandomUtil.randomInt(1, 0xffffffff);
     },
 
@@ -420,7 +420,7 @@ var SDPUtil = {
      * @returns {string} the value corresponding to the given ssrc
      *  and attributeName
      */
-    getSsrcAttribute: function (mLine, ssrc, attributeName) {
+    getSsrcAttribute (mLine, ssrc, attributeName) {
         for (let i = 0; i < mLine.ssrcs.length; ++i) {
             const ssrcLine = mLine.ssrcs[i];
             if (ssrcLine.id === ssrc &&
@@ -438,7 +438,7 @@ var SDPUtil = {
      * @returns {list<number>} a list of the ssrcs in the group
      *  parsed as numbers
      */
-    parseGroupSsrcs: function (ssrcGroup) {
+    parseGroupSsrcs (ssrcGroup) {
         return ssrcGroup
             .ssrcs
             .split(" ")
@@ -451,7 +451,7 @@ var SDPUtil = {
      * @param {string} type the type of the desired mline (e.g. "video")
      * @returns {object} a media object
      */
-    getMedia: function (sdp, type) {
+    getMedia (sdp, type) {
         return sdp.media.find(m => m.type === type);
     },
     /**
@@ -465,7 +465,7 @@ var SDPUtil = {
      *  an sdp as parsed by transform.parse
      * @param {string} the name of the preferred codec
      */
-    preferVideoCodec: function(videoMLine, codecName) {
+    preferVideoCodec(videoMLine, codecName) {
         let payloadType = null;
         for (let i = 0; i < videoMLine.rtp.length; ++i) {
             const rtp = videoMLine.rtp[i];

modules/xmpp/recording.js

@@ -166,7 +166,7 @@ function (state, callback, errCallback, options) {
     elem.c('conference', {
         xmlns: 'http://jitsi.org/protocol/colibri'
     });
-    elem.c('recording', {state: state, token: options.token});
+    elem.c('recording', {state, token: options.token});
 
     var self = this;
     this.connection.sendIQ(elem,

modules/xmpp/strophe.rayo.js

@@ -30,8 +30,8 @@ class RayoConnectionPlugin extends ConnectionPlugin {
             });
             req.c('dial', {
                 xmlns: RAYO_XMLNS,
-                to: to,
-                from: from
+                to,
+                from
             });
             req.c('header', {
                 name: 'JvbRoomName',

modules/xmpp/xmpp.js

@@ -246,8 +246,8 @@ export default class XMPP extends Listenable {
 
     connect (jid, password) {
         this.connectParams = {
-            jid: jid,
-            password: password
+            jid,
+            password
         };
         if (!jid) {
             let configDomain

webpack.config.js

@@ -82,5 +82,5 @@ module.exports = {
         libraryTarget: 'umd',
         sourceMapFilename: '[name].' + (minimize ? 'min' : 'js') + '.map'
     },
-    plugins: plugins
+    plugins
 };