Merge pull request #16843 from edx/why_did_we_not_do_this_sooner

fix some eslint ish
openedx · Dec 11, 2017 · 25eb318 · 25eb318
2 parents 831eae6 + f63cf61
commit 25eb318
Show file tree

Hide file tree

Showing 416 changed files with 3,570 additions and 3,744 deletions.
diff --git a/cms/static/cms/js/build.js b/cms/static/cms/js/build.js
@@ -100,7 +100,7 @@
          * inlined in the build config.
          */
         shim: {
-            'xmodule': {
+            xmodule: {
                 deps: [
                     'jquery', 'underscore', 'codemirror', 'tinymce',
                     'jquery.tinymce', 'jquery.qtip', 'jquery.scrollTo', 'jquery.flot',

diff --git a/cms/static/cms/js/main.js b/cms/static/cms/js/main.js
@@ -43,8 +43,8 @@
                     message = JSON.parse(jqXHR.responseText).error;
                 }
                 msg = new NotificationView.Error({
-                    'title': gettext("Studio's having trouble saving your work"),
-                    'message': message
+                    title: gettext("Studio's having trouble saving your work"),
+                    message: message
                 });
                 console.log('Studio AJAX Error', { // eslint-disable-line no-console
                     url: event.currentTarget.URL,

diff --git a/cms/static/cms/js/xblock/cms.runtime.v1.js b/cms/static/cms/js/xblock/cms.runtime.v1.js
@@ -1,5 +1,5 @@
 define(['jquery', 'backbone', 'xblock/runtime.v1', 'URI', 'gettext', 'js/utils/modal',
-        'common/js/components/views/feedback_notification'],
+    'common/js/components/views/feedback_notification'],
     function($, Backbone, XBlock, URI, gettext, ModalUtils, NotificationView) {
         'use strict';
 
@@ -149,7 +149,7 @@ define(['jquery', 'backbone', 'xblock/runtime.v1', 'URI', 'gettext', 'js/utils/m
             };
 
             return v1;
-        })(XBlock.Runtime.v1);
+        }(XBlock.Runtime.v1));
 
         PreviewRuntime.v1 = (function(_super) {
             __extends(v1, _super);
@@ -161,7 +161,7 @@ define(['jquery', 'backbone', 'xblock/runtime.v1', 'URI', 'gettext', 'js/utils/m
             v1.prototype.handlerPrefix = '/preview/xblock';
 
             return v1;
-        })(BaseRuntime.v1);
+        }(BaseRuntime.v1));
 
         StudioRuntime.v1 = (function(_super) {
             __extends(v1, _super);
@@ -173,7 +173,7 @@ define(['jquery', 'backbone', 'xblock/runtime.v1', 'URI', 'gettext', 'js/utils/m
             v1.prototype.handlerPrefix = '/xblock';
 
             return v1;
-        })(BaseRuntime.v1);
+        }(BaseRuntime.v1));
 
         // Install the runtime's into the global namespace
         window.BaseRuntime = BaseRuntime;

diff --git a/cms/static/js/base.js b/cms/static/js/base.js
@@ -25,8 +25,7 @@ require([
         ModuleUtils,
         IframeUtils,
         DropdownMenuView
-    )
-{
+    ) {
         var $body;
 
         domReady(function() {

diff --git a/cms/static/js/certificates/collections/certificates.js b/cms/static/js/certificates/collections/certificates.js
@@ -31,8 +31,7 @@ function(Backbone, gettext, Certificate) {
                 // otherwise return empty array
                 if (typeof certificate_info === 'object') {
                     return_array = certificate_info;
-                }
-                else {
+                } else {
                     console.error(
                         interpolate(
                             gettext('Could not parse certificate JSON. %(message)s'), {message: ex.message}, true

diff --git a/cms/static/js/certificates/spec/custom_matchers.js b/cms/static/js/certificates/spec/custom_matchers.js
@@ -11,7 +11,7 @@ define(['jquery'], function($) {  // eslint-disable-line no-unused-vars
                     compare: function(actual, values) {
                         var passed = _.every(values, function(value, key) {
                             return actual.get(key) === value;
-                        }.bind(this));
+                        });
 
                         return {
                             pass: passed

diff --git a/cms/static/js/certificates/spec/views/certificate_details_spec.js b/cms/static/js/certificates/spec/views/certificate_details_spec.js
@@ -131,8 +131,8 @@ function(_, Course, CertificatesCollection, CertificateModel, CertificateDetails
             it('should parse a JSON object collection into a Backbone model collection', function() {
                 var course_title = 'Test certificate course title override 2';
                 var CERTIFICATE_JSON_OBJECT = [{
-                    'course_title': course_title,
-                    'signatories': '[]'
+                    course_title: course_title,
+                    signatories: '[]'
                 }];
                 this.collection.parse(CERTIFICATE_JSON_OBJECT);
                 var model = this.collection.at(1);

diff --git a/cms/static/js/certificates/views/certificate_details.js b/cms/static/js/certificates/views/certificate_details.js
@@ -49,8 +49,7 @@ function($, _, str, gettext, BaseView, SignatoryModel, SignatoryDetailsView, Vie
                         return self.model.set('editing', true);
                     }
                 );
-            }
-            else {
+            } else {
                 this.model.set('editing', true);
             }
         },

diff --git a/cms/static/js/certificates/views/certificate_editor.js b/cms/static/js/certificates/views/certificate_editor.js
@@ -25,7 +25,7 @@ function($, _, Backbone, gettext,
             'change .certificate-course-title-input': 'setCourseTitle',
             'focus .input-text': 'onFocus',
             'blur .input-text': 'onBlur',
-            'submit': 'setAndClose',
+            submit: 'setAndClose',
             'click .action-cancel': 'cancel',
             'click .action-add-signatory': 'addSignatory'
         },

diff --git a/cms/static/js/certificates/views/certificate_item.js b/cms/static/js/certificates/views/certificate_item.js
@@ -23,8 +23,8 @@ function(gettext, ListItemView, CertificateDetailsView, CertificateEditorView) {
         attributes: function() {
             // Retrieves the defined attribute set
             return {
-                'id': this.model.get('id'),
-                'tabindex': -1
+                id: this.model.get('id'),
+                tabindex: -1
             };
         },
 

diff --git a/cms/static/js/certificates/views/signatory_details.js b/cms/static/js/certificates/views/signatory_details.js
@@ -76,10 +76,10 @@ function($, _, str, Backbone, gettext, TemplateUtils, ViewUtils, BaseView, Signa
                             actionableModel.setOriginalAttributes();
                             dfd.resolve();
                             self.closeSignatoryEditView();
-                        }.bind(this)
+                        }
                     });
                     return dfd;
-                }.bind(this));
+                });
         },
 
         closeSignatoryEditView: function(event) {

diff --git a/cms/static/js/certificates/views/signatory_editor.js b/cms/static/js/certificates/views/signatory_editor.js
@@ -144,8 +144,7 @@ function($, _, Backbone, gettext,
                             if (model.isNew()) {
                                 model.collection.remove(model);
                                 self.eventAgg.trigger('onSignatoryRemoved', model);
-                            }
-                            else {
+                            } else {
                                 deleting.show();
                                 model.destroy({
                                     wait: true,
@@ -200,8 +199,7 @@ function($, _, Backbone, gettext,
                     $(selector).addClass('error');
                     $(selector).append("<span class='message-error'>" + errorMessage + '</span>');
                 }
-            }
-            else {
+            } else {
                 // Remove the error message.
                 $(selector).removeClass('error');
                 $(selector + '>span.message-error').remove();

diff --git a/cms/static/js/factories/base.js b/cms/static/js/factories/base.js
@@ -1,2 +1,2 @@
 define(['js/base', 'cms/js/main', 'js/src/logger', 'datepair', 'accessibility',
-'ieshim', 'tooltip_manager', 'lang_edx', 'js/models/course']);
+    'ieshim', 'tooltip_manager', 'lang_edx', 'js/models/course']);
diff --git a/cms/static/js/factories/login.js b/cms/static/js/factories/login.js
@@ -22,10 +22,10 @@ define(['jquery.cookie', 'utility', 'common/js/components/utils/view_utils'], fu
 
         $('form#login_form').submit(function(event) {
             event.preventDefault();
-            var submitButton = $('#submit'),
+            var $submitButton = $('#submit'),
                 deferred = new $.Deferred(),
                 promise = deferred.promise();
-            ViewUtils.disableElementWhileRunning(submitButton, function() { return promise; });
+            ViewUtils.disableElementWhileRunning($submitButton, function() { return promise; });
             var submit_data = $('#login_form').serialize();
 
             postJSON('/login_post', submit_data, function(json) {

diff --git a/cms/static/js/factories/manage_users.js b/cms/static/js/factories/manage_users.js
@@ -16,7 +16,7 @@ function(_, gettext, ManageUsersAndRoles) {
         // Roles order are important: first role is considered initial role (the role added to user when (s)he's added
         // Last role is considered an admin role (unrestricted access + ability to manage other users' permissions)
         // Changing roles is performed in promote-demote fashion, so moves only to adjacent roles is allowed
-        var roles = [{key: 'staff', name: gettext('Staff')}, {key: 'instructor', 'name': gettext('Admin')}];
+        var roles = [{key: 'staff', name: gettext('Staff')}, {key: 'instructor', name: gettext('Admin')}];
 
         var options = {
             el: $('#content'),

diff --git a/cms/static/js/factories/manage_users_lib.js b/cms/static/js/factories/manage_users_lib.js
@@ -19,7 +19,7 @@ function(_, gettext, ManageUsersAndRoles) {
         var roles = [
             {key: 'library_user', name: gettext('Library User')},
             {key: 'staff', name: gettext('Staff')},
-            {key: 'instructor', 'name': gettext('Admin')}
+            {key: 'instructor', name: gettext('Admin')}
         ];
 
         var options = {

diff --git a/cms/static/js/factories/settings_advanced.js b/cms/static/js/factories/settings_advanced.js
@@ -24,17 +24,16 @@ define([
         editor.render();
 
         $('#deprecated-settings').click(function() {
-            var wrapperDeprecatedSetting = $('.wrapper-deprecated-setting'),
-                deprecatedSettingsLabel = $('.deprecated-settings-label');
+            var $wrapperDeprecatedSetting = $('.wrapper-deprecated-setting'),
+                $deprecatedSettingsLabel = $('.deprecated-settings-label');
 
             if ($(this).is(':checked')) {
-                wrapperDeprecatedSetting.addClass('is-set');
-                deprecatedSettingsLabel.text(gettext('Hide Deprecated Settings'));
+                $wrapperDeprecatedSetting.addClass('is-set');
+                $deprecatedSettingsLabel.text(gettext('Hide Deprecated Settings'));
                 editor.render_deprecated = true;
-            }
-            else {
-                wrapperDeprecatedSetting.removeClass('is-set');
-                deprecatedSettingsLabel.text(gettext('Show Deprecated Settings'));
+            } else {
+                $wrapperDeprecatedSetting.removeClass('is-set');
+                $deprecatedSettingsLabel.text(gettext('Show Deprecated Settings'));
                 editor.render_deprecated = false;
             }
 

diff --git a/cms/static/js/models/course.js b/cms/static/js/models/course.js
@@ -1,7 +1,7 @@
 define(['backbone'], function(Backbone) {
     var Course = Backbone.Model.extend({
         defaults: {
-            'name': ''
+            name: ''
         },
         validate: function(attrs, options) {
             if (!attrs.name) {

diff --git a/cms/static/js/models/course_info.js b/cms/static/js/models/course_info.js
@@ -5,8 +5,8 @@ define(['backbone'], function(Backbone) {
         url: '',
 
         defaults: {
-            'updates': null,   // UpdateCollection
-            'handouts': null    // HandoutCollection
+            updates: null,   // UpdateCollection
+            handouts: null    // HandoutCollection
         }
     });
     return CourseInfo;

diff --git a/cms/static/js/models/course_update.js b/cms/static/js/models/course_update.js
@@ -2,16 +2,16 @@ define(['backbone', 'jquery', 'jquery.ui'], function(Backbone, $) {
     // course update -- biggest kludge here is the lack of a real id to map updates to originals
     var CourseUpdate = Backbone.Model.extend({
         defaults: {
-            'date': $.datepicker.formatDate('MM d, yy', new Date()),
-            'content': '',
-            'push_notification_enabled': false,
-            'push_notification_selected': false
+            date: $.datepicker.formatDate('MM d, yy', new Date()),
+            content: '',
+            push_notification_enabled: false,
+            push_notification_selected: false
         },
         validate: function(attrs) {
             var date_exists = (attrs.date !== null && attrs.date !== '');
             var date_is_valid_string = ($.datepicker.formatDate('MM d, yy', new Date(attrs.date)) === attrs.date);
             if (!(date_exists && date_is_valid_string)) {
-                return {'date_required': gettext('Action required: Enter a valid date.')};
+                return {date_required: gettext('Action required: Enter a valid date.')};
             }
         }
     });

diff --git a/cms/static/js/models/explicit_url.js b/cms/static/js/models/explicit_url.js
@@ -5,7 +5,7 @@
 define(['backbone'], function(Backbone) {
     return Backbone.Model.extend({
         defaults: {
-            'explicit_url': ''
+            explicit_url: ''
         },
         url: function() {
             return this.get('explicit_url');

diff --git a/cms/static/js/models/license.js b/cms/static/js/models/license.js
@@ -1,9 +1,9 @@
 define(['backbone', 'underscore'], function(Backbone, _) {
     var LicenseModel = Backbone.Model.extend({
         defaults: {
-            'type': null,
-            'options': {},
-            'custom': false // either `false`, or a string
+            type: null,
+            options: {},
+            custom: false // either `false`, or a string
         },
 
         initialize: function(attributes) {
@@ -55,16 +55,16 @@ define(['backbone', 'underscore'], function(Backbone, _) {
                 if (spaceIndex == -1) {
                     // if there's no space, it's a license type without options
                     return this.set({
-                        'type': string,
-                        'options': {},
-                        'custom': false
+                        type: string,
+                        options: {},
+                        custom: false
                     }, options);
                 } else {
                 // if there is a space, it's a custom license
                     return this.set({
-                        'type': null,
-                        'options': {},
-                        'custom': string
+                        type: null,
+                        options: {},
+                        custom: string
                     }, options);
                 }
             }
@@ -91,7 +91,7 @@ define(['backbone', 'underscore'], function(Backbone, _) {
             });
 
             return this.set({
-                'type': type, 'options': optionsObj, 'custom': false
+                type: type, options: optionsObj, custom: false
             }, options);
         }
     });

diff --git a/cms/static/js/models/location.js b/cms/static/js/models/location.js
@@ -9,11 +9,11 @@ define(['backbone', 'underscore'], function(Backbone, _) {
         },
         toUrl: function(overrides) {
             return;
-            (overrides && overrides['tag'] ? overrides['tag'] : this.get('tag')) + '://' +
-                (overrides && overrides['org'] ? overrides['org'] : this.get('org')) + '/' +
-                (overrides && overrides['course'] ? overrides['course'] : this.get('course')) + '/' +
-                (overrides && overrides['category'] ? overrides['category'] : this.get('category')) + '/' +
-                (overrides && overrides['name'] ? overrides['name'] : this.get('name')) + '/';
+            (overrides && overrides.tag ? overrides.tag : this.get('tag')) + '://' +
+                (overrides && overrides.org ? overrides.org : this.get('org')) + '/' +
+                (overrides && overrides.course ? overrides.course : this.get('course')) + '/' +
+                (overrides && overrides.category ? overrides.category : this.get('category')) + '/' +
+                (overrides && overrides.name ? overrides.name : this.get('name')) + '/';
         },
         _tagPattern: /[^:]+/g,
         _fieldPattern: new RegExp('[^/]+', 'g'),
@@ -27,8 +27,7 @@ define(['backbone', 'underscore'], function(Backbone, _) {
                     category: payload[3],
                     name: payload[4]
                 };
-            }
-            else if (_.isString(payload)) {
+            } else if (_.isString(payload)) {
                 this._tagPattern.lastIndex = 0; // odd regex behavior requires this to be reset sometimes
                 var foundTag = this._tagPattern.exec(payload);
                 if (foundTag) {
@@ -40,18 +39,15 @@ define(['backbone', 'underscore'], function(Backbone, _) {
                         category: this.getNextField(payload),
                         name: this.getNextField(payload)
                     };
-                }
-                else return null;
-            }
-            else {
+                } else return null;
+            } else {
                 return payload;
             }
         },
         getNextField: function(payload) {
             try {
                 return this._fieldPattern.exec(payload)[0];
-            }
-            catch (err) {
+            } catch (err) {
                 return '';
             }
         }

diff --git a/cms/static/js/models/metadata.js b/cms/static/js/models/metadata.js
@@ -5,13 +5,13 @@ define(['backbone'], function(Backbone) {
      */
     var Metadata = Backbone.Model.extend({
         defaults: {
-            'field_name': null,
-            'display_name': null,
-            'value': null,
-            'explicitly_set': null,
-            'default_value': null,
-            'options': null,
-            'type': null
+            field_name: null,
+            display_name: null,
+            value: null,
+            explicitly_set: null,
+            default_value: null,
+            options: null,
+            type: null
         },
 
         initialize: function() {

diff --git a/cms/static/js/models/module_info.js b/cms/static/js/models/module_info.js
@@ -3,10 +3,10 @@ define(['backbone', 'js/utils/module'], function(Backbone, ModuleUtils) {
         urlRoot: ModuleUtils.urlRoot,
 
         defaults: {
-            'id': null,
-            'data': null,
-            'metadata': null,
-            'children': null
+            id: null,
+            data: null,
+            metadata: null,
+            children: null
         }
     });
     return ModuleInfo;