eslint config update & lintfixes

eslint autofix

manual eslint fixes

less ugly hasOwnProperty alternative

.eslintrc.json

@@ -1,5 +1,5 @@
 {
-    "extends": "eslint-config-edx",
+    "extends": "eslint-config-edx-es5",
     "globals": {
         "setFixtures": true  // added globally by jasmine-jquery (bad)
     }

gulp/tasks/doc.js

@@ -31,7 +31,7 @@ renameAsMarkdown = function(path) {
 generateDocFor = function(options) {
     var i, sources,
         sourceLength = options.sources.length;
-    for (i = 0; i < sourceLength; i++) {
+    for (i = 0; i < sourceLength; i += 1) {
         sources = options.sources[i];
         console.log('Generating documentation for ' + sources);
         gulp.src(sources, {buffer: false})

package.json

@@ -35,8 +35,9 @@
     "css-loader": "~0.23.1",
     "del": "~2.2.0",
     "edx-pattern-library": "~0.12.5",
-    "eslint": "~2.13.1",
-    "eslint-config-edx": "~1.2.1",
+    "eslint": "^3.16.0",
+    "eslint-config-edx": "^2.0.0",
+    "eslint-config-edx-es5": "^3.0.0",
     "extract-text-webpack-plugin": "^2.1.0",
     "gulp": "~3.9.1",
     "gulp-coveralls": "~0.1.4",

src/js/breadcrumbs/breadcrumbs-view.js

@@ -21,6 +21,7 @@
  */
 (function(define) {
     'use strict';
+
     define(['backbone', 'edx-ui-toolkit/js/utils/html-utils', 'text!./breadcrumbs.underscore'],
         function(Backbone, HtmlUtils, breadcrumbsTemplate) {
             var BreadcrumbsView = Backbone.View.extend({

src/js/dropdown-menu/dropdown-menu-view.js

@@ -35,6 +35,7 @@
  */
 (function(define) {
     'use strict';
+
     define([
         'backbone',
         'jquery',
@@ -172,7 +173,7 @@
                     if (_.contains(this.keyForward, key)) {
                         this.focusFirstItem();
                         // if up arrow or left arrow key pressed or shift+tab
-                    } else if (_.contains(this.keyBack, key) || key === constants.keyCodes.tab && event.shiftKey) {
+                    } else if (_.contains(this.keyBack, key) || (key === constants.keyCodes.tab && event.shiftKey)) {
                         event.preventDefault();
                         this.focusLastItem();
                     }

src/js/dropdown-menu/specs/dropdown-menu-view-spec.js

@@ -36,7 +36,7 @@ define([
 
                     expect($(document.activeElement)).not.toHaveClass('js-dropdown-button');
 
-                    for (i = 0; i < listLength; i++) {
+                    for (i = 0; i < listLength; i += 1) {
                         singleKeyDown(key);
                     }
                 }, timeoutInt);

src/js/pagination/paging-collection.js

@@ -27,6 +27,7 @@
  */
 (function(define) {
     'use strict';
+
     define(['jquery', 'underscore', 'backbone.paginator'], function($, _, PageableCollection) {
         var PagingCollection = PageableCollection.extend({
             mode: 'server',

src/js/pagination/specs/paging-collection-spec.js

@@ -1,11 +1,11 @@
 define(['jquery',
-        'backbone',
-        'underscore',
-        'URI',
-        '../paging-collection.js',
-        '../../utils/spec-helpers/ajax-helpers.js',
-        '../../utils/spec-helpers/spec-helpers.js'
-    ],
+    'backbone',
+    'underscore',
+    'URI',
+    '../paging-collection.js',
+    '../../utils/spec-helpers/ajax-helpers.js',
+    '../../utils/spec-helpers/spec-helpers.js'
+],
     function($, Backbone, _, URI, PagingCollection, AjaxHelpers, SpecHelpers) {
         'use strict';
 

src/js/utils/constants.js

@@ -3,6 +3,7 @@
  */
 (function(define) {
     'use strict';
+
     define([], function() {
         /**
          * Reusable constants.

src/js/utils/date-utils.js

@@ -27,6 +27,7 @@
 
 (function(define) {
     'use strict';
+
     define([
         'jquery',
         'moment',

src/js/utils/global-loader.js

@@ -53,7 +53,7 @@
                         requiredModule,
                         module,
                         i;
-                    for (i = 0; i < pathCount; i++) {
+                    for (i = 0; i < pathCount; i += 1) {
                         requiredModule = registeredModules[requiredPaths[i]];
                         requiredModules.push(requiredModule);
                     }

src/js/utils/html-utils.js

@@ -12,6 +12,7 @@
  */
 (function(define) {
     'use strict';
+
     define(['underscore', 'jquery', 'edx-ui-toolkit/js/utils/string-utils'], function(_, $, StringUtils) {
         var HtmlUtils, ensureHtml, interpolateHtml, joinHtml, HTML, template, setHtml, append, prepend;
 
@@ -137,7 +138,7 @@
             var html = '',
                 argumentCount = arguments.length,
                 i;
-            for (i = 0; i < argumentCount; i++) {
+            for (i = 0; i < argumentCount; i += 1) {
                 html += ensureHtml(arguments[i]);
             }
             return HTML(html);

src/js/utils/spec-helpers/ajax-helpers.js

@@ -65,7 +65,7 @@ define(['sinon', 'underscore', 'URI'], function(sinon, _, URI) {
 
         requests.currentIndex = 0;
         requests.restore = function() {
-            if (xhr && xhr.hasOwnProperty('restore')) {
+            if (xhr && 'restore' in xhr) {
                 xhr.restore();
             }
         };
@@ -208,7 +208,7 @@ define(['sinon', 'underscore', 'URI'], function(sinon, _, URI) {
         var request = currentRequest(requests);
         expect(request.readyState).toEqual(XHR_READY_STATES.UNSENT);
         // Our ESLint config bans mutating params, but fixing this would require breaking AjaxHelpers API
-        requests.currentIndex++;  // eslint-disable-line no-param-reassign
+        requests.currentIndex += 1;  // eslint-disable-line no-param-reassign
     };
 
     /**
@@ -230,7 +230,7 @@ define(['sinon', 'underscore', 'URI'], function(sinon, _, URI) {
             {'Content-Type': contentType},
             contentType === 'application/json' ? JSON.stringify(body || {}) : body
         );
-        requests.currentIndex++;  // eslint-disable-line no-param-reassign
+        requests.currentIndex += 1;  // eslint-disable-line no-param-reassign
     };
 
     /**

src/js/utils/specs/ajax-helpers-spec.js

@@ -34,7 +34,7 @@ define(
                     $.ajax(testUrl);
 
                     expect(requests instanceof Array).toBeTruthy();
-                    expect(requests.hasOwnProperty('currentIndex')).toBeTruthy();
+                    expect('currentIndex' in requests).toBeTruthy();
                     AjaxHelpers.expectRequest(requests, 'GET', testUrl);
                 });
             });

src/js/utils/string-utils.js

@@ -5,6 +5,7 @@
  */
 (function(define) {
     'use strict';
+
     define([], function() {
         var interpolate;
 

test/karma.conf.js

@@ -85,7 +85,8 @@ module.exports = function(config, overrideOptions) {
         reporters: options.reporters,
 
         coverageReporter: {
-            dir: 'build', subdir: 'coverage-js',
+            dir: 'build',
+            subdir: 'coverage-js',
             reporters: [
                 {type: 'html', subdir: 'coverage-js/html'},
                 {type: 'cobertura', file: 'coverage.xml'},

test/require-config.js

@@ -32,6 +32,7 @@ require.config({
             exports: 'Backbone',
             init: function(_, $) {
                 'use strict';
+
                 var Backbone;
                 Backbone.$ = $;
                 return Backbone;