Adding linting to all JS and fixing up the resulting errors - whoop whoop

Author: Matt Gaunt

.eslintignore

@@ -0,0 +1 @@
+src/third_party

gulp-tasks/scripts.js

@@ -92,9 +92,9 @@ function generateES6Bundles(srcPath) {
 }
 
 gulp.task('scripts:eslint', function() {
-  return gulp.src([GLOBAL.config.src + '/**/*.es6.js'])
+  return gulp.src([GLOBAL.config.src + '/**/*.js'])
 
-    // eslint() attaches the lint output to the eslint property
+    // eslint() attaches the lint output to the eslint property,
     // of the file object so it can be used by other modules.
     .pipe(eslint())
 
@@ -107,14 +107,13 @@ gulp.task('scripts:eslint', function() {
     .pipe(eslint.failOnError());
 });
 
-gulp.task('scripts:es6', ['scripts:eslint'], function(cb) {
+gulp.task('scripts:es6', function(cb) {
   generateES6Bundles(GLOBAL.config.src);
 
   cb();
 });
 
-// TODO: Add linting for es5 JS
-gulp.task('scripts:es5', [], function() {
+gulp.task('scripts:es5', function() {
   return gulp.src([GLOBAL.config.src + '/**/*.es5.js'])
     .pipe(gulpif(GLOBAL.config.env !== 'prod', sourcemaps.init()))
 
@@ -142,7 +141,10 @@ gulp.task('scripts:clean', function(cb) {
 
 gulp.task('scripts', function(cb) {
   runSequence(
-    'scripts:clean',
+    [
+      'scripts:clean',
+      'scripts:eslint'
+    ],
     [
       'scripts:es6',
       'scripts:es5'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "app-shell",
-  "version": "0.1.141",
+  "version": "0.1.148",
   "private": true,
   "license": "Apache",
   "engines": {

src/scripts/controller/AppController.js

@@ -17,27 +17,25 @@
 
 import Controller from './Controller';
 import AppModel from '../model/AppModel';
-import PubSubInstance from '../libs/PubSub';
-import ToasterInstance from '../libs/Toaster';
-import DialogInstance from '../libs/Dialog';
-import RouterInstance from '../libs/Router';
+import pubSubInstance from '../libs/PubSub';
+import toasterInstance from '../libs/Toaster';
+import routerInstance from '../libs/Router';
 
 export default class AppController extends Controller {
 
-  constructor () {
-
+  constructor() {
     super();
 
     this.appModel = null;
     this.sideNavToggleButton = document.querySelector('.js-toggle-menu');
     this.sideNav = document.querySelector('.js-side-nav');
     this.sideNavContent = this.sideNav.querySelector('.js-side-nav-content');
-    this.loadScript('/scripts/list.js')
-    this.newappshellingButton = document.querySelector('.js-new-appshelling-btn');
+    this.loadScript('/scripts/list.js');
+    this.newappshellingButton =
+      document.querySelector('.js-new-appshelling-btn');
 
     AppModel.get(1).then (appModel => {
-
-      RouterInstance().then(router => {
+      routerInstance().then(router => {
         router.add('_root',
             (data) => this.show(data),
             () => this.hide());
@@ -58,26 +56,25 @@ export default class AppController extends Controller {
       var sideNavTransform;
       var onSideNavTouchStart = (e) => {
         touchStartX = e.touches[0].pageX;
-      }
+      };
 
       var onSideNavTouchMove = (e) => {
-
         var newTouchX = e.touches[0].pageX;
         sideNavTransform = Math.min(0, newTouchX - touchStartX);
 
-        if (sideNavTransform < 0)
+        if (sideNavTransform < 0) {
           e.preventDefault();
+        }
 
         this.sideNavContent.style.transform =
           'translateX(' + sideNavTransform + 'px)';
-      }
+      };
 
       var onSideNavTouchEnd = (e) => {
-
-        if (sideNavTransform < -1)
+        if (sideNavTransform < -1) {
           this.closeSideNav();
-
-      }
+        }
+      };
 
       this.sideNav.addEventListener('click', () => {
         this.closeSideNav();
@@ -92,8 +89,7 @@ export default class AppController extends Controller {
       // Wait for the first frame because sometimes
       // window.onload fires too quickly.
       requestAnimationFrame(() => {
-
-        function showWaitAnimation (e) {
+        function showWaitAnimation(e) {
           e.target.classList.add('pending');
         }
 
@@ -105,44 +101,39 @@ export default class AppController extends Controller {
       });
 
       if ('serviceWorker' in navigator) {
-
         navigator.serviceWorker.register('/sw.js', {
           scope: '/'
         }).then(function(registration) {
-
           var isUpdate = false;
 
           // If this fires we should check if there's a new Service Worker
           // waiting to be activated. If so, ask the user to force refresh.
-          if (registration.active)
+          if (registration.active) {
             isUpdate = true;
+          }
 
           registration.onupdatefound = function(event) {
-
-            console.log("A new Service Worker version has been found...");
+            console.log('A new Service Worker version has been found...');
 
             // If an update is found the spec says that there is a new Service
             // Worker installing, so we should wait for that to complete then
             // show a notification to the user.
-            registration.installing.onstatechange = function(event) {
-
+            registration.installing.onstatechange = function(stateChangEvent) {
               if (this.state === 'installed') {
-
-                console.log("Service Worker Installed.");
+                console.log('Service Worker Installed.');
 
                 if (isUpdate) {
-                  ToasterInstance().then(toaster => {
+                  toasterInstance().then(toaster => {
                     toaster.toast(
                         'App updated. Restart for the new version.');
                   });
                 } else {
-                  ToasterInstance().then(toaster => {
+                  toasterInstance().then(toaster => {
                     toaster.toast('App ready for offline use.');
                   });
                 }
-
               } else {
-                console.log("New Service Worker state: ", this.state);
+                console.log('New Service Worker state: ', this.state);
               }
             };
           };
@@ -154,35 +145,33 @@ export default class AppController extends Controller {
   }
 
 
-  show () {
+  show() {
     this.sideNavToggleButton.tabIndex = 1;
     this.newappshellingButton.tabIndex = 2;
   }
 
-  hide () {
+  hide() {
     this.sideNavToggleButton.tabIndex = -1;
     this.newappshellingButton.tabIndex = -1;
 
-    PubSubInstance().then(ps => {
+    pubSubInstance().then(ps => {
       ps.pub('list-covered');
     });
   }
 
-  toggleSideNav () {
-
-    if (this.sideNav.classList.contains('side-nav--visible'))
+  toggleSideNav() {
+    if (this.sideNav.classList.contains('side-nav--visible')) {
       this.closeSideNav();
-    else
+    } else {
       this.openSideNav();
+    }
   }
 
   openSideNav() {
-
     this.sideNav.classList.add('side-nav--visible');
     this.sideNavToggleButton.focus();
 
     var onSideNavTransitionEnd = (e) => {
-
       // Force the focus, otherwise touch doesn't always work.
       this.sideNavContent.tabIndex = 0;
       this.sideNavContent.focus();
@@ -191,16 +180,14 @@ export default class AppController extends Controller {
       this.sideNavContent.classList.remove('side-nav__content--animatable');
       this.sideNavContent.removeEventListener('transitionend',
           onSideNavTransitionEnd);
-    }
+    };
 
     this.sideNavContent.classList.add('side-nav__content--animatable');
     this.sideNavContent.addEventListener('transitionend',
           onSideNavTransitionEnd);
 
     requestAnimationFrame( () => {
-
       this.sideNavContent.style.transform = 'translateX(0px)';
-
     });
   }
 
@@ -209,6 +196,4 @@ export default class AppController extends Controller {
     this.sideNavContent.classList.add('side-nav__content--animatable');
     this.sideNavContent.style.transform = 'translateX(-102%)';
   }
-
-
 }

src/scripts/controller/ListController.js

@@ -16,12 +16,10 @@
  */
 
 import Controller from './Controller';
-import RouterInstance from '../libs/Router';
-import PubSubInstance from '../libs/PubSub';
 
 export default class ListController extends Controller {
 
-  constructor () {
+  constructor() {
     super();
 
     this.ctaView = document.querySelector('.js-cta');
@@ -35,7 +33,7 @@ export default class ListController extends Controller {
     });
   }
 
-  getContentAndPopulate () {
+  getContentAndPopulate() {
     console.log('Get content and populate');
     this.ctaView.classList.add('empty-set-cta--visible');
   }

src/scripts/controller/StaticPageController.js

@@ -21,7 +21,6 @@ import NavDrawerView from './../view/NavDrawerView';
 export default class StaticPageController extends Controller {
 
   constructor() {
-
     super();
 
     this.navDrawer = new NavDrawerView();

src/scripts/libs/ConfigManager.js

@@ -17,10 +17,10 @@
 
 import Config from '../config/Config';
 
-export default function ConfigManagerInstance () {
-
-  if (typeof window.ConfigManagerInstance_ !== 'undefined')
+export default function ConfigManagerInstance() {
+  if (typeof window.ConfigManagerInstance_ !== 'undefined') {
     return Promise.resolve(window.ConfigManagerInstance_);
+  }
 
   window.ConfigManagerInstance_ = new ConfigManager();
 
@@ -29,19 +29,19 @@ export default function ConfigManagerInstance () {
 
 class ConfigManager {
 
-  constructor () {
+  constructor() {
     this.config = Config;
   }
 
-  set config (c) {
+  set config(c) {
     this.config_ = c;
   }
 
-  get config () {
+  get config() {
     return this.config_;
   }
 
-  getStore (storeName) {
+  getStore(storeName) {
     return this.config_.stores[storeName];
   }