Merge pull request #265 from Razzeee/jshint

Jshint basic config and some cleanup

jshint is not added yet due to the discussion in the PR.

gulpfile.js

@@ -3,26 +3,23 @@
 var gulp = require('gulp');
 var prettify = require('gulp-jsbeautifier');
 var diff = require('gulp-diff');
-var babel = require('gulp-babel');
 var webpack = require('webpack-stream');
 var named = require('vinyl-named');
-var changed = require('gulp-changed');
 var esformatter = require('gulp-esformatter');
 var esformatter_origin = require('esformatter');
 var through = require('through2');
-var del = require('del');
 var electron = require('electron-connect').server.create({
   path: './dist'
 });
 var packager = require('electron-packager');
 const fs = require('fs');
 
-const distPackageAuthor = 'Mattermost, Inc.'
+const distPackageAuthor = 'Mattermost, Inc.';
 
 var sources = ['**/*.js', '**/*.json', '**/*.css', '**/*.html', '!**/node_modules/**', '!dist/**', '!release/**', '!**/test_config.json'];
 
 gulp.task('prettify', ['prettify:sources', 'prettify:jsx']);
-gulp.task('prettify:verify', ['prettify:sources:verify', 'prettify:jsx:verify'])
+gulp.task('prettify:verify', ['prettify:sources:verify', 'prettify:jsx:verify']);
 
 var prettify_options = {
   html: {
@@ -164,7 +161,7 @@ gulp.task('webpack:webview', function() {
       },
       target: 'electron'
     }))
-    .pipe(gulp.dest('dist/browser/webview'))
+    .pipe(gulp.dest('dist/browser/webview'));
 });
 
 gulp.task('copy', ['copy:resources', 'copy:html/css', 'copy:modules']);
@@ -181,7 +178,7 @@ gulp.task('copy:html/css', function() {
 
 gulp.task('copy:modules', function() {
   return gulp.src(['src/node_modules/bootstrap/dist/**'])
-    .pipe(gulp.dest('dist/browser/modules/bootstrap'))
+    .pipe(gulp.dest('dist/browser/modules/bootstrap'));
 });
 
 gulp.task('watch', ['build'], function() {
@@ -248,7 +245,7 @@ function makePackage(platform, arch, callback) {
       }
     }
   });
-};
+}
 
 gulp.task('package', ['build'], function(cb) {
   makePackage(process.platform, 'all', cb);

package.json

@@ -35,7 +35,6 @@
     "babel-preset-react": "^6.5.0",
     "chai": "^3.5.0",
     "chai-as-promised": "^5.3.0",
-    "del": "^2.2.2",
     "devtron": "^1.3.0",
     "electron-builder": "5.2.1",
     "electron-connect": "~0.3.9",
@@ -45,8 +44,6 @@
     "esformatter": "^0.9.6",
     "esformatter-jsx": "^7.0.1",
     "gulp": "^3.9.1",
-    "gulp-babel": "^6.1.2",
-    "gulp-changed": "^1.3.2",
     "gulp-diff": "^1.0.0",
     "gulp-esformatter": "^6.0.0",
     "gulp-jsbeautifier": "^2.0.3",

script/installer.js

@@ -1,8 +1,10 @@
 #!/usr/bin/env node
 
-const createWindowsInstaller = require('electron-winstaller').createWindowsInstaller
+'use strict';
-const path = require('path')
+
-const rimraf = require('rimraf')
+const createWindowsInstaller = require('electron-winstaller').createWindowsInstaller;
+const path = require('path');
+const rimraf = require('rimraf');
 
 const archList = ['ia32', 'x64'];
 archList.forEach((arch) => {
@@ -10,14 +12,14 @@ archList.forEach((arch) => {
     .then(getInstallerConfig)
     .then(createWindowsInstaller)
     .catch((error) => {
-      console.error(error.message || error)
+      console.error(error.message || error);
-      process.exit(1)
+      process.exit(1);
-    })
+    });
-})
+});
 
 function getInstallerConfig(arch) {
-  const rootPath = path.join(__dirname, '..')
+  const rootPath = path.join(__dirname, '..');
-  const outPath = path.join(rootPath, 'release')
+  const outPath = path.join(rootPath, 'release');
 
   return Promise.resolve({
     appDirectory: path.join(outPath, `Mattermost-win32-${arch}`),
@@ -31,13 +33,13 @@ function getInstallerConfig(arch) {
     setupIcon: path.join(rootPath, 'resources', 'icon.ico'),
     skipUpdateIcon: true,
     exe: 'Mattermost.exe'
-  })
+  });
 }
 
 function deleteOutputFolder(arch) {
   return new Promise((resolve, reject) => {
     rimraf(path.join(__dirname, '..', 'out', `windows-installer-${arch}`), (error) => {
-      error ? reject(error) : resolve(arch)
+      error ? reject(error) : resolve(arch);
-    })
+    });
-  })
+  });
 }

src/browser/js/badge.js

@@ -15,7 +15,7 @@ var createDataURL = function(text) {
   ctx.fill();
 
   // text
-  ctx.fillStyle = "#ffffff"
+  ctx.fillStyle = "#ffffff";
   ctx.textAlign = 'center';
   ctx.textBaseline = 'middle';
   ctx.font = (11 * scale) + "px sans-serif";

src/browser/js/notification.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const OriginalNotification = Notification;
 
 const appIconURL = `file:///${require('electron').remote.app.getAppPath()}/resources/appicon.png`;
@@ -64,9 +66,9 @@ function override(eventHandlers) {
         else {
           originalCallback();
         }
-      }
+      };
     });
