ESLint rules: array-callback-return, no-invalid-this, func-style (#3151)

* satisfied array-callback-return rule
* satisfying no-invalid-this rule
* fixed invalid-this issues
* changed isNotEqual to arrow function
* added rule func-style
* added return false to satisfy array-callback-return rule

Co-authored-by: Joel McKinnon <jmckinnon@apple.com>
Co-authored-by: Joshi <simplyrender@gmail.com>
Co-authored-by: Andrew Henry <akhenry@gmail.com>
This commit is contained in:
Joel McKinnon
2020-08-10 10:59:18 -07:00
committed by GitHub
parent 0b4a843617
commit ef965ebdfd
49 changed files with 262 additions and 246 deletions

View File

@@ -164,7 +164,7 @@ function (
}
function saveAfterClone(clonedObject) {
return this.openmct.editor.save().then(() => {
return self.openmct.editor.save().then(() => {
// Force mutation for search indexing
return clonedObject;
});

View File

@@ -56,10 +56,11 @@ define(
*/
CreateWizard.prototype.getFormStructure = function (includeLocation) {
var sections = [],
domainObject = this.domainObject;
domainObject = this.domainObject,
self = this;
function validateLocation(parent) {
return parent && this.openmct.composition.checkPolicy(parent.useCapability('adapter'), domainObject.useCapability('adapter'));
return parent && self.openmct.composition.checkPolicy(parent.useCapability('adapter'), domainObject.useCapability('adapter'));
}
sections.push({

View File

@@ -60,7 +60,7 @@ define(
]
);
mockCopyService.perform.and.callFake(function () {
mockCopyService.perform.and.callFake(() => {
var performPromise,
callExtensions,
spy;
@@ -79,7 +79,7 @@ define(
}
};
spy = this.perform;
spy = mockCopyService.perform;
Object.keys(callExtensions).forEach(function (key) {
spy.calls.mostRecent()[key] = callExtensions[key];

View File

@@ -63,11 +63,11 @@ define(
]
);
mockLinkService.perform.and.callFake(function (object) {
mockLinkService.perform.and.callFake(object => {
var performPromise = new ControlledPromise();
this.perform.calls.mostRecent().promise = performPromise;
this.perform.calls.all()[this.perform.calls.count() - 1].promise =
mockLinkService.perform.calls.mostRecent().promise = performPromise;
mockLinkService.perform.calls.all()[mockLinkService.perform.calls.count() - 1].promise =
performPromise;
return performPromise.then(function (overrideObject) {

View File

@@ -60,7 +60,7 @@ define(
]
);
mockMoveService.perform.and.callFake(function () {
mockMoveService.perform.and.callFake(() => {
var performPromise,
callExtensions,
spy;
@@ -79,7 +79,7 @@ define(
}
};
spy = this.perform;
spy = mockMoveService.perform;
Object.keys(callExtensions).forEach(function (key) {
spy.calls.mostRecent()[key] = callExtensions[key];

View File

@@ -47,6 +47,7 @@ define(["zepto"], function ($) {
return new Promise(function (resolve, reject) {
input.trigger("click");
input.on('change', function (event) {
// eslint-disable-next-line no-invalid-this
file = this.files[0];
input.remove();
if (file) {

View File

@@ -19,6 +19,7 @@
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
/* eslint-disable no-invalid-this */
/**
* Module defining CustomRegistrars. Created by vwoeltje on 11/3/14.

View File

@@ -91,18 +91,19 @@ define([
});
it('filters results with a function', function () {
var modelResults = {
hits: [
{model: {thing: 1}},
{model: {thing: 2}},
{model: {thing: 3}}
],
total: 3
},
filterFunc = function (model) {
return model.thing < 2;
},
filtered = aggregator.applyFilter(modelResults, filterFunc);
const modelResults = {
hits: [
{model: {thing: 1}},
{model: {thing: 2}},
{model: {thing: 3}}
],
total: 3
};
let filtered = aggregator.applyFilter(modelResults, filterFunc);
function filterFunc(model) {
return model.thing < 2;
}
expect(filtered.hits).toEqual([
{model: {thing: 1}}

View File

@@ -33,14 +33,11 @@ define(
_
) {
var ZERO = function () {
return 0;
},
EMPTY_SERIES = {
getPointCount: ZERO,
getDomainValue: ZERO,
getRangeValue: ZERO
};
const EMPTY_SERIES = {
getPointCount: () => 0,
getDomainValue: () => 0,
getRangeValue: () => 0
};
/**
* Provides metadata about telemetry associated with a