Fix eslint errors

src/common/osVersion.js

@@ -1,15 +1,16 @@
 'use strict';
 
 var os = require('os');
-var release_split = os.release().split('.');
+var releaseSplit = os.release().split('.');
 
 module.exports = {
-  major: parseInt(release_split[0]),
-  minor: parseInt(release_split[1]),
-  isLowerThanOrEqualWindows8_1: function() {
-    if (process.platform != 'win32') {
+  major: parseInt(releaseSplit[0], 10),
+  minor: parseInt(releaseSplit[1], 10),
+  isLowerThanOrEqualWindows8_1() {
+    if (process.platform !== 'win32') {
       return false;
     }
+
     // consider Windows 7 and later.
     return (this.major <= 6 && this.minor <= 3);
   }

src/common/settings.js

@@ -3,81 +3,78 @@
 const fs = require('fs');
 const settingsVersion = 1;
 
-var merge = function(base, target) {
-  var merged = base;
-  if (!target) {
-    target = {};
-  }
-  for (var prop in target) {
-    merged[prop] = target[prop];
-  }
-  return merged;
-};
+function merge(base, target) {
+  return Object.assign({}, base, target);
+}
 
-var loadDefault = function(version) {
+function loadDefault(version) {
+  var ver = version;
   if (version == null) {
-    version = settingsVersion;
+    ver = settingsVersion;
   }
-  switch (version) {
-    case 1:
-      return {
-        teams: [],
-        hideMenuBar: false,
-        showTrayIcon: false,
-        trayIconTheme: '',
-        disablewebsecurity: true,
-        toggleWindowOnTrayIconClick: false,
-        version: 1,
-        notifications: {
-          flashWindow: 0 // 0 = flash never, 1 = only when idle (after 10 seconds), 2 = always
-        },
-        showUnreadBadge: true
-      };
+  switch (ver) {
+  case 1:
+    return {
+      teams: [],
+      hideMenuBar: false,
+      showTrayIcon: false,
+      trayIconTheme: '',
+      disablewebsecurity: true,
+      toggleWindowOnTrayIconClick: false,
+      version: 1,
+      notifications: {
+        flashWindow: 0 // 0 = flash never, 1 = only when idle (after 10 seconds), 2 = always
+      },
+      showUnreadBadge: true
+    };
+  default:
+    return {};
   }
-};
+}
 
-var upgradeV0toV1 = function(config_v0) {
+function upgradeV0toV1(configV0) {
   var config = loadDefault(1);
   config.teams.push({
     name: 'Primary team',
-    url: config_v0.url
+    url: configV0.url
   });
   return config;
-};
+}
 
-var upgrade = function(config, newAppVersion) {
-  var config_version = config.version ? config.version : 0;
-  if (newAppVersion)
+function upgrade(config, newAppVersion) {
+  var configVersion = config.version ? config.version : 0;
+  if (newAppVersion) {
     config.lastMattermostVersion = newAppVersion;
-  switch (config_version) {
-    case 0:
-      return upgrade(upgradeV0toV1(config));
-    default:
-      return config;
   }
-};
+  switch (configVersion) {
+  case 0:
+    return upgrade(upgradeV0toV1(config));
+  default:
+    return config;
+  }
+}
 
 module.exports = {
   version: settingsVersion,
 
-  upgrade: upgrade,
+  upgrade,
 
-  readFileSync: function(configFile) {
+  readFileSync(configFile) {
     var config = JSON.parse(fs.readFileSync(configFile, 'utf8'));
     if (config.version === settingsVersion) {
-      var default_config = this.loadDefault();
-      config = merge(default_config, config);
+      var defaultConfig = this.loadDefault();
+      config = merge(defaultConfig, config);
     }
     return config;
   },
 
-  writeFileSync: function(configFile, config) {
-    if (config.version != settingsVersion) {
-      throw 'version ' + config.version + ' is not equal to ' + settingsVersion;
+  writeFileSync(configFile, config) {
+    if (config.version !== settingsVersion) {
+      throw new Error('version ' + config.version + ' is not equal to ' + settingsVersion);
     }
     var data = JSON.stringify(config, null, '  ');
     fs.writeFileSync(configFile, data, 'utf8');
   },
 
-  loadDefault: loadDefault
+  loadDefault
 };