-  }
+  };
   defineEventHandler('onclick', eventHandlers.onclick);
   defineEventHandler('onerror', eventHandlers.onerror);
 

src/browser/menus/context.js

@@ -19,7 +19,7 @@ var createDefault = function() {
     role: 'selectall'
   }));
   return menu;
-}
+};
 
 module.exports = {
   createDefault: createDefault

src/browser/webview/mattermost.js

@@ -6,7 +6,7 @@ const notification = require('../js/notification');
 
 window.eval = global.eval = function() {
   throw new Error("Sorry, Mattermost does not support window.eval() for security reasons.");
-}
+};
 
 var hasClass = function(element, className) {
   var rclass = /[\t\r\n\f]/g;
@@ -16,7 +16,7 @@ var hasClass = function(element, className) {
   return false;
 };
 
-var unreadCountTimer = setInterval(function() {
+setInterval(function() {
   if (!this.unreadCount) {
     this.unreadCount = 0;
   }
@@ -28,7 +28,7 @@ var unreadCountTimer = setInterval(function() {
   // Note: the active channel doesn't have '.unread-title'.
   var unreadCount = document.getElementsByClassName('unread-title').length;
   // mentionCount in sidebar
-  var elem = document.getElementsByClassName('badge')
+  var elem = document.getElementsByClassName('badge');
   var mentionCount = 0;
   for (var i = 0; i < elem.length; i++) {
     if (isElementVisible(elem[i]) && !hasClass(elem[i], 'badge-notify')) {
@@ -50,9 +50,9 @@ var unreadCountTimer = setInterval(function() {
       return;
     }
     var post = null;
-    for (var i = 0; i < postLists.length; i++) {
+    for (var j = 0; j < postLists.length; j++) {
-      if (isElementVisible(postLists[i])) {
+      if (isElementVisible(postLists[j])) {
-        post = postLists[i].children[0];
+        post = postLists[j].children[0];
       }
     }
     if (post === null) {

src/common/osVersion.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var os = require('os');
 var release_split = os.release().split('.');
 

src/common/settings.js

@@ -16,7 +16,7 @@ var merge = function(base, target) {
 
 var loadDefault = function(version) {
   if (version == null) {
-    version = settingsVersion
+    version = settingsVersion;
   }
   switch (version) {
     case 1:
@@ -34,7 +34,7 @@ var loadDefault = function(version) {
         showUnreadBadge: true
       };
   }
-}
+};
 
 var upgradeV0toV1 = function(config_v0) {
   var config = loadDefault(1);

src/main.js

@@ -54,7 +54,7 @@ if (argv['config-file']) {
   global['config-file'] = argv['config-file'];
 }
 else {
-  global['config-file'] = app.getPath('userData') + '/config.json'
+  global['config-file'] = app.getPath('userData') + '/config.json';
 }
 
 var config = {};
@@ -136,7 +136,7 @@ if (app.makeSingleInstance((commandLine, workingDirectory) => {
       else mainWindow.show();
     }
   })) {
-  app.quit()
+  app.quit();
 }
 
 function shouldShowTrayIcon() {
@@ -220,7 +220,7 @@ ipcMain.on('login-credentials', function(event, request, user, password) {
   if (callback != null) {
     callback(user, password);
   }
-})
+});
 
 app.on('login', function(event, webContents, request, authInfo, callback) {
   event.preventDefault();
@@ -283,7 +283,7 @@ app.on('ready', function() {
     });
     trayIcon.on('balloon-click', function() {
       if (process.platform === 'win32' || process.platform === 'darwin') {
-        if (mainWindow.isMinimized()) mainWindow.restore()
+        if (mainWindow.isMinimized()) mainWindow.restore();
         else mainWindow.show();
       }
 
@@ -360,7 +360,7 @@ app.on('ready', function() {
   });
 
   mainWindow.on('unresponsive', () => {
-    console.log('The application has become unresponsive.')
+    console.log('The application has become unresponsive.');
   });
 
   mainWindow.setFullScreenable(true); // fullscreenable option has no effect.

src/main/certificateStore.js

@@ -25,7 +25,7 @@ function getHost(targetURL) {
 }
 
 var CertificateStore = function(storeFile) {
-  this.storeFile = storeFile
+  this.storeFile = storeFile;
   try {
     this.data = JSON.parse(fs.readFileSync(storeFile, 'utf-8'));
   }

src/main/menus/app.js

@@ -177,7 +177,7 @@ var createTemplate = function(mainWindow, config) {
       },
       enabled: (config.teams.length > 1)
     }]
-  }
+  };
   template.push(window_menu);
 
   template.push({
@@ -185,7 +185,7 @@ var createTemplate = function(mainWindow, config) {
     submenu: [{
       label: `${app_name} Docs`,
       click: function() {
-        electron.shell.openExternal('http://docs.mattermost.com')
+        electron.shell.openExternal('http://docs.mattermost.com');
       }
     }, {
       type: 'separator'

src/main/menus/tray.js

@@ -2,8 +2,7 @@
 
 const {
   app,
-  Menu,
+  Menu
-  MenuItem
 } = require('electron');
 
 function createTemplate(mainWindow, config) {
@@ -48,7 +47,7 @@ var createMenu = function(mainWindow, config) {
 };
 
 function showOrRestore(window) {
-  window.isMinimized() ? window.restore() : window.show()
+  window.isMinimized() ? window.restore() : window.show();
 }
 
 module.exports = {