[eslint] sort-vars

.eslintrc.js

@@ -158,6 +158,7 @@ module.exports = {
         'quote-props': 0,
         'semi': [ 'error', 'always' ],
         'semi-spacing': 2,
+        'sort-vars': 2,
         'space-before-blocks': 2,
         'space-before-function-paren': [ 'error', 'never' ],
         'space-in-parens': [ 'error', 'never' ],

JitsiMeetJS.js

@@ -98,7 +98,6 @@ var LibJitsiMeet = {
     mediaDevices: JitsiMediaDevices,
     analytics: null,
     init(options) {
-        let logObject, attr;
         Statistics.init(options);
 
         this.analytics = Statistics.analytics;
@@ -114,8 +113,8 @@ var LibJitsiMeet = {
         // Log deployment-specific information, if available.
         if (window.jitsiRegionInfo
             && Object.keys(window.jitsiRegionInfo).length > 0) {
-            logObject = {};
-            for (attr in window.jitsiRegionInfo) {
+            const logObject = {};
+            for (const attr in window.jitsiRegionInfo) {
                 if (window.jitsiRegionInfo.hasOwnProperty(attr)) {
                     logObject[attr] = window.jitsiRegionInfo[attr];
                 }
@@ -126,7 +125,7 @@ var LibJitsiMeet = {
         }
 
         if(this.version) {
-            logObject = {
+            const logObject = {
                 id: "component_version",
                 component: "lib-jitsi-meet",
                 version: this.version
@@ -272,8 +271,8 @@ var LibJitsiMeet = {
                 promiseFulfilled = true;
 
                 if(error.name === JitsiTrackErrors.UNSUPPORTED_RESOLUTION) {
-                    var oldResolution = options.resolution || '360',
-                        newResolution = getLowerResolution(oldResolution);
+                    const oldResolution = options.resolution || '360';
+                    const newResolution = getLowerResolution(oldResolution);
 
                     if (newResolution !== null) {
                         options.resolution = newResolution;

modules/RTC/JitsiLocalTrack.js

@@ -212,10 +212,10 @@ JitsiLocalTrack.prototype._fireNoDataFromSourceEvent = function() {
  *  enumerateDevices() call
  */
 JitsiLocalTrack.prototype._setRealDeviceIdFromDeviceList = function(devices) {
-    var track = this.getTrack(),
-        device = devices.find(function(d) {
-            return d.kind === track.kind + 'input' && d.label === track.label;
-        });
+    const track = this.getTrack();
+    const device
+        = devices.find(
+            d => d.kind === track.kind + 'input' && d.label === track.label);
 
     if (device) {
         this._realDeviceId = device.deviceId;

modules/RTC/RTCUtils.js

@@ -376,6 +376,7 @@ function pollForAvailableMediaDevices() {
 
 /**
  * Event handler for the 'devicechange' event.
+ *
  * @param {MediaDeviceInfo[]} devices - list of media devices.
  * @emits RTCEvents.DEVICE_LIST_CHANGED
  */
@@ -383,20 +384,14 @@ function onMediaDevicesListChanged(devicesReceived) {
     currentlyAvailableMediaDevices = devicesReceived.slice(0);
     logger.info('list of media devices has changed:', currentlyAvailableMediaDevices);
 
-    var videoInputDevices = currentlyAvailableMediaDevices.filter(function(d) {
-            return d.kind === 'videoinput';
-        }),
-        audioInputDevices = currentlyAvailableMediaDevices.filter(function(d) {
-            return d.kind === 'audioinput';
-        }),
-        videoInputDevicesWithEmptyLabels = videoInputDevices.filter(
-            function(d) {
-                return d.label === '';
-            }),
-        audioInputDevicesWithEmptyLabels = audioInputDevices.filter(
-            function(d) {
-                return d.label === '';
-            });
+    const videoInputDevices
+        = currentlyAvailableMediaDevices.filter(d => d.kind === 'videoinput');
+    const audioInputDevices
+        = currentlyAvailableMediaDevices.filter(d => d.kind === 'audioinput');
+    const videoInputDevicesWithEmptyLabels
+        = videoInputDevices.filter(d => d.label === '');
+    const audioInputDevicesWithEmptyLabels
+        = audioInputDevices.filter(d => d.label === '');
 
     if (videoInputDevices.length &&
         videoInputDevices.length === videoInputDevicesWithEmptyLabels.length) {
@@ -575,7 +570,7 @@ function obtainDevices(options) {
  * @returns {*[]} object that describes the new streams
  */
 function handleLocalStream(streams, resolution) {
-    var audioStream, videoStream, desktopStream, res = [];
+    var audioStream, desktopStream, res = [], videoStream;
 
     // XXX The function obtainAudioAndVideoPermissions has examined the type of
     // the browser, its capabilities, etc. and has taken the decision whether to

modules/statistics/RTPStatsCollector.js

@@ -337,9 +337,7 @@ StatsCollector.prototype._defineGetStatValueMethod = function(keys) {
         // example, if item has a stat property of type function, then it's very
         // likely that whoever defined it wanted you to call it in order to
         // retrieve the value associated with a specific key.
-        itemStatByKey = function(item, key) {
-            return item.stat(key); 
-        };
+        itemStatByKey = (item, key) => item.stat(key);
         break;
     case RTCBrowserType.RTC_BROWSER_REACT_NATIVE:
         // The implementation provided by react-native-webrtc follows the
@@ -359,9 +357,7 @@ StatsCollector.prototype._defineGetStatValueMethod = function(keys) {
         };
         break;
     default:
-        itemStatByKey = function(item, key) {
-            return item[key]; 
-        };
+        itemStatByKey = (item, key) => item[key];
     }
 
     // Compose the 2 functions defined above to get a function which retrieves
@@ -409,7 +405,7 @@ StatsCollector.prototype.processStatsReport = function() {
         } catch(e) {/* not supported*/}
 
         if(now.type == 'googCandidatePair') {
-            var ip, type, localip, active;
+            var active, ip, localip, type;
             try {
                 ip = getStatValue(now, 'remoteAddress');
                 type = getStatValue(now, "transportType");
@@ -421,13 +417,10 @@ StatsCollector.prototype.processStatsReport = function() {
             }
             // Save the address unless it has been saved already.
             var conferenceStatsTransport = this.conferenceStats.transport;
-            if(!conferenceStatsTransport.some(function(t) {
-                return (
-                        t.ip == ip && t.type == type && t.localip == localip
-                );
-            })) {
-                conferenceStatsTransport.push(
-                    {ip, type, localip});
+            if(!conferenceStatsTransport.some(
+                    t =>
+                        t.ip == ip && t.type == type && t.localip == localip)) {
+                conferenceStatsTransport.push({ip, type, localip});
             }
             continue;
         }

modules/xmpp/SDP.js

@@ -104,7 +104,7 @@ SDP.prototype.containsSSRC = function(ssrc) {
 
 // remove iSAC and CN from SDP
 SDP.prototype.mangle = function() {
-    var i, j, mline, lines, rtpmap, newdesc;
+    var i, j, lines, mline, newdesc, rtpmap;
     for (i = 0; i < this.media.length; i++) {
         lines = this.media[i].split('\r\n');
         lines.pop(); // remove empty last element
@@ -153,7 +153,7 @@ SDP.prototype.removeMediaLines = function(mediaindex, prefix) {
 
 // add content's to a jingle element
 SDP.prototype.toJingle = function(elem, thecreator) {
-    var i, j, k, mline, ssrc, rtpmap, tmp, lines;
+    var i, j, k, lines, mline, rtpmap, ssrc, tmp;
     // new bundle plan
     lines = SDPUtil.find_lines(this.session, 'a=group:');
     if (lines.length) {
@@ -356,7 +356,7 @@ SDP.prototype.toJingle = function(elem, thecreator) {
 };
 
 SDP.prototype.transportToJingle = function(mediaindex, elem) {
-    var tmp, sctpmap, sctpAttrs, fingerprints;
+    var fingerprints, sctpAttrs, sctpmap, tmp;
     var self = this;
     elem.c('transport');
 
@@ -495,8 +495,8 @@ SDP.prototype.fromJingle = function(jingle) {
 
 // translate a jingle content element into an an SDP media part
 SDP.prototype.jingle2media = function(content) {
-    var media = '',
-        desc = content.find('description'),
+    var desc = content.find('description'),
+        media = '',
         self = this,
         tmp;
     var sctp = content.find(

modules/xmpp/SDPUtil.js

@@ -11,7 +11,7 @@ var SDPUtil = {
     },
     iceparams(mediadesc, sessiondesc) {
         var data = null;
-        var ufrag, pwd;
+        var pwd, ufrag;
         if ((ufrag = SDPUtil.find_line(mediadesc, 'a=ice-ufrag:', sessiondesc))
                 && (pwd = SDPUtil.find_line(mediadesc, 'a=ice-pwd:', sessiondesc))) {
             data = {
@@ -37,8 +37,8 @@ var SDPUtil = {
         return line.substring(6);
     },
     parse_mline(line) {
-        var parts = line.substring(2).split(' '),
-            data = {};
+        var data = {},
+            parts = line.substring(2).split(' ');
         data.media = parts.shift();
         data.port = parts.shift();
         data.proto = parts.shift();
@@ -52,8 +52,8 @@ var SDPUtil = {
         return 'm=' + mline.media + ' ' + mline.port + ' ' + mline.proto + ' ' + mline.fmt.join(' ');
     },
     parse_rtpmap(line) {
-        var parts = line.substring(9).split(' '),
-            data = {};
+        var data = {},
+            parts = line.substring(9).split(' ');
         data.id = parts.shift();
         parts = parts[0].split('/');
         data.name = parts.shift();
@@ -82,8 +82,8 @@ var SDPUtil = {
         return line;
     },
     parse_crypto(line) {
-        var parts = line.substring(9).split(' '),
-            data = {};
+        var data = {},
+            parts = line.substring(9).split(' ');
         data.tag = parts.shift();
         data['crypto-suite'] = parts.shift();
         data['key-params'] = parts.shift();
@@ -93,17 +93,19 @@ var SDPUtil = {
         return data;
     },
     parse_fingerprint(line) { // RFC 4572
-        var parts = line.substring(14).split(' '),
-            data = {};
+        var data = {},
+            parts = line.substring(14).split(' ');
         data.hash = parts.shift();
         data.fingerprint = parts.shift();
         // TODO assert that fingerprint satisfies 2UHEX *(":" 2UHEX) ?
         return data;
     },
     parse_fmtp(line) {
-        var parts = line.split(' '),
-            i, key, value,
-            data = [];
+        var data = [],
+            i,
+            key,
+            parts = line.split(' '),
+            value;
         parts.shift();
         parts = parts.join(' ').split(';');
         for (i = 0; i < parts.length; i++) {
@@ -189,8 +191,8 @@ var SDPUtil = {
         // 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
-        var lines = desc.split('\r\n'),
-            data = {};
+        var data = {},
+            lines = desc.split('\r\n');
         for (var i = 0; i < lines.length; i++) {
             if (lines[i].substring(0, 7) == 'a=ssrc:') {
                 var idx = lines[i].indexOf(' ');