ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-22 10:11:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ESLint upgrade, implement additional rules (#3230)

Browse Source 
* upgrade to ESLintv7, added overrides for rules violated
* removed overrides for spec files
* fixed no-prototype-builtins issues
* added rules for default-case-last, default-param-last, grouped-accessor-pairs, no-constructor-return, and added override for one violation

Co-authored-by: Andrew Henry <akhenry@gmail.com>
Co-authored-by: Shefali Joshi <simplyrender@gmail.com>
This commit is contained in:
Joel McKinnon 2020-08-10 11:23:35 -07:00 committed by GitHub
parent ef965ebdfd
commit 4d560086dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
119 changed files with 194 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.eslintrc.js
View File

@ -120,6 +120,14 @@ module.exports = {
"no-useless-computed-key": "error", "no-useless-computed-key": "error",
// https://eslint.org/docs/rules/rest-spread-spacing // https://eslint.org/docs/rules/rest-spread-spacing
"rest-spread-spacing": ["error"], "rest-spread-spacing": ["error"],
// https://eslint.org/docs/rules/default-case-last
"default-case-last": "error",
// https://eslint.org/docs/rules/default-param-last
"default-param-last": "error",
// https://eslint.org/docs/rules/grouped-accessor-pairs
"grouped-accessor-pairs": "error",
// https://eslint.org/docs/rules/no-constructor-return
"no-constructor-return": "error",
// https://eslint.org/docs/rules/array-callback-return // https://eslint.org/docs/rules/array-callback-return
"array-callback-return": "error", "array-callback-return": "error",
// https://eslint.org/docs/rules/no-invalid-this // https://eslint.org/docs/rules/no-invalid-this
@ -224,26 +232,21 @@ module.exports = {
} }
}], }],
"vue/multiline-html-element-content-newline": "off", "vue/multiline-html-element-content-newline": "off",
"vue/singleline-html-element-content-newline": "off" "vue/singleline-html-element-content-newline": "off",
}, },
"overrides": [ "overrides": [
{ {
"files": ["*Spec.js"], "files": LEGACY_FILES,
"rules": { "rules": {
"no-unused-vars": [ "no-unused-vars": [
"warn", "warn",
{ {
"vars": "all", "vars": "all",
"args": "none", "args": "none",
"varsIgnorePattern": "controller", "varsIgnorePattern": "controller"
} }
] ],
}
}, {
"files": LEGACY_FILES,
"rules": {
// https://eslint.org/docs/rules/no-nested-ternary
"no-nested-ternary": "off", "no-nested-ternary": "off",
"no-var": "off" "no-var": "off"
} }

3
example/eventGenerator/bundle.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2017, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
"./src/EventTelemetryProvider" "./src/EventTelemetryProvider"

3
example/eventGenerator/src/EventTelemetry.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2017, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define */
/** /**
* Module defining EventTelemetry. * Module defining EventTelemetry.

1
example/eventGenerator/src/EventTelemetryProvider.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define,Promise*/
/** /**
* Module defining EventTelemetryProvider. Created by chacskaylo on 06/18/2015. * Module defining EventTelemetryProvider. Created by chacskaylo on 06/18/2015.

1
example/export/ExportTelemetryAsCSVAction.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([], function () { define([], function () {
'use strict'; 'use strict';

1
example/export/bundle.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
'./ExportTelemetryAsCSVAction' './ExportTelemetryAsCSVAction'

1
example/forms/bundle.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
"./src/ExampleFormController" "./src/ExampleFormController"

3
example/forms/src/ExampleFormController.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2017, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define,window*/
define( define(
[], [],

2
example/generator/GeneratorMetadataProvider.js
View File

@ -117,7 +117,7 @@ define([
} }
GeneratorMetadataProvider.prototype.supportsMetadata = function (domainObject) { GeneratorMetadataProvider.prototype.supportsMetadata = function (domainObject) {
return METADATA_BY_TYPE.hasOwnProperty(domainObject.type); return Object.prototype.hasOwnProperty.call(METADATA_BY_TYPE, domainObject.type);
}; };
GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) { GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) {

6
example/generator/GeneratorProvider.js
View File

@ -62,15 +62,15 @@ define([
var workerRequest = {}; var workerRequest = {};
props.forEach(function (prop) { props.forEach(function (prop) {
if (domainObject.telemetry && domainObject.telemetry.hasOwnProperty(prop)) { if (domainObject.telemetry && Object.prototype.hasOwnProperty.call(domainObject.telemetry, prop)) {
workerRequest[prop] = domainObject.telemetry[prop]; workerRequest[prop] = domainObject.telemetry[prop];
} }
if (request && request.hasOwnProperty(prop)) { if (request && Object.prototype.hasOwnProperty.call(request, prop)) {
workerRequest[prop] = request[prop]; workerRequest[prop] = request[prop];
} }
if (!workerRequest.hasOwnProperty(prop)) { if (!Object.prototype.hasOwnProperty.call(workerRequest, prop)) {
workerRequest[prop] = REQUEST_DEFAULTS[prop]; workerRequest[prop] = REQUEST_DEFAULTS[prop];
} }

1
example/generator/SinewaveLimitProvider.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([

4
example/generator/generatorWorker.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2017, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -20,8 +20,6 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global self*/
(function () { (function () {
var FIFTEEN_MINUTES = 15 * 60 * 1000; var FIFTEEN_MINUTES = 15 * 60 * 1000;

1
example/generator/plugin.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
"./GeneratorProvider", "./GeneratorProvider",

1
example/identity/bundle.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
"./src/ExampleIdentityService" "./src/ExampleIdentityService"

1
example/identity/src/ExampleIdentityService.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define( define(
function () { function () {

1
example/mobile/bundle.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([], function () { define([], function () {
"use strict"; "use strict";

1
example/msl/bundle.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
"./src/RemsTelemetryServerAdapter", "./src/RemsTelemetryServerAdapter",

1
example/msl/src/MSLDataDictionary.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define( define(
[], [],

1
example/msl/src/RemsTelemetryModelProvider.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define( define(
function () { function () {

1
example/msl/src/RemsTelemetryProvider.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define */
define ( define (
['./RemsTelemetrySeries'], ['./RemsTelemetrySeries'],
function (RemsTelemetrySeries) { function (RemsTelemetrySeries) {

1
example/msl/src/RemsTelemetrySeries.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define */
define( define(
function () { function () {
"use strict"; "use strict";

1
example/msl/src/RemsTelemetryServerAdapter.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
/*jslint es5: true */ /*jslint es5: true */
define( define(

1
example/notifications/bundle.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
"./src/DialogLaunchController", "./src/DialogLaunchController",

1
example/notifications/src/DialogLaunchController.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define( define(
[], [],

1
example/notifications/src/DialogLaunchIndicator.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define,window*/
define( define(
[], [],

1
example/notifications/src/NotificationLaunchController.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define( define(
[], [],

1
example/notifications/src/NotificationLaunchIndicator.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define,window*/
define( define(
[], [],

1
example/persistence/bundle.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
"./src/BrowserPersistenceProvider" "./src/BrowserPersistenceProvider"

1
example/persistence/src/BrowserPersistenceProvider.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
/** /**
* Stubbed implementation of a persistence provider, * Stubbed implementation of a persistence provider,

1
example/policy/bundle.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
"./src/ExamplePolicy" "./src/ExamplePolicy"

1
example/policy/src/ExamplePolicy.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define( define(
[], [],

1
example/profiling/bundle.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
"./src/WatchIndicator", "./src/WatchIndicator",

1
example/profiling/src/DigestIndicator.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define( define(
[], [],

1
example/profiling/src/WatchIndicator.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define( define(
[], [],

1
example/scratchpad/bundle.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
"./src/ScratchPersistenceProvider" "./src/ScratchPersistenceProvider"

2
example/scratchpad/src/ScratchPersistenceProvider.js
View File

@ -20,8 +20,6 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define,window*/
define( define(
[], [],
function () { function () {

1
example/styleguide/src/ExampleStyleGuideModelProvider.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define( define(
[], [],

4
package.json
View File

@ -6,7 +6,7 @@
"devDependencies": { "devDependencies": {
"angular": ">=1.8.0", "angular": ">=1.8.0",
"angular-route": "1.4.14", "angular-route": "1.4.14",
"babel-eslint": "8.2.6", "babel-eslint": "10.0.3",
"comma-separated-values": "^3.6.4", "comma-separated-values": "^3.6.4",
"concurrently": "^3.6.1", "concurrently": "^3.6.1",
"copy-webpack-plugin": "^4.5.2", "copy-webpack-plugin": "^4.5.2",
@ -22,7 +22,7 @@
"d3-selection": "1.3.x", "d3-selection": "1.3.x",
"d3-time": "1.0.x", "d3-time": "1.0.x",
"d3-time-format": "2.1.x", "d3-time-format": "2.1.x",
"eslint": "5.2.0", "eslint": "7.0.0",
"eslint-plugin-vue": "^6.0.0", "eslint-plugin-vue": "^6.0.0",
"eslint-plugin-you-dont-need-lodash-underscore": "^6.10.0", "eslint-plugin-you-dont-need-lodash-underscore": "^6.10.0",
"eventemitter3": "^1.2.0", "eventemitter3": "^1.2.0",

1
platform/commonUI/edit/src/capabilities/TransactionCapabilityDecorator.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define( define(
['./TransactionalPersistenceCapability'], ['./TransactionalPersistenceCapability'],

1
platform/commonUI/edit/src/capabilities/TransactionalPersistenceCapability.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define( define(
[], [],

1
platform/commonUI/edit/src/services/TransactionService.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define( define(
['./Transaction', './NestedTransaction'], ['./Transaction', './NestedTransaction'],
function (Transaction, NestedTransaction) { function (Transaction, NestedTransaction) {

3
platform/commonUI/edit/test/actions/SaveActionSpec.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global describe,it,expect,beforeEach,jasmine*/
define( define(
["../../src/actions/SaveAction"], ["../../src/actions/SaveAction"],

1
platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global describe,it,expect,beforeEach,jasmine*/
define( define(
["../../src/actions/SaveAndStopEditingAction"], ["../../src/actions/SaveAndStopEditingAction"],

3
platform/commonUI/edit/test/actions/SaveAsActionSpec.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global describe,it,expect,beforeEach,jasmine,spyOn*/
define( define(
["../../src/actions/SaveAsAction"], ["../../src/actions/SaveAsAction"],

3
platform/commonUI/edit/test/capabilities/TransactionalPersistenceCapabilitySpec.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define,describe,it,expect,beforeEach,jasmine*/
define( define(
[ [

1
platform/commonUI/edit/test/controllers/EditActionControllerSpec.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global describe,it,expect,beforeEach,jasmine*/
define( define(
["../../src/controllers/EditActionController"], ["../../src/controllers/EditActionController"],

1
platform/commonUI/edit/test/services/NestedTransactionSpec.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define,describe,it,expect,beforeEach,jasmine*/
define(["../../src/services/NestedTransaction"], function (NestedTransaction) { define(["../../src/services/NestedTransaction"], function (NestedTransaction) {
var TRANSACTION_METHODS = ['add', 'commit', 'cancel', 'size']; var TRANSACTION_METHODS = ['add', 'commit', 'cancel', 'size'];

1
platform/commonUI/edit/test/services/TransactionManagerSpec.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define,describe,it,expect,beforeEach,jasmine*/
define( define(
["../../src/services/TransactionManager"], ["../../src/services/TransactionManager"],

1
platform/commonUI/edit/test/services/TransactionServiceSpec.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define,describe,it,expect,beforeEach,jasmine*/
define( define(
["../../src/services/TransactionService"], ["../../src/services/TransactionService"],

1
platform/commonUI/edit/test/services/TransactionSpec.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define,describe,it,expect,beforeEach,jasmine*/
define( define(
["../../src/services/Transaction"], ["../../src/services/Transaction"],

3
platform/commonUI/general/src/directives/MCTSelectable.js
View File

@ -58,7 +58,8 @@ define(
var removeSelectable = openmct.selection.selectable( var removeSelectable = openmct.selection.selectable(
element[0], element[0],
scope.$eval(attrs.mctSelectable), scope.$eval(attrs.mctSelectable),
attrs.hasOwnProperty('mctInitSelect') && scope.$eval(attrs.mctInitSelect) !== false Object.prototype.hasOwnProperty.call(attrs, 'mctInitSelect')
&& scope.$eval(attrs.mctInitSelect) !== false
); );
scope.$on("$destroy", function () { scope.$on("$destroy", function () {

2
platform/commonUI/general/src/services/UrlService.js
View File

@ -76,7 +76,7 @@ define(
var search = this.$location.search(), var search = this.$location.search(),
arr = []; arr = [];
for (var key in search) { for (var key in search) {
if (search.hasOwnProperty(key)) { if (Object.prototype.hasOwnProperty.call(search, key)) {
arr.push(key + '=' + search[key]); arr.push(key + '=' + search[key]);
} }
} }

3
platform/commonUI/general/test/directives/MCTTreeSpec.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/* global console*/
define([ define([
'../../src/directives/MCTTree', '../../src/directives/MCTTree',

3
platform/commonUI/general/test/ui/TreeViewSpec.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global describe,beforeEach,jasmine,it,expect*/
define([ define([
'../../src/ui/TreeView', '../../src/ui/TreeView',

2
platform/commonUI/notification/src/NotificationService.js
View File

@ -27,7 +27,7 @@ export default class NotificationService {
if (typeof message === 'string') { if (typeof message === 'string') {
return this.openmct.notifications.info(message); return this.openmct.notifications.info(message);
} else { } else {
if (message.hasOwnProperty('progress')) { if (Object.prototype.hasOwnProperty.call(message, 'progress')) {
return this.openmct.notifications.progress(message.title, message.progress, message.progressText); return this.openmct.notifications.progress(message.title, message.progress, message.progressText);
} else { } else {
return this.openmct.notifications.info(message.title); return this.openmct.notifications.info(message.title);

2
platform/core/src/models/ModelCacheService.js
View File

@ -56,7 +56,7 @@ define([], function () {
* @returns {boolean} true if present; false if not * @returns {boolean} true if present; false if not
*/ */
ModelCacheService.prototype.has = function (id) { ModelCacheService.prototype.has = function (id) {
return this.cache.hasOwnProperty(id); return Object.prototype.hasOwnProperty.call(this.cache, id);
}; };
/** /**

1
platform/core/src/runs/TransactingMutationListener.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([], function () { define([], function () {

4
platform/core/src/types/MergeModels.js
View File

@ -75,13 +75,13 @@ define(
function mergeObjects(a, b) { function mergeObjects(a, b) {
var result = {}; var result = {};
Object.keys(a).forEach(function (k) { Object.keys(a).forEach(function (k) {
result[k] = b.hasOwnProperty(k) result[k] = Object.prototype.hasOwnProperty.call(b, k)
? mergeModels(a[k], b[k], (merger || {})[k]) ? mergeModels(a[k], b[k], (merger || {})[k])
: a[k]; : a[k];
}); });
Object.keys(b).forEach(function (k) { Object.keys(b).forEach(function (k) {
// Copy any properties not already merged // Copy any properties not already merged
if (!a.hasOwnProperty(k)) { if (!Object.prototype.hasOwnProperty.call(a, k)) {
result[k] = b[k]; result[k] = b[k];
} }
}); });

4
platform/entanglement/test/ControlledPromise.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,7 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global spyOn*/
define( define(
function () { function () {

9
platform/entanglement/test/DomainObjectFactory.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -20,7 +20,6 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global jasmine*/
define( define(
function () { function () {
@ -110,7 +109,7 @@ define(
* @returns {*} capability object * @returns {*} capability object
*/ */
domainObject.getCapability.and.callFake(function (capability) { domainObject.getCapability.and.callFake(function (capability) {
if (config.capabilities.hasOwnProperty(capability)) { if (Object.prototype.hasOwnProperty.call(config.capabilities, capability)) {
return config.capabilities[capability]; return config.capabilities[capability];
} }
}); });
@ -124,7 +123,7 @@ define(
* @returns {boolean} * @returns {boolean}
*/ */
domainObject.hasCapability.and.callFake(function (capability) { domainObject.hasCapability.and.callFake(function (capability) {
return config.capabilities.hasOwnProperty(capability); return Object.prototype.hasOwnProperty.call(config.capabilities, capability);
}); });
/** /**
@ -137,7 +136,7 @@ define(
* @returns {*} result whatever was returned by `invoke`. * @returns {*} result whatever was returned by `invoke`.
*/ */
domainObject.useCapability.and.callFake(function (capability) { domainObject.useCapability.and.callFake(function (capability) {
if (config.capabilities.hasOwnProperty(capability)) { if (Object.prototype.hasOwnProperty.call(config.capabilities, capability)) {
if (!config.capabilities[capability].invoke) { if (!config.capabilities[capability].invoke) {
throw new Error( throw new Error(
capability + ' missing invoke function.' capability + ' missing invoke function.'

1
platform/entanglement/test/services/MockCopyService.js
View File

@ -20,7 +20,6 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global jasmine*/
define( define(
function () { function () {

1
platform/entanglement/test/services/MockLinkService.js
View File

@ -20,7 +20,6 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global jasmine*/
define( define(
[ [
'../ControlledPromise' '../ControlledPromise'

1
platform/entanglement/test/services/MockMoveService.js
View File

@ -20,7 +20,6 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global jasmine*/
define( define(
function () { function () {

2
platform/framework/src/FrameworkLayer.js
View File

@ -20,8 +20,6 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global window*/
define([ define([
'./Constants', './Constants',
'./FrameworkInitializer', './FrameworkInitializer',

4
platform/framework/src/Main.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -20,8 +20,6 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global window*/
/** /**
* Implements the framework layer, which handles the loading of bundles * Implements the framework layer, which handles the loading of bundles
* and the wiring-together of the extensions they expose. * and the wiring-together of the extensions they expose.

1
platform/import-export/bundle.js
View File

@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
"./src/actions/ExportAsJSONAction", "./src/actions/ExportAsJSONAction",

2
platform/import-export/src/actions/ExportAsJSONAction.js
View File

@ -86,7 +86,7 @@ define(['lodash'], function (_) {
// Only export if object is creatable // Only export if object is creatable
if (this.isCreatable(child)) { if (this.isCreatable(child)) {
// Prevents infinite export of self-contained objs // Prevents infinite export of self-contained objs
if (!this.tree.hasOwnProperty(this.getId(child))) { if (!Object.prototype.hasOwnProperty.call(this.tree, this.getId(child))) {
// If object is a link to something absent from // If object is a link to something absent from
// tree, generate new id and treat as new object // tree, generate new id and treat as new object
if (this.isExternal(child, parent)) { if (this.isExternal(child, parent)) {

14
platform/import-export/test/actions/ExportAsJSONActionSpec.js
View File

@ -144,7 +144,7 @@ define(
setTimeout(resolve, 100); setTimeout(resolve, 100);
}).then(function () { }).then(function () {
expect(Object.keys(action.tree).length).toBe(1); expect(Object.keys(action.tree).length).toBe(1);
expect(action.tree.hasOwnProperty("parentId")) expect(Object.prototype.hasOwnProperty.call(action.tree, "parentId"))
.toBeTruthy(); .toBeTruthy();
}); });
}); });
@ -184,9 +184,9 @@ define(
setTimeout(resolve, 100); setTimeout(resolve, 100);
}).then(function () { }).then(function () {
expect(Object.keys(action.tree).length).toBe(2); expect(Object.keys(action.tree).length).toBe(2);
expect(action.tree.hasOwnProperty("infiniteParentId")) expect(Object.prototype.hasOwnProperty.call(action.tree, "infiniteParentId"))
.toBeTruthy(); .toBeTruthy();
expect(action.tree.hasOwnProperty("infiniteChildId")) expect(Object.prototype.hasOwnProperty.call(action.tree, "infiniteChildId"))
.toBeTruthy(); .toBeTruthy();
}); });
}); });
@ -224,9 +224,9 @@ define(
setTimeout(resolve, 100); setTimeout(resolve, 100);
}).then(function () { }).then(function () {
expect(Object.keys(action.tree).length).toBe(2); expect(Object.keys(action.tree).length).toBe(2);
expect(action.tree.hasOwnProperty('parentId')) expect(Object.prototype.hasOwnProperty.call(action.tree, "parentId"))
.toBeTruthy(); .toBeTruthy();
expect(action.tree.hasOwnProperty('brandNewId')) expect(Object.prototype.hasOwnProperty.call(action.tree, "brandNewId"))
.toBeTruthy(); .toBeTruthy();
expect(action.tree.brandNewId.location).toBe('parentId'); expect(action.tree.brandNewId.location).toBe('parentId');
}); });
@ -239,8 +239,8 @@ define(
setTimeout(resolve, 100); setTimeout(resolve, 100);
}).then(function () { }).then(function () {
expect(Object.keys(exportedTree).length).toBe(2); expect(Object.keys(exportedTree).length).toBe(2);
expect(exportedTree.hasOwnProperty('openmct')).toBeTruthy(); expect(Object.prototype.hasOwnProperty.call(exportedTree, "openmct")).toBeTruthy();
expect(exportedTree.hasOwnProperty('rootId')).toBeTruthy(); expect(Object.prototype.hasOwnProperty.call(exportedTree, "rootId")).toBeTruthy();
}); });
}); });

2
platform/search/src/services/BareBonesSearchWorker.js
View File

@ -20,8 +20,6 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global self*/
/** /**
* Module defining BareBonesSearchWorker. Created by deeptailor on 10/03/2019. * Module defining BareBonesSearchWorker. Created by deeptailor on 10/03/2019.
*/ */

3
platform/search/src/services/GenericSearchProvider.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global setTimeout*/
/** /**
* Module defining GenericSearchProvider. Created by shale on 07/16/2015. * Module defining GenericSearchProvider. Created by shale on 07/16/2015.

2
platform/search/src/services/GenericSearchWorker.js
View File

@ -20,8 +20,6 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global self*/
/** /**
* Module defining GenericSearchWorker. Created by shale on 07/21/2015. * Module defining GenericSearchWorker. Created by shale on 07/21/2015.
*/ */

2
platform/search/test/services/GenericSearchWorkerSpec.js
View File

@ -20,8 +20,6 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global require*/
/** /**
* SearchSpec. Created by shale on 07/31/2015. * SearchSpec. Created by shale on 07/31/2015.
*/ */

2
src/BundleRegistry.js
View File

@ -28,7 +28,7 @@ define(function () {
} }
BundleRegistry.prototype.register = function (path, definition) { BundleRegistry.prototype.register = function (path, definition) {
if (this.knownBundles.hasOwnProperty(path)) { if (Object.prototype.hasOwnProperty.call(this.knownBundles, path)) {
throw new Error('Cannot register bundle with duplicate path', path); throw new Error('Cannot register bundle with duplicate path', path);
} }

2
src/adapter/policies/AdaptedViewPolicy.js
View File

@ -29,7 +29,7 @@ define([], function () {
view, view,
legacyObject legacyObject
) { ) {
if (view.hasOwnProperty('provider')) { if (Object.prototype.hasOwnProperty.call(view, 'provider')) {
var domainObject = legacyObject.useCapability('adapter'); var domainObject = legacyObject.useCapability('adapter');
return view.provider.canView(domainObject); return view.provider.canView(domainObject);

5
src/adapter/runs/TypeDeprecationChecker.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open openmct, Copyright (c) 2014-2018, United States Government * Open openmct, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -20,7 +20,6 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/* global console */
define([ define([
], function ( ], function (
@ -28,7 +27,7 @@ define([
) { ) {
function checkForDeprecatedFunctionality(typeDef) { function checkForDeprecatedFunctionality(typeDef) {
if (typeDef.hasOwnProperty('telemetry')) { if (Object.prototype.hasOwnProperty.call(typeDef, 'telemetry')) {
console.warn( console.warn(
'DEPRECATION WARNING: Telemetry data on type ' 'DEPRECATION WARNING: Telemetry data on type '
+ 'registrations will be deprecated in a future version, ' + 'registrations will be deprecated in a future version, '

2
src/adapter/views/installLegacyViews.js
View File

@ -21,7 +21,7 @@ define([
}); });
let inspectorTypes = openmct.$injector.get('types[]') let inspectorTypes = openmct.$injector.get('types[]')
.filter((t) => t.hasOwnProperty('inspector')); .filter((t) => Object.prototype.hasOwnProperty.call(t, 'inspector'));
inspectorTypes.forEach(function (typeDefinition) { inspectorTypes.forEach(function (typeDefinition) {
openmct.inspectorViews.addProvider(new TypeInspectorViewProvider(typeDefinition, openmct, convertToLegacyObject)); openmct.inspectorViews.addProvider(new TypeInspectorViewProvider(typeDefinition, openmct, convertToLegacyObject));

2
src/api/notifications/NotificationAPI.js
View File

@ -299,7 +299,7 @@ export default class NotificationAPI extends EventEmitter {
this._dismiss(notification); this._dismiss(notification);
}; };
if (notificationModel.hasOwnProperty('progressPerc')) { if (Object.prototype.hasOwnProperty.call(notificationModel, 'progressPerc')) {
notification.progress = (progressPerc, progressText) => { notification.progress = (progressPerc, progressText) => {
notification.model.progressPerc = progressPerc; notification.model.progressPerc = progressPerc;
notification.model.progressText = progressText; notification.model.progressText = progressText;

4
src/api/objects/object-utils.js
View File

@ -32,8 +32,8 @@ define([
*/ */
function isIdentifier(thing) { function isIdentifier(thing) {
return typeof thing === 'object' return typeof thing === 'object'
&& thing.hasOwnProperty('key') && Object.prototype.hasOwnProperty.call(thing, 'key')
&& thing.hasOwnProperty('namespace'); && Object.prototype.hasOwnProperty.call(thing, 'namespace');
} }
/** /**

12
src/api/telemetry/TelemetryAPI.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,7 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global console*/
define([ define([
'./TelemetryMetadataManager', './TelemetryMetadataManager',
'./TelemetryValueFormatter', './TelemetryValueFormatter',
@ -247,15 +247,15 @@ define([
* @private * @private
*/ */
TelemetryAPI.prototype.standardizeRequestOptions = function (options) { TelemetryAPI.prototype.standardizeRequestOptions = function (options) {
if (!options.hasOwnProperty('start')) { if (!Object.prototype.hasOwnProperty.call(options, 'start')) {
options.start = this.openmct.time.bounds().start; options.start = this.openmct.time.bounds().start;
} }
if (!options.hasOwnProperty('end')) { if (!Object.prototype.hasOwnProperty.call(options, 'end')) {
options.end = this.openmct.time.bounds().end; options.end = this.openmct.time.bounds().end;
} }
if (!options.hasOwnProperty('domain')) { if (!Object.prototype.hasOwnProperty.call(options, 'domain')) {
options.domain = this.openmct.time.timeSystem().key; options.domain = this.openmct.time.timeSystem().key;
} }
}; };
@ -386,7 +386,7 @@ define([
}).reduce(function (a, b) { }).reduce(function (a, b) {
var results = {}; var results = {};
Object.keys(a).forEach(function (key) { Object.keys(a).forEach(function (key) {
if (b.hasOwnProperty(key)) { if (Object.prototype.hasOwnProperty.call(b, key)) {
results[key] = a[key]; results[key] = a[key];
} }
}); });

19
src/api/telemetry/TelemetryMetadataManager.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global console*/
define([ define([
'lodash' 'lodash'
@ -31,26 +30,26 @@ define([
valueMetadata.source = valueMetadata.source || valueMetadata.key; valueMetadata.source = valueMetadata.source || valueMetadata.key;
valueMetadata.hints = valueMetadata.hints || {}; valueMetadata.hints = valueMetadata.hints || {};
if (valueMetadata.hints.hasOwnProperty('x')) { if (Object.prototype.hasOwnProperty.call(valueMetadata.hints, 'x')) {
console.warn( console.warn(
'DEPRECATION WARNING: `x` hints should be replaced with ' 'DEPRECATION WARNING: `x` hints should be replaced with '
+ '`domain` hints moving forward. ' + '`domain` hints moving forward. '
+ 'https://github.com/nasa/openmct/issues/1546' + 'https://github.com/nasa/openmct/issues/1546'
); );
if (!valueMetadata.hints.hasOwnProperty('domain')) { if (!Object.prototype.hasOwnProperty.call(valueMetadata.hints, 'domain')) {
valueMetadata.hints.domain = valueMetadata.hints.x; valueMetadata.hints.domain = valueMetadata.hints.x;
} }
delete valueMetadata.hints.x; delete valueMetadata.hints.x;
} }
if (valueMetadata.hints.hasOwnProperty('y')) { if (Object.prototype.hasOwnProperty.call(valueMetadata.hints, 'y')) {
console.warn( console.warn(
'DEPRECATION WARNING: `y` hints should be replaced with ' 'DEPRECATION WARNING: `y` hints should be replaced with '
+ '`range` hints moving forward. ' + '`range` hints moving forward. '
+ 'https://github.com/nasa/openmct/issues/1546' + 'https://github.com/nasa/openmct/issues/1546'
); );
if (!valueMetadata.hints.hasOwnProperty('range')) { if (!Object.prototype.hasOwnProperty.call(valueMetadata.hints, 'range')) {
valueMetadata.hints.range = valueMetadata.hints.y; valueMetadata.hints.range = valueMetadata.hints.y;
} }
@ -62,16 +61,16 @@ define([
valueMetadata.values = valueMetadata.enumerations.map(e => e.value); valueMetadata.values = valueMetadata.enumerations.map(e => e.value);
} }
if (!valueMetadata.hasOwnProperty('max')) { if (!Object.prototype.hasOwnProperty.call(valueMetadata, 'max')) {
valueMetadata.max = Math.max(valueMetadata.values) + 1; valueMetadata.max = Math.max(valueMetadata.values) + 1;
} }
if (!valueMetadata.hasOwnProperty('min')) { if (!Object.prototype.hasOwnProperty.call(valueMetadata, 'min')) {
valueMetadata.min = Math.min(valueMetadata.values) - 1; valueMetadata.min = Math.min(valueMetadata.values) - 1;
} }
} }
if (!valueMetadata.hints.hasOwnProperty('priority')) { if (!Object.prototype.hasOwnProperty.call(valueMetadata.hints, 'priority')) {
valueMetadata.hints.priority = index; valueMetadata.hints.priority = index;
} }
@ -115,7 +114,7 @@ define([
) { ) {
function hasHint(hint) { function hasHint(hint) {
// eslint-disable-next-line no-invalid-this // eslint-disable-next-line no-invalid-this
return this.hints.hasOwnProperty(hint); return Object.prototype.hasOwnProperty.call(this.hints, hint);
} }
function hasHints(metadata) { function hasHints(metadata) {

4
src/api/telemetry/TelemetryValueFormatter.js
View File

@ -63,7 +63,7 @@ define([
byString: {} byString: {}
}); });
this.formatter.format = function (value) { this.formatter.format = function (value) {
if (this.enumerations.byValue.hasOwnProperty(value)) { if (Object.prototype.hasOwnProperty.call(this.enumerations.byValue, value)) {
return this.enumerations.byValue[value]; return this.enumerations.byValue[value];
} }
@ -71,7 +71,7 @@ define([
}.bind(this); }.bind(this);
this.formatter.parse = function (string) { this.formatter.parse = function (string) {
if (typeof string === "string") { if (typeof string === "string") {
if (this.enumerations.byString.hasOwnProperty(string)) { if (Object.prototype.hasOwnProperty.call(this.enumerations.byString, string)) {
return this.enumerations.byString[string]; return this.enumerations.byString[string];
} }
} }

5
src/api/types/TypeRegistry.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global console*/
define(['./Type'], function (Type) { define(['./Type'], function (Type) {
/** /**
@ -63,7 +62,7 @@ define(['./Type'], function (Type) {
* @private * @private
*/ */
TypeRegistry.prototype.standardizeType = function (typeDef) { TypeRegistry.prototype.standardizeType = function (typeDef) {
if (typeDef.hasOwnProperty('label')) { if (Object.prototype.hasOwnProperty.call(typeDef, 'label')) {
console.warn( console.warn(
'DEPRECATION WARNING typeDef: ' + typeDef.label + '. ' 'DEPRECATION WARNING typeDef: ' + typeDef.label + '. '
+ '`label` is deprecated in type definitions. Please use ' + '`label` is deprecated in type definitions. Please use '

2
src/plugins/condition/ConditionManager.js
View File

@ -303,7 +303,7 @@ export default class ConditionManager extends EventEmitter {
isTelemetryUsed(endpoint) { isTelemetryUsed(endpoint) {
const id = this.openmct.objects.makeKeyString(endpoint.identifier); const id = this.openmct.objects.makeKeyString(endpoint.identifier);
for (const condition of this.conditions) { for (let condition of this.conditions) {
if (condition.isTelemetryUsed(id)) { if (condition.isTelemetryUsed(id)) {
return true; return true;
} }

4
src/plugins/condition/components/Criterion.vue
View File

@ -213,9 +213,9 @@ export default {
this.enumerations = foundMetadata.enumerations; this.enumerations = foundMetadata.enumerations;
} else if (foundMetadata.format === 'string' || foundMetadata.format === 'number') { } else if (foundMetadata.format === 'string' || foundMetadata.format === 'number') {
this.operationFormat = foundMetadata.format; this.operationFormat = foundMetadata.format;
} else if (foundMetadata.hints.hasOwnProperty('range')) { } else if (Object.prototype.hasOwnProperty.call(foundMetadata.hints, 'range')) {
this.operationFormat = 'number'; this.operationFormat = 'number';
} else if (foundMetadata.hints.hasOwnProperty('domain')) { } else if (Object.prototype.hasOwnProperty.call(foundMetadata.hints, 'domain')) {
this.operationFormat = 'number'; this.operationFormat = 'number';
} else if (foundMetadata.key === 'name') { } else if (foundMetadata.key === 'name') {
this.operationFormat = 'string'; this.operationFormat = 'string';

6
src/plugins/condition/utils/evaluator.js
View File

@ -34,7 +34,7 @@ export function evaluateResults(results, trigger) {
} }
function matchAll(results) { function matchAll(results) {
for (const result of results) { for (let result of results) {
if (result !== true) { if (result !== true) {
return false; return false;
} }
@ -44,7 +44,7 @@ function matchAll(results) {
} }
function matchAny(results) { function matchAny(results) {
for (const result of results) { for (let result of results) {
if (result === true) { if (result === true) {
return true; return true;
} }
@ -55,7 +55,7 @@ function matchAny(results) {
function matchExact(results, target) { function matchExact(results, target) {
let matches = 0; let matches = 0;
for (const result of results) { for (let result of results) {
if (result === true) { if (result === true) {
matches++; matches++;
} }

4
src/plugins/displayLayout/components/DisplayLayout.vue
View File

@ -375,8 +375,8 @@ export default {
.filter(type => type.startsWith(DRAG_OBJECT_TRANSFER_PREFIX)) .filter(type => type.startsWith(DRAG_OBJECT_TRANSFER_PREFIX))
.map(type => type.substring(DRAG_OBJECT_TRANSFER_PREFIX.length))[0]; .map(type => type.substring(DRAG_OBJECT_TRANSFER_PREFIX.length))[0];
// If the layout already contains the given object, then shortcut the default dragover behavior and // If the layout already contains the given object, then shortcut the default dragover behavior and
// potentially allow drop. Display layouts allow drag drop of duplicate telemetry objects. // potentially allow drop. Display layouts allow drag drop of duplicate telemetry objects.
if (this.containsObject(draggedKeyString)) { if (this.containsObject(draggedKeyString)) {
$event.preventDefault(); $event.preventDefault();
} }

1
src/plugins/notebook/snapshot-container.js
View File

@ -14,6 +14,7 @@ export default class SnapshotContainer extends EventEmitter {
this.openmct = openmct; this.openmct = openmct;
// eslint-disable-next-line
return SnapshotContainer.instance; return SnapshotContainer.instance;
} }

4
src/plugins/plot/plugin.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -20,8 +20,6 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
"./src/chart/MCTChartDirective", "./src/chart/MCTChartDirective",
"./src/plot/MCTPlotDirective", "./src/plot/MCTPlotDirective",

3
src/plugins/plot/src/chart/MCTChartAlarmPointSet.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
'../lib/extend', '../lib/extend',

3
src/plugins/plot/src/chart/MCTChartController.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define,requestAnimationFrame,Float32Array*/
/** /**
* Module defining MCTChart. Created by vwoeltje on 11/12/14. * Module defining MCTChart. Created by vwoeltje on 11/12/14.

3
src/plugins/plot/src/chart/MCTChartDirective.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
/** /**
* Module defining MCTChart. Created by vwoeltje on 11/12/14. * Module defining MCTChart. Created by vwoeltje on 11/12/14.

3
src/plugins/plot/src/chart/MCTChartLineLinear.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
'./MCTChartSeriesElement' './MCTChartSeriesElement'

3
src/plugins/plot/src/chart/MCTChartLineStepAfter.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
'./MCTChartSeriesElement' './MCTChartSeriesElement'

3
src/plugins/plot/src/chart/MCTChartPointSet.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
'./MCTChartSeriesElement' './MCTChartSeriesElement'

3
src/plugins/plot/src/chart/MCTChartSeriesElement.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define,Float32Array*/
define([ define([
'../lib/extend', '../lib/extend',

3
src/plugins/plot/src/configuration/Collection.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
'EventEmitter', 'EventEmitter',

3
src/plugins/plot/src/configuration/Model.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
'lodash', 'lodash',

3
src/plugins/plot/src/configuration/PlotConfigurationModel.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
'./Collection', './Collection',

3
src/plugins/plot/src/configuration/PlotSeries.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/*global define*/
define([ define([
'lodash', 'lodash',

3
src/plugins/plot/src/draw/DrawLoader.js
View File

@ -1,5 +1,5 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government * Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
@ -19,7 +19,6 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/* global console */
define( define(
[ [

Some files were not shown because too many files have changed in this diff Show More