Merge branch 'eslint_improvements-2'

.eslintrc.js

@@ -74,6 +74,8 @@ module.exports = {
         'consistent-return': 0,
         'curly': 2,
         'default-case': 0,
+        'dot-location': [ 'error', 'property' ],
+        'dot-notation': 2,
         'no-caller': 2,
         'no-case-declarations': 2,
         'no-div-regex': 0,

JitsiConference.js

@@ -1035,7 +1035,7 @@ JitsiConference.prototype.onIncomingCall
     // add info whether call is cross-region
     var crossRegion = null;
     if (window.jitsiRegionInfo) {
-        crossRegion = window.jitsiRegionInfo['CrossRegion'];
+        crossRegion = window.jitsiRegionInfo.CrossRegion;
     }
     Statistics.analytics.sendEvent(
         'session.initiate', {

doc/example/example.js

@@ -187,8 +187,8 @@ function switchVideo() { // eslint-disable-line no-unused-vars
         localTracks[1].dispose();
         localTracks.pop();
     }
-    JitsiMeetJS.createLocalTracks({devices: isVideo ? ['video'] : ['desktop']}).
-        then(function(tracks) {
+    JitsiMeetJS.createLocalTracks({devices: isVideo ? ['video'] : ['desktop']})
+        .then(function(tracks) {
             localTracks.push(tracks[0]);
             localTracks[1].addEventListener(JitsiMeetJS.events.track.TRACK_MUTE_CHANGED,
                 function() {
@@ -249,8 +249,8 @@ JitsiMeetJS.init(initOptions).then(function() {
     JitsiMeetJS.mediaDevices.addEventListener(JitsiMeetJS.events.mediaDevices.DEVICE_LIST_CHANGED, onDeviceListChanged);
 
     connection.connect();
-    JitsiMeetJS.createLocalTracks({devices: ['audio', 'video']}).
-        then(onLocalTracks).catch(function(error) {
+    JitsiMeetJS.createLocalTracks({devices: ['audio', 'video']})
+        .then(onLocalTracks).catch(function(error) {
             throw error;
         });
 }).catch(function(error) {

modules/RTC/RTCUtils.js

@@ -1014,7 +1014,7 @@ class RTCUtils extends Listenable {
                 };
 
                 if(screenObtainer.isSupported()) {
-                    deviceGUM['desktop'] = screenObtainer.obtainStream.bind(
+                    deviceGUM.desktop = screenObtainer.obtainStream.bind(
                         screenObtainer,
                         dsOptions);
                 }

modules/xmpp/ChatRoom.js

@@ -95,10 +95,10 @@ export default class ChatRoom extends Listenable {
     }
 
     initPresenceMap() {
-        this.presMap['to'] = this.myroomjid;
-        this.presMap['xns'] = 'http://jabber.org/protocol/muc';
-        this.presMap['nodes'] = [];
-        this.presMap['nodes'].push({
+        this.presMap.to = this.myroomjid;
+        this.presMap.xns = 'http://jabber.org/protocol/muc';
+        this.presMap.nodes = [];
+        this.presMap.nodes.push({
             'tagName': 'user-agent',
             'value': navigator.userAgent,
             'attributes': {xmlns: 'http://jitsi.org/jitmeet/user-agent'}
@@ -109,7 +109,7 @@ export default class ChatRoom extends Listenable {
     }
 
     updateDeviceAvailability(devices) {
-        this.presMap['nodes'].push({
+        this.presMap.nodes.push({
             'tagName': 'devices',
             'children': [
                 {
@@ -133,7 +133,7 @@ export default class ChatRoom extends Listenable {
     }
 
     sendPresence(fromJoin) {
-        var to = this.presMap['to'];
+        var to = this.presMap.to;
         if (!to || (!this.joined && !fromJoin)) {
             // Too early to send presence - not initialized
             return;
@@ -147,7 +147,7 @@ export default class ChatRoom extends Listenable {
         // as joining, and server can send us the message history for the room on
         // every presence
         if (fromJoin) {
-            pres.c('x', {xmlns: this.presMap['xns']});
+            pres.c('x', {xmlns: this.presMap.xns});
 
             if (this.password) {
                 pres.c('password').t(this.password).up();
@@ -774,14 +774,14 @@ export default class ChatRoom extends Listenable {
             const videoTypeNode = filterNodeFromPresenceJSON(pres, 'videoType');
 
             if(videoTypeNode.length > 0) {
-                data.videoType = videoTypeNode[0]['value'];
+                data.videoType = videoTypeNode[0].value;
             }
         } else {
             logger.error('Unsupported media type: ' + mediaType);
             return null;
         }
 
-        data.muted = mutedNode.length > 0 && mutedNode[0]['value'] === 'true';
+        data.muted = mutedNode.length > 0 && mutedNode[0].value === 'true';
 
         return data;
     }

modules/xmpp/JingleSessionPC.js

@@ -1444,8 +1444,8 @@ export default class JingleSessionPC extends JingleSession {
      * @returns {boolean} true if the jingle has to be sent and false otherwise.
      */
     fixSourceAddJingle(jingle) {
-        let ssrcs = this.modifiedSSRCs['unmute'];
-        this.modifiedSSRCs['unmute'] = [];
+        let ssrcs = this.modifiedSSRCs.unmute;
+        this.modifiedSSRCs.unmute = [];
         if (ssrcs && ssrcs.length) {
             ssrcs.forEach(function(ssrcObj) {
                 const desc = $(jingle.tree()).find('>jingle>content[name="'
@@ -1467,8 +1467,8 @@ export default class JingleSessionPC extends JingleSession {
             });
         }
 
-        ssrcs = this.modifiedSSRCs['addMuted'];
-        this.modifiedSSRCs['addMuted'] = [];
+        ssrcs = this.modifiedSSRCs.addMuted;
+        this.modifiedSSRCs.addMuted = [];
         if (ssrcs && ssrcs.length) {
             ssrcs.forEach(function(ssrcObj) {
                 const desc
@@ -1514,8 +1514,8 @@ export default class JingleSessionPC extends JingleSession {
      * @returns {boolean} true if the jingle has to be sent and false otherwise.
      */
     fixSourceRemoveJingle(jingle) {
-        let ssrcs = this.modifiedSSRCs['mute'];
-        this.modifiedSSRCs['mute'] = [];
+        let ssrcs = this.modifiedSSRCs.mute;
+        this.modifiedSSRCs.mute = [];
         if (ssrcs && ssrcs.length) {
             ssrcs.forEach(function(ssrcObj) {
                 ssrcObj.ssrcs.forEach(function(ssrc) {
@@ -1537,8 +1537,8 @@ export default class JingleSessionPC extends JingleSession {
             });
         }
 
-        ssrcs = this.modifiedSSRCs['remove'];
-        this.modifiedSSRCs['remove'] = [];
+        ssrcs = this.modifiedSSRCs.remove;
+        this.modifiedSSRCs.remove = [];
         if (ssrcs && ssrcs.length) {
             ssrcs.forEach(function(ssrcObj) {
                 const desc

modules/xmpp/xmpp.js

@@ -237,7 +237,7 @@ export default class XMPP extends Listenable {
      * @param options {object} connecting options - rid, sid, jid and password.
      */
     attach(options) {
-        const now = this.connectionTimes['attaching'] = window.performance.now();
+        const now = this.connectionTimes.attaching = window.performance.now();
         logger.log('(TIME) Strophe Attaching\t:' + now);
         this.connection.attach(options.jid, options.sid,
             parseInt(options.rid,10) + 1,