Merge branch 'master' into disable-editing-toggle-061120

- Replaced toggle switch with button;

.circleci/config.yml

@@ -11,12 +11,12 @@ jobs:
             name: Update npm
             command: 'sudo npm install -g npm@latest'
         - restore_cache:
-            key: dependency-cache-{{ checksum "package.json" }}
+            key: dependency-cache-13-{{ checksum "package.json" }}
         - run:
             name: Installing dependencies (npm install)
             command: npm install
         - save_cache:
-            key: dependency-cache-{{ checksum "package.json" }}
+            key: dependency-cache-13-{{ checksum "package.json" }}
             paths:
               - node_modules
         - run:

.eslintrc.js

@@ -54,7 +54,7 @@ module.exports = {
             {
                 "anonymous": "always",
                 "asyncArrow": "always",
-                "named": "never"
+                "named": "never",
             }
         ],
         "array-bracket-spacing": "error",
@@ -120,100 +120,6 @@ module.exports = {
         "no-useless-computed-key": "error",
         // https://eslint.org/docs/rules/rest-spread-spacing
         "rest-spread-spacing": ["error"],
-        // https://eslint.org/docs/rules/no-var
-        "no-var": "error",
-        // https://eslint.org/docs/rules/one-var
-        "one-var": ["error", "never"],
-        // 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
-        "array-callback-return": "error",
-        // https://eslint.org/docs/rules/no-invalid-this
-        "no-invalid-this": "error", // Believe this one actually surfaces some bugs
-        // https://eslint.org/docs/rules/func-style
-        "func-style": ["error", "declaration"],
-        // https://eslint.org/docs/rules/no-unused-expressions
-        "no-unused-expressions": "error",
-        // https://eslint.org/docs/rules/no-useless-concat
-        "no-useless-concat": "error",
-        // https://eslint.org/docs/rules/radix
-        "radix": "error",
-        // https://eslint.org/docs/rules/require-await
-        "require-await": "error",
-        // https://eslint.org/docs/rules/no-alert
-        "no-alert": "error",
-        // https://eslint.org/docs/rules/no-useless-constructor
-        "no-useless-constructor": "error",
-        // https://eslint.org/docs/rules/no-duplicate-imports
-        "no-duplicate-imports": "error",
-
-        // https://eslint.org/docs/rules/no-implicit-coercion
-        "no-implicit-coercion": "error",
-        //https://eslint.org/docs/rules/no-unneeded-ternary
-        "no-unneeded-ternary": "error",
-        // https://eslint.org/docs/rules/semi
-        "semi": ["error", "always"],
-        // https://eslint.org/docs/rules/no-multi-spaces
-        "no-multi-spaces": "error",
-        // https://eslint.org/docs/rules/key-spacing
-        "key-spacing": ["error", {
-            "afterColon": true
-        }],
-        // https://eslint.org/docs/rules/keyword-spacing
-        "keyword-spacing": ["error", {
-            "before": true,
-            "after": true
-        }],
-        // https://eslint.org/docs/rules/comma-spacing
-        // Also requires one line code fix
-        "comma-spacing": ["error", {
-            "after": true
-        }],
-        //https://eslint.org/docs/rules/no-whitespace-before-property
-        "no-whitespace-before-property": "error",
-        // https://eslint.org/docs/rules/object-curly-newline
-        "object-curly-newline": ["error", {
-            "consistent": true,
-            "multiline": true
-        }],
-        // https://eslint.org/docs/rules/object-property-newline
-        "object-property-newline": "error",
-        // https://eslint.org/docs/rules/brace-style
-        "brace-style": "error",
-        // https://eslint.org/docs/rules/no-multiple-empty-lines
-        "no-multiple-empty-lines": ["error", {"max": 1}],
-        // https://eslint.org/docs/rules/operator-linebreak
-        "operator-linebreak": ["error", "before", {"overrides": {"=": "after"}}],
-        // https://eslint.org/docs/rules/padding-line-between-statements
-        "padding-line-between-statements": ["error", {
-            "blankLine": "always",
-            "prev": "multiline-block-like",
-            "next": "*"
-        }, {
-            "blankLine": "always",
-            "prev": "*",
-            "next": "return"
-        }],
-        // https://eslint.org/docs/rules/space-infix-ops
-        "space-infix-ops": "error",
-        // https://eslint.org/docs/rules/space-unary-ops
-        "space-unary-ops": ["error", {
-            "words": true,
-            "nonwords": false
-        }],
-        // https://eslint.org/docs/rules/arrow-spacing
-        "arrow-spacing": "error",
-        // https://eslint.org/docs/rules/semi-spacing
-        "semi-spacing": ["error", {
-            "before": false,
-            "after": true
-        }],
 
         "vue/html-indent": [
             "error",
@@ -245,25 +151,28 @@ module.exports = {
             }
         }],
         "vue/multiline-html-element-content-newline": "off",
-        "vue/singleline-html-element-content-newline": "off",
-        "vue/no-mutating-props": "off"
-
+        "vue/singleline-html-element-content-newline": "off"
     },
     "overrides": [
         {
-            "files": LEGACY_FILES,
+            "files": ["*Spec.js"],
             "rules": {
                 "no-unused-vars": [
                     "warn",
                     {
                         "vars": "all",
                         "args": "none",
-                        "varsIgnorePattern": "controller"
+                        "varsIgnorePattern": "controller",
+
                     }
-                ],
+                ]
+            }
+        }, {
+            "files": LEGACY_FILES,
+            "rules": {
+                // https://eslint.org/docs/rules/no-nested-ternary
                 "no-nested-ternary": "off",
-                "no-var": "off",
-                "one-var": "off"
+                "no-var": "off"
             }
         }
     ]

.gitignore

@@ -37,7 +37,4 @@ protractor/logs
 # npm-debug log
 npm-debug.log
 
-# karma reports
-report.*.json
-
 package-lock.json

CONTRIBUTING.md

@@ -182,7 +182,7 @@ The following guidelines are provided for anyone contributing source code to the
 1. Avoid the use of "magic" values.
    eg.
    ```JavaScript
-   const UNAUTHORIZED = 401;
+   Const UNAUTHORIZED = 401
    if (responseCode === UNAUTHORIZED)
    ```
    is preferable to

LICENSE.md

@@ -1,6 +1,6 @@
 # Open MCT License
 
-Open MCT, Copyright (c) 2014-2021, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
+Open MCT, Copyright (c) 2014-2020, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
 
 Open MCT is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
 

build-docs.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #*****************************************************************************
-#* Open MCT, Copyright (c) 2014-2021, United States Government
+#* Open MCT, Copyright (c) 2014-2017, United States Government
 #* as represented by the Administrator of the National Aeronautics and Space
 #* Administration. All rights reserved.
 #*

copyright-notice.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2020, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

copyright-notice.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2020, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

docs/gendocs.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

docs/src/process/version.md

@@ -92,59 +92,47 @@ should update (or delegate the task of updating) Open MCT version
 numbers by the following process:
 
 1. Update version number in `package.json`
-  1. Create a new branch off the `master` branch.
-  2. Remove `-SNAPSHOT` suffix from the version in `package.json`.
-  3. Verify that resulting version number meets semantic versioning
-     requirements relative to previous stable version. Increment the 
-     version number if necessary.
-  4. If version is considered unstable (which may be the case during
+  1. Remove `-SNAPSHOT` suffix.
+  2. Verify that resulting version number meets semantic versioning
+     requirements relative to previous stable version. Increment if
+     necessary.
+  3. If version is considered unstable (which may be the case during
      the first three sprints of a release), apply a new suffix per
      [Version Numbering](#version-numbering) guidance above.
 2. Tag the release.
-  1. Commit changes to `package.json` on the new branch created in 
-     the previous step.
+  1. Commit changes to `package.json` on the `master` branch.
      The commit message should reference the sprint being closed,
      preferably by a URL reference to the associated Milestone in
      GitHub.
   2. Verify that build still completes, that application passes
      smoke-testing, and that only differences from tested versions
      are the changes to version number above.
-  3. Push the new branch.
+  3. Push the `master` branch.
   4. Tag this commit with the version number, prepending the letter "v".
      (e.g. `git tag v0.9.3-alpha`)
   5. Push the tag to GitHub. (e.g. `git push origin v0.9.3-alpha`).
 3. Upload a release archive.
-  1. Use the [GitHub release interface](https://github.com/nasa/openmct/releases)
+  1. Run `npm pack` to generate the archive.
+  2. Use the [GitHub release interface](https://github.com/nasa/openmct/releases)
      to draft a new release.
-  2. Choose the existing tag for the new version (created and pushed above.)
+  3. Choose the existing tag for the new version (created and pushed above.)
      Enter the tag name as the release name as well; see existing releases
-     for examples. (e.g. `Open MCT v0.9.3-alpha`)
-  3. Designate the release as a "pre-release" as appropriate (for instance,
+     for examples.
+  4. Attach the release archive.
+  5. Designate the release as a "pre-release" as appropriate (for instance,
      when the version number has been suffixed as unstable, or when
      the version number is below 1.0.0.)
-  4. Add release notes including any breaking changes, enhancements, 
-     bug fixes with solutions in brief.
-  5. Publish the release.
-4. Publish the release to npm
-  1. Login to npm
-  2. Checkout the tag created in the previous step.
-  3. In `package.json` change package to be public (private: false)
-  4. Test the package before publishing by doing `npm publish --dry-run` 
-     if necessary.
-  5. Publish the package to the npmjs registry (e.g. `npm publish --access public`)
-  6. Confirm the package has been published (e.g. `https://www.npmjs.com/package/openmct`)
-5. Update snapshot status in `package.json`
-  1. Create a new branch off the `master` branch.
-  2. Remove any suffix from the version number, 
-     or increment the _patch_ version if there is no suffix.
-  3. Append a `-SNAPSHOT` suffix.
-  4. Commit changes to `package.json` on the `master` branch.
+4. Restore snapshot status in `package.json`
+  1. Remove any suffix from the version number, or increment the
+     _patch_ version if there is no suffix.
+  2. Append a `-SNAPSHOT` suffix.
+  3. Commit changes to `package.json` on the `master` branch.
      The commit message should reference the sprint being opened,
      preferably by a URL reference to the associated Milestone in
      GitHub.
-  5. Verify that build still completes, that application passes
+  4. Verify that build still completes, that application passes
      smoke-testing.
-  6. Create a PR to be merged into the `master` branch.
+  5. Push the `master` branch.
 
 Projects dependent on Open MCT being co-developed by the Open MCT
 team should follow a similar process, except that they should

example/eventGenerator/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define([
     "./src/EventTelemetryProvider"
@@ -28,7 +29,7 @@ define([
     "use strict";
 
     return {
-        name: "example/eventGenerator",
+        name:"example/eventGenerator",
         definition: {
             "name": "Event Message Generator",
             "description": "For development use. Creates sample event message data that mimics a live data stream.",

example/eventGenerator/src/EventTelemetry.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define */
 
 /**
  * Module defining EventTelemetry.
@@ -43,14 +44,13 @@ define(
             };
 
             generatorData.getDomainValue = function (i, domain) {
-                return i * interval
-                        + (domain !== 'delta' ? firstObservedTime : 0);
+                return i * interval +
+                        (domain !== 'delta' ? firstObservedTime : 0);
             };
 
             generatorData.getRangeValue = function (i, range) {
                 var domainDelta = this.getDomainValue(i) - firstObservedTime,
                     ind = i % messages.length;
-
                 return messages[ind] + " - [" + domainDelta.toString() + "]";
             };
 

example/eventGenerator/src/EventTelemetryProvider.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define,Promise*/
 
 /**
  * Module defining EventTelemetryProvider. Created by chacskaylo on 06/18/2015.
@@ -56,7 +57,6 @@ define(
                 results.forEach(function (result) {
                     packaged[result.key] = result.telemetry;
                 });
-
                 // Format as expected (sources -> keys -> telemetry)
                 return { eventGenerator: packaged };
             }

example/export/ExportTelemetryAsCSVAction.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define([], function () {
     'use strict';
@@ -75,14 +76,13 @@ define([], function () {
                 copyRangesToRow(row, i);
                 rows.push(row);
             }
-
             exportService.exportCSV(rows, { headers: headers });
         });
     };
 
     ExportTelemetryAsCSVAction.appliesTo = function (context) {
-        return context.domainObject
-            && context.domainObject.hasCapability("telemetry");
+        return context.domainObject &&
+            context.domainObject.hasCapability("telemetry");
     };
 
     return ExportTelemetryAsCSVAction;

example/export/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define([
     './ExportTelemetryAsCSVAction'
@@ -26,7 +27,7 @@ define([
     "use strict";
 
     return {
-        name: "example/export",
+        name:"example/export",
         definition: {
             "name": "Example of using CSV Export",
             "extensions": {

example/forms/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define([
     "./src/ExampleFormController"
@@ -28,7 +29,7 @@ define([
     "use strict";
 
     return {
-        name: "example/forms",
+        name:"example/forms",
         definition: {
             "name": "Declarative Forms example",
             "sources": "src",

example/forms/res/templates/exampleForm.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

example/forms/src/ExampleFormController.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define,window*/
 
 define(
     [],
@@ -79,7 +80,7 @@ define(
                                 control: "button",
                                 csslass: "icon-save",
                                 click: function () {
-                                    console.log("Save");
+                                    window.alert("Save");
                                 }
                             },
                             {
@@ -87,7 +88,7 @@ define(
                                 csslass: "icon-x",
                                 description: "Button B",
                                 click: function () {
-                                    console.log("Cancel");
+                                    window.alert("Cancel");
                                 }
                             },
                             {
@@ -96,7 +97,7 @@ define(
                                 description: "Button C",
                                 disabled: true,
                                 click: function () {
-                                    console.log("Delete");
+                                    window.alert("Delete");
                                 }
                             }
                         ]
@@ -151,22 +152,10 @@ define(
                                 name: "Choose something",
                                 control: "select",
                                 options: [
-                                    {
-                                        name: "Hats",
-                                        value: "hats"
-                                    },
-                                    {
-                                        name: "Bats",
-                                        value: "bats"
-                                    },
-                                    {
-                                        name: "Cats",
-                                        value: "cats"
-                                    },
-                                    {
-                                        name: "Mats",
-                                        value: "mats"
-                                    }
+                                    { name: "Hats", value: "hats" },
+                                    { name: "Bats", value: "bats" },
+                                    { name: "Cats", value: "cats" },
+                                    { name: "Mats", value: "mats" }
                                 ],
                                 key: "aChoice"
                             },
@@ -175,22 +164,10 @@ define(
                                 control: "select",
                                 required: true,
                                 options: [
-                                    {
-                                        name: "Hats",
-                                        value: "hats"
-                                    },
-                                    {
-                                        name: "Bats",
-                                        value: "bats"
-                                    },
-                                    {
-                                        name: "Cats",
-                                        value: "cats"
-                                    },
-                                    {
-                                        name: "Mats",
-                                        value: "mats"
-                                    }
+                                    { name: "Hats", value: "hats" },
+                                    { name: "Bats", value: "bats" },
+                                    { name: "Cats", value: "cats" },
+                                    { name: "Mats", value: "mats" }
                                 ],
                                 key: "aRequiredChoice"
                             }

example/generator/GeneratorMetadataProvider.js

@@ -28,20 +28,9 @@ define([
                         domain: 2
                     }
                 },
-                // Need to enable "LocalTimeSystem" plugin to make use of this
-                // {
-                //     key: "local",
-                //     name: "Time",
-                //     format: "local-format",
-                //     source: "utc",
-                //     hints: {
-                //         domain: 3
-                //     }
-                // },
                 {
                     key: "sin",
                     name: "Sine",
-                    unit: "Hz",
                     formatString: '%0.2f',
                     hints: {
                         range: 1
@@ -50,7 +39,6 @@ define([
                 {
                     key: "cos",
                     name: "Cosine",
-                    unit: "deg",
                     formatString: '%0.2f',
                     hints: {
                         range: 2
@@ -73,15 +61,6 @@ define([
                         domain: 1
                     }
                 },
-                {
-                    key: "local",
-                    name: "Time",
-                    format: "utc",
-                    source: "utc",
-                    hints: {
-                        domain: 2
-                    }
-                },
                 {
                     key: "state",
                     source: "value",
@@ -110,14 +89,14 @@ define([
                 }
             ]
         }
-    };
+    }
 
     function GeneratorMetadataProvider() {
 
     }
 
     GeneratorMetadataProvider.prototype.supportsMetadata = function (domainObject) {
-        return Object.prototype.hasOwnProperty.call(METADATA_BY_TYPE, domainObject.type);
+        return METADATA_BY_TYPE.hasOwnProperty(domainObject.type);
     };
 
     GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) {

example/generator/GeneratorProvider.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -62,23 +62,18 @@ define([
         var workerRequest = {};
 
         props.forEach(function (prop) {
-            if (domainObject.telemetry && Object.prototype.hasOwnProperty.call(domainObject.telemetry, prop)) {
+            if (domainObject.telemetry && domainObject.telemetry.hasOwnProperty(prop)) {
                 workerRequest[prop] = domainObject.telemetry[prop];
             }
-
-            if (request && Object.prototype.hasOwnProperty.call(request, prop)) {
+            if (request && request.hasOwnProperty(prop)) {
                 workerRequest[prop] = request[prop];
             }
-
-            if (!Object.prototype.hasOwnProperty.call(workerRequest, prop)) {
+            if (!workerRequest.hasOwnProperty(prop)) {
                 workerRequest[prop] = REQUEST_DEFAULTS[prop];
             }
-
             workerRequest[prop] = Number(workerRequest[prop]);
         });
-
         workerRequest.name = domainObject.name;
-
         return workerRequest;
     };
 
@@ -86,13 +81,11 @@ define([
         var workerRequest = this.makeWorkerRequest(domainObject, request);
         workerRequest.start = request.start;
         workerRequest.end = request.end;
-
         return this.workerInterface.request(workerRequest);
     };
 
     GeneratorProvider.prototype.subscribe = function (domainObject, callback) {
         var workerRequest = this.makeWorkerRequest(domainObject, {});
-
         return this.workerInterface.subscribe(workerRequest, callback);
     };
 

example/generator/SinewaveLimitProvider.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define([
 
@@ -77,15 +78,12 @@ define([
                 if (datum[range] > RED[range]) {
                     return LIMITS.rh;
                 }
-
                 if (datum[range] < -RED[range]) {
                     return LIMITS.rl;
                 }
-
                 if (datum[range] > YELLOW[range]) {
                     return LIMITS.yh;
                 }
-
                 if (datum[range] < -YELLOW[range]) {
                     return LIMITS.yl;
                 }

example/generator/StateGeneratorProvider.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -48,7 +48,7 @@ define([
         var interval = setInterval(function () {
             var now = Date.now();
             var datum = pointForTimestamp(now, duration, domainObject.name);
-            datum.value = String(datum.value);
+            datum.value += "";
             callback(datum);
         }, duration);
 
@@ -57,6 +57,7 @@ define([
         };
     };
 
+
     StateGeneratorProvider.prototype.supportsRequest = function (domainObject, options) {
         return domainObject.type === 'example.state-generator';
     };
@@ -68,13 +69,11 @@ define([
         if (options.strategy === 'latest' || options.size === 1) {
             start = end;
         }
-
         var data = [];
         while (start <= end && data.length < 5000) {
             data.push(pointForTimestamp(start, duration, domainObject.name));
             start += duration;
         }
-
         return Promise.resolve(data);
     };
 

example/generator/WorkerInterface.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -72,16 +72,13 @@ define([
         });
         var messageId;
 
-        let self = this;
         function callback(message) {
             if (message.error) {
                 deferred.reject(message.error);
             } else {
                 deferred.resolve(message.data);
             }
-
-            delete self.callbacks[messageId];
-
+            delete this.callbacks[messageId];
         }
 
         messageId = this.dispatch('request', request, callback.bind(this));
@@ -104,5 +101,8 @@ define([
         }.bind(this);
     };
 
+
+
+
     return WorkerInterface;
 });

example/generator/generatorWorker.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,6 +20,8 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
+/*global self*/
+
 (function () {
 
     var FIFTEEN_MINUTES = 15 * 60 * 1000;
@@ -62,14 +64,13 @@
                     data: {
                         name: data.name,
                         utc: nextStep,
-                        yesterday: nextStep - 60 * 60 * 24 * 1000,
+                        yesterday: nextStep - 60*60*24*1000,
                         sin: sin(nextStep, data.period, data.amplitude, data.offset, data.phase, data.randomness),
                         cos: cos(nextStep, data.period, data.amplitude, data.offset, data.phase, data.randomness)
                     }
                 });
                 nextStep += step;
             }
-
             return nextStep;
         }
 
@@ -86,7 +87,6 @@
         if (request.end === undefined) {
             request.end = Date.now();
         }
-
         if (request.start === undefined) {
             request.start = request.end - FIFTEEN_MINUTES;
         }
@@ -108,13 +108,13 @@
 
         for (; nextStep < end && data.length < 5000; nextStep += step) {
             data.push({
+                name: request.name,
                 utc: nextStep,
-                yesterday: nextStep - 60 * 60 * 24 * 1000,
+                yesterday: nextStep - 60*60*24*1000,
                 sin: sin(nextStep, period, amplitude, offset, phase, randomness),
                 cos: cos(nextStep, period, amplitude, offset, phase, randomness)
             });
         }
-
         self.postMessage({
             id: message.id,
             data: data
@@ -122,13 +122,13 @@
     }
 
     function cos(timestamp, period, amplitude, offset, phase, randomness) {
-        return amplitude
-            * Math.cos(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
+        return amplitude *
+            Math.cos(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
     }
 
     function sin(timestamp, period, amplitude, offset, phase, randomness) {
-        return amplitude
-            * Math.sin(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
+        return amplitude *
+            Math.sin(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
     }
 
     function sendError(error, message) {

example/generator/plugin.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define([
     "./GeneratorProvider",
@@ -55,7 +56,7 @@ define([
             initialize: function (object) {
                 object.telemetry = {
                     duration: 5
-                };
+                }
             }
         });
 

example/identity/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define([
     "./src/ExampleIdentityService"
@@ -28,7 +29,7 @@ define([
     "use strict";
 
     return {
-        name: "example/identity",
+        name:"example/identity",
         definition: {
             "extensions": {
                 "components": [

example/identity/src/ExampleIdentityService.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,35 +19,32 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define(
     function () {
         "use strict";
 
-        var DEFAULT_IDENTITY = {
-                key: "user",
-                name: "Example User"
-            },
+        var DEFAULT_IDENTITY = { key: "user", name: "Example User" },
             DIALOG_STRUCTURE = {
                 name: "Identify Yourself",
-                sections: [{
-                    rows: [
-                        {
-                            name: "User ID",
-                            control: "textfield",
-                            key: "key",
-                            required: true
-                        },
-                        {
-                            name: "Human name",
-                            control: "textfield",
-                            key: "name",
-                            required: true
-                        }
-                    ]
-                }]
+                sections: [{ rows: [
+                    {
+                        name: "User ID",
+                        control: "textfield",
+                        key: "key",
+                        required: true
+                    },
+                    {
+                        name: "Human name",
+                        control: "textfield",
+                        key: "name",
+                        required: true
+                    }
+                ]}]
             };
 
+
         /**
          * Example implementation of an identity service. This prompts the
          * user to enter a name and user ID; in a more realistic
@@ -80,14 +77,14 @@ define(
          */
         ExampleIdentityProvider.prototype.returnUser = function (user) {
             return this.user = user;
-        };
+        }
 
         /**
          * @private
          */
         ExampleIdentityProvider.prototype.returnUndefined = function () {
             return undefined;
-        };
+        }
 
         return ExampleIdentityProvider;
     }

example/imagery/plugin.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -27,7 +27,7 @@ define([
 ) {
     function ImageryPlugin() {
 
-        const IMAGE_SAMPLES = [
+        var IMAGE_SAMPLES = [
             "https://www.hq.nasa.gov/alsj/a16/AS16-117-18731.jpg",
             "https://www.hq.nasa.gov/alsj/a16/AS16-117-18732.jpg",
             "https://www.hq.nasa.gov/alsj/a16/AS16-117-18733.jpg",
@@ -47,14 +47,13 @@ define([
             "https://www.hq.nasa.gov/alsj/a16/AS16-117-18747.jpg",
             "https://www.hq.nasa.gov/alsj/a16/AS16-117-18748.jpg"
         ];
-        const IMAGE_DELAY = 20000;
 
         function pointForTimestamp(timestamp, name) {
             return {
                 name: name,
-                utc: Math.floor(timestamp / IMAGE_DELAY) * IMAGE_DELAY,
-                local: Math.floor(timestamp / IMAGE_DELAY) * IMAGE_DELAY,
-                url: IMAGE_SAMPLES[Math.floor(timestamp / IMAGE_DELAY) % IMAGE_SAMPLES.length]
+                utc: Math.floor(timestamp / 5000) * 5000,
+                local: Math.floor(timestamp / 5000) * 5000,
+                url: IMAGE_SAMPLES[Math.floor(timestamp / 5000) % IMAGE_SAMPLES.length]
             };
         }
 
@@ -65,7 +64,7 @@ define([
             subscribe: function (domainObject, callback) {
                 var interval = setInterval(function () {
                     callback(pointForTimestamp(Date.now(), domainObject.name));
-                }, IMAGE_DELAY);
+                }, 5000);
 
                 return function () {
                     clearInterval(interval);
@@ -82,32 +81,32 @@ define([
                 var start = options.start;
                 var end = Math.min(options.end, Date.now());
                 var data = [];
-                while (start <= end && data.length < IMAGE_DELAY) {
+                while (start <= end && data.length < 5000) {
                     data.push(pointForTimestamp(start, domainObject.name));
-                    start += IMAGE_DELAY;
+                    start += 5000;
                 }
-
                 return Promise.resolve(data);
             }
         };
 
         var ladProvider = {
             supportsRequest: function (domainObject, options) {
-                return domainObject.type === 'example.imagery'
-                    && options.strategy === 'latest';
+                return domainObject.type === 'example.imagery' &&
+                    options.strategy === 'latest';
             },
             request: function (domainObject, options) {
                 return Promise.resolve([pointForTimestamp(Date.now(), domainObject.name)]);
             }
         };
 
+
         return function install(openmct) {
             openmct.types.addType('example.imagery', {
                 key: 'example.imagery',
                 name: 'Example Imagery',
                 cssClass: 'icon-image',
-                description: 'For development use. Creates example imagery '
-                    + 'data that mimics a live imagery stream.',
+                description: 'For development use. Creates example imagery ' +
+                    'data that mimics a live imagery stream.',
                 creatable: true,
                 initialize: function (object) {
                     object.telemetry = {
@@ -141,7 +140,7 @@ define([
                                 }
                             }
                         ]
-                    };
+                    }
                 }
             });
 

example/mobile/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,12 +19,13 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define([], function () {
     "use strict";
 
     return {
-        name: "example/mobile",
+        name:"example/mobile",
         definition: {
             "name": "Mobile",
             "description": "Allows elements with pertinence to mobile usage and development",

example/mobile/res/sass/mobile-example.scss

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

example/msl/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define([
     "./src/RemsTelemetryServerAdapter",
@@ -30,15 +31,14 @@ define([
     RemsTelemetryProvider
 ) {
     "use strict";
-
     return {
-        name: "example/msl",
+        name:"example/msl",
         definition: {
-            "name": "Mars Science Laboratory Data Adapter",
-            "extensions": {
+            "name" : "Mars Science Laboratory Data Adapter",
+            "extensions" : {
                 "types": [
                     {
-                        "name": "Mars Science Laboratory",
+                        "name":"Mars Science Laboratory",
                         "key": "msl.curiosity",
                         "cssClass": "icon-object"
                     },
@@ -89,7 +89,7 @@ define([
                 ],
                 "services": [
                     {
-                        "key": "rems.adapter",
+                        "key":"rems.adapter",
                         "implementation": RemsTelemetryServerAdapter,
                         "depends": ["$http", "$log", "REMS_WS_URL"]
                     }

example/msl/src/MSLDataDictionary.js

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

example/msl/src/RemsTelemetryModelProvider.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define(
     function () {
@@ -80,7 +81,6 @@ define(
                 (dictionary.instruments || []).forEach(function (instrument) {
                     addInstrument(instrument, "msl:curiosity");
                 });
-
                 return models;
             }
 
@@ -90,7 +90,6 @@ define(
                 }
             };
         }
-
         return RemsTelemetryModelProvider;
     }
 );

example/msl/src/RemsTelemetryProvider.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define */
 define (
     ['./RemsTelemetrySeries'],
     function (RemsTelemetrySeries) {
@@ -73,7 +74,6 @@ define (
         RemsTelemetryProvider.prototype.subscribe = function (callback, requests) {
             return function () {};
         };
-
         RemsTelemetryProvider.prototype.unsubscribe = function (callback, requests) {
             return function () {};
         };

example/msl/src/RemsTelemetrySeries.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define */
 define(
     function () {
         "use strict";
@@ -56,7 +57,6 @@ define(
         RemsTelemetrySeries.prototype.getPointCount = function () {
             return this.data.length;
         };
-
         /**
          * The domain value at the given index. The Rems telemetry data is
          * time ordered, so the domain value is the time stamp of each data

example/msl/src/RemsTelemetryServerAdapter.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 /*jslint es5: true */
 
 define(
@@ -94,32 +95,28 @@ define(
                         });
                     }
                 });
-
                 return data;
             }
 
             function fallbackToLocal() {
-                self.$log.warn("Loading REMS data failed, probably due to"
-                    + " cross origin policy. Falling back to local data");
-
+                self.$log.warn("Loading REMS data failed, probably due to" +
+                    " cross origin policy. Falling back to local data");
                 return self.$http.get(self.localDataURI);
             }
 
             //Filter results to match request parameters
             function filterResults(results) {
                 return results.filter(function (result) {
-                    return result.date >= (request.start || Number.MIN_VALUE)
-                        && result.date <= (request.end || Number.MAX_VALUE);
+                    return result.date >= (request.start || Number.MIN_VALUE) &&
+                        result.date <= (request.end || Number.MAX_VALUE);
                 });
             }
 
             function packageAndResolve(results) {
-                return {
-                    id: id,
-                    values: results
-                };
+                return {id: id, values: results};
             }
 
+
             return (this.promise = this.promise || this.$http.get(this.REMS_WS_URL))
                 .catch(fallbackToLocal)
                 .then(processResponse)

example/notifications/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define([
     "./src/DialogLaunchController",
@@ -38,7 +39,7 @@ define([
     "use strict";
 
     return {
-        name: "example/notifications",
+        name:"example/notifications",
         definition: {
             "extensions": {
                 "templates": [

example/notifications/src/DialogLaunchController.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define(
     [],
@@ -90,6 +91,7 @@ define(
                 }
             };
 
+
             /*
              Demonstrates launching an error dialog
              */
@@ -130,9 +132,9 @@ define(
                 var dialog,
                     model = {
                         title: "Info Dialog Example",
-                        actionText: "This is an example of a blocking info"
-                        + " dialog. This dialog can be used to draw the user's"
-                        + " attention to an event.",
+                        actionText: "This is an example of a blocking info" +
+                        " dialog. This dialog can be used to draw the user's" +
+                        " attention to an event.",
                         severity: "info",
                         primaryOption: {
                             label: "OK",
@@ -151,7 +153,6 @@ define(
             };
 
         }
-
         return DialogLaunchController;
     }
 );

example/notifications/src/DialogLaunchIndicator.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define,window*/
 
 define(
     [],
@@ -41,11 +42,9 @@ define(
         DialogLaunchIndicator.prototype.getGlyphClass = function () {
             return 'ok';
         };
-
         DialogLaunchIndicator.prototype.getText = function () {
             return "Launch test dialog";
         };
-
         DialogLaunchIndicator.prototype.getDescription = function () {
             return "Launch test dialog";
         };

example/notifications/src/NotificationLaunchController.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define(
     [],
@@ -47,8 +48,7 @@ define(
                     "Eros turpis, pulvinar turpis eros eu",
                     "Lundium nascetur a, lectus montes ac, parturient in natoque, duis risus risus pulvinar pid rhoncus, habitasse auctor natoque!"
                 ];
-
-                return actionTexts[Math.floor(Math.random() * 3)];
+                return actionTexts[Math.floor(Math.random()*3)];
             }
 
             /**
@@ -61,7 +61,6 @@ define(
                     severity: "error"
                 });
             };
-
             /**
              * Launch a new notification with a severity of 'Alert'.
              */
@@ -74,6 +73,7 @@ define(
                 });
             };
 
+
             /**
              * Launch a new notification with a progress bar that is updated
              * periodically, tracking an ongoing process.
@@ -93,10 +93,10 @@ define(
                  * @param notification
                  */
                 function incrementProgress() {
-                    progress = Math.min(100, Math.floor(progress + Math.random() * 30));
-                    let progressText = ["Estimated time"
-                    + " remaining:"
-                    + " about ", 60 - Math.floor((progress / 100) * 60), " seconds"].join(" ");
+                    progress = Math.min(100, Math.floor(progress + Math.random() * 30))
+                    let progressText = ["Estimated time" +
+                    " remaining:" +
+                    " about ", 60 - Math.floor((progress / 100) * 60), " seconds"].join(" ");
                     notification.progress(progress, progressText);
 
                     if (progress < 100) {
@@ -120,7 +120,6 @@ define(
             };
 
         }
-
         return NotificationLaunchController;
     }
 );

example/notifications/src/NotificationLaunchIndicator.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define,window*/
 
 define(
     [],
@@ -41,11 +42,9 @@ define(
         NotificationLaunchIndicator.prototype.getGlyphClass = function () {
             return 'ok';
         };
-
         NotificationLaunchIndicator.prototype.getText = function () {
             return "Launch notification";
         };
-
         NotificationLaunchIndicator.prototype.getDescription = function () {
             return "Launch notification";
         };

example/persistence/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define([
     "./src/BrowserPersistenceProvider"
@@ -28,7 +29,7 @@ define([
     "use strict";
 
     return {
-        name: "example/persistence",
+        name:"example/persistence",
         definition: {
             "extensions": {
                 "components": [

example/persistence/src/BrowserPersistenceProvider.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 /**
  * Stubbed implementation of a persistence provider,
@@ -29,6 +30,8 @@ define(
     function () {
         'use strict';
 
+
+
         function BrowserPersistenceProvider($q, SPACE) {
             var spaces = SPACE ? [SPACE] : [],
                 caches = {},
@@ -48,7 +51,6 @@ define(
                 },
                 listObjects: function (space) {
                     var cache = caches[space];
-
                     return promises.as(
                         cache ? Object.keys(cache) : null
                     );
@@ -66,7 +68,6 @@ define(
                 },
                 readObject: function (space, key) {
                     var cache = caches[space];
-
                     return promises.as(
                         cache ? cache[key] : null
                     );

example/policy/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define([
     "./src/ExamplePolicy"
@@ -28,7 +29,7 @@ define([
     "use strict";
 
     return {
-        name: "example/policy",
+        name:"example/policy",
         definition: {
             "name": "Example Policy",
             "description": "Provides an example of using policies to prohibit actions.",

example/policy/src/ExamplePolicy.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define(
     [],
@@ -36,7 +37,6 @@ define(
                         model = (domainObject && domainObject.getModel()) || {},
                         name = model.name || "",
                         metadata = action.getMetadata() || {};
-
                     return metadata.key !== 'remove' || name.indexOf('foo') < 0;
                 }
             };

example/profiling/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define([
     "./src/WatchIndicator",
@@ -30,7 +31,7 @@ define([
     "use strict";
 
     return {
-        name: "example/profiling",
+        name:"example/profiling",
         definition: {
             "extensions": {
                 "indicators": [

example/profiling/src/DigestIndicator.js

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

example/profiling/src/WatchIndicator.js

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

example/scratchpad/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define([
     "./src/ScratchPersistenceProvider"
@@ -28,7 +29,7 @@ define([
     "use strict";
 
     return {
-        name: "example/scratchpad",
+        name:"example/scratchpad",
         definition: {
             "extensions": {
                 "roots": [

example/scratchpad/src/ScratchPersistenceProvider.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,6 +20,8 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
+/*global define,window*/
+
 define(
     [],
     function () {
@@ -52,14 +54,13 @@ define(
             if (space === 'scratch') {
                 this.table[key] = JSON.stringify(value);
             }
-
             return this.$q.when(space === 'scratch');
         };
 
         ScratchPersistenceProvider.prototype.readObject = function (space, key) {
             return this.$q.when(
-                (space === 'scratch' && this.table[key])
-                    ? JSON.parse(this.table[key]) : undefined
+                (space === 'scratch' && this.table[key]) ?
+                    JSON.parse(this.table[key]) : undefined
             );
         };
 
@@ -67,7 +68,6 @@ define(
             if (space === 'scratch') {
                 delete this.table[key];
             }
-
             return this.$q.when(space === 'scratch');
         };
 

example/simpleVuePlugin/HelloWorld.vue

@@ -7,9 +7,9 @@ export default {
     data() {
         return {
             msg: 'Hello world!'
-        };
+        }
     }
-};
+}
 </script>
 
 <style>

example/simpleVuePlugin/plugin.js

@@ -17,7 +17,6 @@ function SimpleVuePlugin() {
             },
             view: function (domainObject) {
                 var vm;
-
                 return {
                     show: function (container) {
                         vm = new Vue(HelloWorld);
@@ -30,7 +29,7 @@ function SimpleVuePlugin() {
             }
         });
 
-    };
+    }
 }
 
-export default SimpleVuePlugin;
+export default SimpleVuePlugin

example/styleguide/bundle.js

@@ -22,111 +22,31 @@ define([
     menusTemplate
 ) {
     return {
-        name: "example/styleguide",
+        name:"example/styleguide",
         definition: {
             "name": "Open MCT Style Guide",
             "description": "Examples and documentation illustrating UI styles in use in Open MCT.",
             "extensions":
         {
             "types": [
-                {
-                    "key": "styleguide.intro",
-                    "name": "Introduction",
-                    "cssClass": "icon-page",
-                    "description": "Introduction and overview to the style guide"
-                },
-                {
-                    "key": "styleguide.standards",
-                    "name": "Standards",
-                    "cssClass": "icon-page",
-                    "description": ""
-                },
-                {
-                    "key": "styleguide.colors",
-                    "name": "Colors",
-                    "cssClass": "icon-page",
-                    "description": ""
-                },
-                {
-                    "key": "styleguide.status",
-                    "name": "status",
-                    "cssClass": "icon-page",
-                    "description": "Limits, telemetry paused, etc."
-                },
-                {
-                    "key": "styleguide.glyphs",
-                    "name": "Glyphs",
-                    "cssClass": "icon-page",
-                    "description": "Glyphs overview"
-                },
-                {
-                    "key": "styleguide.controls",
-                    "name": "Controls",
-                    "cssClass": "icon-page",
-                    "description": "Buttons, selects, HTML controls"
-                },
-                {
-                    "key": "styleguide.input",
-                    "name": "Text Inputs",
-                    "cssClass": "icon-page",
-                    "description": "Various text inputs"
-                },
-                {
-                    "key": "styleguide.menus",
-                    "name": "Menus",
-                    "cssClass": "icon-page",
-                    "description": "Context menus, dropdowns"
-                }
+                { "key": "styleguide.intro", "name": "Introduction", "cssClass": "icon-page", "description": "Introduction and overview to the style guide" },
+                { "key": "styleguide.standards", "name": "Standards", "cssClass": "icon-page", "description": "" },
+                { "key": "styleguide.colors", "name": "Colors", "cssClass": "icon-page", "description": "" },
+                { "key": "styleguide.status", "name": "status", "cssClass": "icon-page", "description": "Limits, telemetry paused, etc." },
+                { "key": "styleguide.glyphs", "name": "Glyphs", "cssClass": "icon-page", "description": "Glyphs overview" },
+                { "key": "styleguide.controls", "name": "Controls", "cssClass": "icon-page", "description": "Buttons, selects, HTML controls" },
+                { "key": "styleguide.input", "name": "Text Inputs", "cssClass": "icon-page", "description": "Various text inputs" },
+                { "key": "styleguide.menus", "name": "Menus", "cssClass": "icon-page", "description": "Context menus, dropdowns" }
             ],
             "views": [
-                {
-                    "key": "styleguide.intro",
-                    "type": "styleguide.intro",
-                    "template": introTemplate,
-                    "editable": false
-                },
-                {
-                    "key": "styleguide.standards",
-                    "type": "styleguide.standards",
-                    "template": standardsTemplate,
-                    "editable": false
-                },
-                {
-                    "key": "styleguide.colors",
-                    "type": "styleguide.colors",
-                    "template": colorsTemplate,
-                    "editable": false
-                },
-                {
-                    "key": "styleguide.status",
-                    "type": "styleguide.status",
-                    "template": statusTemplate,
-                    "editable": false
-                },
-                {
-                    "key": "styleguide.glyphs",
-                    "type": "styleguide.glyphs",
-                    "template": glyphsTemplate,
-                    "editable": false
-                },
-                {
-                    "key": "styleguide.controls",
-                    "type": "styleguide.controls",
-                    "template": controlsTemplate,
-                    "editable": false
-                },
-                {
-                    "key": "styleguide.input",
-                    "type": "styleguide.input",
-                    "template": inputTemplate,
-                    "editable": false
-                },
-                {
-                    "key": "styleguide.menus",
-                    "type": "styleguide.menus",
-                    "template": menusTemplate,
-                    "editable": false
-                }
+                { "key": "styleguide.intro", "type": "styleguide.intro", "template": introTemplate, "editable": false },
+                { "key": "styleguide.standards", "type": "styleguide.standards", "template": standardsTemplate, "editable": false },
+                { "key": "styleguide.colors", "type": "styleguide.colors", "template": colorsTemplate, "editable": false },
+                { "key": "styleguide.status", "type": "styleguide.status", "template": statusTemplate, "editable": false },
+                { "key": "styleguide.glyphs", "type": "styleguide.glyphs", "template": glyphsTemplate, "editable": false },
+                { "key": "styleguide.controls", "type": "styleguide.controls", "template": controlsTemplate, "editable": false },
+                { "key": "styleguide.input", "type": "styleguide.input", "template": inputTemplate, "editable": false },
+                { "key": "styleguide.menus", "type": "styleguide.menus", "template": menusTemplate, "editable": false }
             ],
             "roots": [
                 {
@@ -136,9 +56,9 @@ define([
             "models": [
                 {
                     "id": "styleguide:home",
-                    "priority": "preferred",
+                    "priority" : "preferred",
                     "model": {
-                        "type": "noneditable.folder",
+                        "type": "folder",
                         "name": "Style Guide Home",
                         "location": "ROOT",
                         "composition": [
@@ -153,9 +73,9 @@ define([
                 },
                 {
                     "id": "styleguide:ui-elements",
-                    "priority": "preferred",
+                    "priority" : "preferred",
                     "model": {
-                        "type": "noneditable.folder",
+                        "type": "folder",
                         "name": "UI Elements",
                         "location": "styleguide:home",
                         "composition": [

example/styleguide/src/ExampleStyleGuideModelProvider.js

@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define(
     [],
@@ -29,46 +30,14 @@ define(
             var pages = {};
 
             // Add pages
-            pages.intro = {
-                name: "Introduction",
-                type: "styleguide.intro",
-                location: "styleguide:home"
-            };
-            pages.standards = {
-                name: "Standards",
-                type: "styleguide.standards",
-                location: "styleguide:home"
-            };
-            pages.colors = {
-                name: "Colors",
-                type: "styleguide.colors",
-                location: "styleguide:home"
-            };
-            pages.glyphs = {
-                name: "Glyphs",
-                type: "styleguide.glyphs",
-                location: "styleguide:home"
-            };
-            pages.status = {
-                name: "Status Indication",
-                type: "styleguide.status",
-                location: "styleguide:home"
-            };
-            pages.controls = {
-                name: "Controls",
-                type: "styleguide.controls",
-                location: "styleguide:ui-elements"
-            };
-            pages.input = {
-                name: "Text Inputs",
-                type: "styleguide.input",
-                location: "styleguide:ui-elements"
-            };
-            pages.menus = {
-                name: "Menus",
-                type: "styleguide.menus",
-                location: "styleguide:ui-elements"
-            };
+            pages.intro = { name: "Introduction", type: "styleguide.intro", location: "styleguide:home" };
+            pages.standards = { name: "Standards", type: "styleguide.standards", location: "styleguide:home" };
+            pages.colors = { name: "Colors", type: "styleguide.colors", location: "styleguide:home" };
+            pages.glyphs = { name: "Glyphs", type: "styleguide.glyphs", location: "styleguide:home" };
+            pages.status = { name: "Status Indication", type: "styleguide.status", location: "styleguide:home" };
+            pages.controls = { name: "Controls", type: "styleguide.controls", location: "styleguide:ui-elements" };
+            pages.input = { name: "Text Inputs", type: "styleguide.input", location: "styleguide:ui-elements" };
+            pages.menus = { name: "Menus", type: "styleguide.menus", location: "styleguide:ui-elements" };
 
             return {
                 getModels: function () {
@@ -77,6 +46,6 @@ define(
             };
         }
 
-        return ExampleStyleGuideModelProvider;
+        return ExampleStyleGuideModelProvider
     }
 );

index.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2020, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 
@@ -30,50 +30,12 @@
         <link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96" type="image/x-icon">
         <link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32" type="image/x-icon">
         <link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16" type="image/x-icon">
-        <style type="text/css">
-            @keyframes splash-spinner {
-                0% {
-                    transform: translate(-50%, -50%) rotate(0deg); }
-                100% {
-                    transform: translate(-50%, -50%) rotate(360deg); } }
-
-            #splash-screen {
-                background-color: black;
-                position: absolute;
-                top: 0; right: 0; bottom: 0; left: 0;
-                z-index: 10000;
-            }
-
-            #splash-screen:before {
-                animation-name: splash-spinner;
-                animation-duration: 0.5s;
-                animation-iteration-count: infinite;
-                animation-timing-function: linear;
-                border-radius: 50%;
-                border-color: rgba(255,255,255,0.25);
-                border-top-color: white;
-                border-style: solid;
-                border-width: 10px;
-                content: '';
-                display: block;
-                opacity: 0.25;
-                position: absolute;
-                left: 50%; top: 50%;
-                height: 100px; width: 100px;
-            }
-        </style>
     </head>
     <body>
     </body>
     <script>
-        const THIRTY_SECONDS = 30 * 1000;
-        const ONE_MINUTE = THIRTY_SECONDS * 2;
-        const FIVE_MINUTES = ONE_MINUTE * 5;
-        const FIFTEEN_MINUTES = FIVE_MINUTES * 3;
-        const THIRTY_MINUTES = FIFTEEN_MINUTES * 2;
-        const ONE_HOUR = THIRTY_MINUTES * 2;
-        const TWO_HOURS = ONE_HOUR * 2;
-        const ONE_DAY = ONE_HOUR * 24;
+        const FIVE_MINUTES = 5 * 60 * 1000;
+        const THIRTY_MINUTES = 30 * 60 * 1000;
 
         [
             'example/eventGenerator'
@@ -86,9 +48,6 @@
         openmct.install(openmct.plugins.MyItems());
         openmct.install(openmct.plugins.Generator());
         openmct.install(openmct.plugins.ExampleImagery());
-        openmct.install(openmct.plugins.PlanLayout());
-        openmct.install(openmct.plugins.Timeline());
-        openmct.install(openmct.plugins.PlotVue());
         openmct.install(openmct.plugins.UTCTimeSystem());
         openmct.install(openmct.plugins.AutoflowView({
             type: "telemetry.panel"
@@ -104,39 +63,7 @@
                     bounds: {
                         start: Date.now() - THIRTY_MINUTES,
                         end: Date.now()
-                    },
-                    // commonly used bounds can be stored in history
-                    // bounds (start and end) can accept either a milliseconds number
-                    // or a callback function returning a milliseconds number
-                    // a function is useful for invoking Date.now() at exact moment of preset selection
-                    presets: [
-                        {
-                            label: 'Last Day',
-                            bounds: {
-                                start: () => Date.now() - ONE_DAY,
-                                end: () => Date.now()
-                            }
-                        },
-                        {
-                            label: 'Last 2 hours',
-                            bounds: {
-                                start: () => Date.now() - TWO_HOURS,
-                                end: () => Date.now()
-                            }
-                        },
-                        {
-                            label: 'Last hour',
-                            bounds: {
-                                start: () => Date.now() - ONE_HOUR,
-                                end: () => Date.now()
-                            }
-                        }
-                    ],
-                    // maximum recent bounds to retain in conductor history
-                    records: 10
-                    // maximum duration between start and end bounds
-                    // for utc-based time systems this is in milliseconds
-                    // limit: ONE_DAY
+                    }
                 },
                 {
                     name: "Realtime",
@@ -144,45 +71,8 @@
                     clock: 'local',
                     clockOffsets: {
                         start: - THIRTY_MINUTES,
-                        end: THIRTY_SECONDS
-                    },
-                    presets: [
-                        {
-                            label: '1 Hour',
-                            bounds: {
-                                start: - ONE_HOUR,
-                                end: THIRTY_SECONDS
-                            }
-                        },
-                        {
-                            label: '30 Minutes',
-                            bounds: {
-                                start: - THIRTY_MINUTES,
-                                end: THIRTY_SECONDS
-                            }
-                        },
-                        {
-                            label: '15 Minutes',
-                            bounds: {
-                                start: - FIFTEEN_MINUTES,
-                                end: THIRTY_SECONDS
-                            }
-                        },
-                        {
-                            label: '5 Minutes',
-                            bounds: {
-                                start: - FIVE_MINUTES,
-                                end: THIRTY_SECONDS
-                            }
-                        },
-                        {
-                            label: '1 Minute',
-                            bounds: {
-                                start: - ONE_MINUTE,
-                                end: THIRTY_SECONDS
-                            }
-                        }
-                    ]
+                        end: FIVE_MINUTES
+                    }
                 }
             ]
         }));
@@ -191,10 +81,7 @@
         openmct.install(openmct.plugins.LADTable());
         openmct.install(openmct.plugins.Filters(['table', 'telemetry.plot.overlay']));
         openmct.install(openmct.plugins.ObjectMigration());
-        openmct.install(openmct.plugins.ClearData(
-            ['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked'],
-            {indicator: true}
-        ));
+        openmct.install(openmct.plugins.ClearData(['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked']));
         openmct.start();
     </script>
 </html>

indexTest.js

@@ -1,3 +0,0 @@
-const testsContext = require.context('.', true, /\/(src|platform)\/.*Spec.js$/);
-
-testsContext.keys().forEach(testsContext);

karma.conf.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -23,7 +23,7 @@
 /*global module,process*/
 
 const devMode = process.env.NODE_ENV !== 'production';
-const browsers = [process.env.NODE_ENV === 'debug' ? 'ChromeDebugging' : 'FirefoxHeadless'];
+const browsers = [process.env.NODE_ENV === 'debug' ? 'ChromeDebugging' : 'ChromeHeadless'];
 const coverageEnabled = process.env.COVERAGE === 'true';
 const reporters = ['progress', 'html'];
 
@@ -52,16 +52,12 @@ module.exports = (config) => {
         basePath: '',
         frameworks: ['jasmine'],
         files: [
-            'indexTest.js'
+            'platform/**/*Spec.js',
+            'src/**/*Spec.js'
         ],
         port: 9876,
         reporters: reporters,
         browsers: browsers,
-        client: {
-            jasmine: {
-                random: false
-            }
-        },
         customLaunchers: {
             ChromeDebugging: {
                 base: 'Chrome',
@@ -86,20 +82,19 @@ module.exports = (config) => {
             reports: ['html', 'lcovonly', 'text-summary'],
             thresholds: {
                 global: {
-                    lines: 66
+                    lines: 62
                 }
             }
         },
         preprocessors: {
-            'indexTest.js': ['webpack', 'sourcemap']
+            'platform/**/*Spec.js': ['webpack', 'sourcemap'],
+            'src/**/*Spec.js': ['webpack', 'sourcemap']
         },
         webpack: webpackConfig,
         webpackMiddleware: {
             stats: 'errors-only',
             logLevel: 'warn'
         },
-        concurrency: 1,
-        singleRun: true,
-        browserNoActivityTimeout: 400000
+        singleRun: true
     });
-};
+}

openmct.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -32,6 +32,6 @@ if (document.currentScript) {
 
 const MCT = require('./src/MCT');
 
-const openmct = new MCT();
+var openmct = new MCT();
 
 module.exports = openmct;

package.json

@@ -1,12 +1,12 @@
 {
   "name": "openmct",
-  "version": "1.6.3-SNAPSHOT",
+  "version": "1.0.0-snapshot",
   "description": "The Open MCT core platform",
   "dependencies": {},
   "devDependencies": {
     "angular": ">=1.8.0",
     "angular-route": "1.4.14",
-    "babel-eslint": "10.0.3",
+    "babel-eslint": "8.2.6",
     "comma-separated-values": "^3.6.4",
     "concurrently": "^3.6.1",
     "copy-webpack-plugin": "^4.5.2",
@@ -22,8 +22,8 @@
     "d3-selection": "1.3.x",
     "d3-time": "1.0.x",
     "d3-time-format": "2.1.x",
-    "eslint": "7.0.0",
-    "eslint-plugin-vue": "^7.5.0",
+    "eslint": "5.2.0",
+    "eslint-plugin-vue": "^6.0.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.10.0",
     "eventemitter3": "^1.2.0",
     "exports-loader": "^0.7.0",
@@ -39,28 +39,27 @@
     "istanbul-instrumenter-loader": "^3.0.1",
     "jasmine-core": "^3.1.0",
     "jsdoc": "^3.3.2",
-    "karma": "5.1.1",
-    "karma-chrome-launcher": "3.1.0",
-    "karma-firefox-launcher": "1.3.0",
-    "karma-cli": "2.0.0",
-    "karma-coverage": "2.0.3",
-    "karma-coverage-istanbul-reporter": "3.0.3",
-    "karma-html-reporter": "0.2.7",
-    "karma-jasmine": "3.3.1",
-    "karma-sourcemap-loader": "0.3.7",
-    "karma-webpack": "4.0.2",
+    "karma": "^2.0.3",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-cli": "^1.0.1",
+    "karma-coverage": "^1.1.2",
+    "karma-coverage-istanbul-reporter": "^2.1.1",
+    "karma-html-reporter": "^0.2.7",
+    "karma-jasmine": "^1.1.2",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-webpack": "^3.0.0",
     "location-bar": "^3.0.1",
     "lodash": "^4.17.12",
     "markdown-toc": "^0.11.7",
     "marked": "^0.3.5",
     "mini-css-extract-plugin": "^0.4.1",
-    "minimist": "^1.2.5",
+    "minimist": "^1.1.1",
     "moment": "2.25.3",
     "moment-duration-format": "^2.2.2",
     "moment-timezone": "0.5.28",
     "node-bourbon": "^4.2.3",
-    "node-sass": "^4.14.1",
-    "painterro": "^1.0.35",
+    "node-sass": "^4.9.2",
+    "painterro": "^0.2.65",
     "printj": "^1.2.1",
     "raw-loader": "^0.5.1",
     "request": "^2.69.0",

platform/commonUI/about/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -47,7 +47,7 @@ define([
 ) {
 
     return {
-        name: "platform/commonUI/about",
+        name:"platform/commonUI/about",
         definition: {
             "name": "About Open MCT",
             "extensions": {

platform/commonUI/about/res/templates/about-dialog.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 
@@ -24,7 +24,7 @@
     <div class="s-text l-content">
         <h1 class="l-title s-title">Open MCT</h1>
         <div class="l-description s-description">
-	        <p>Open MCT, Copyright &copy; 2014-2021, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.</p>
+	        <p>Open MCT, Copyright &copy; 2014-2018, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.</p>
 	        <p>Open MCT is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.</p>
 	        <p>Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</p>
 	        <p>Open MCT includes source code licensed under additional open source licenses. See the Open Source Licenses file included with this distribution or <a ng-click="about.openLicenses()">click here for licensing information</a>.</p>

platform/commonUI/about/res/templates/about-logo.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

platform/commonUI/about/res/templates/app-logo.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

platform/commonUI/about/res/templates/license-apache.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

platform/commonUI/about/res/templates/license-mit.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

platform/commonUI/about/res/templates/licenses-export-md.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

platform/commonUI/about/res/templates/licenses.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

platform/commonUI/about/res/templates/overlay-about.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

platform/commonUI/about/src/AboutController.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,6 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
+
 /**
  * Implements Open MCT's About dialog.
  * @namespace platform/commonUI/about

platform/commonUI/about/src/LicenseController.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

platform/commonUI/about/src/LogoController.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

platform/commonUI/about/test/AboutControllerSpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -25,20 +25,14 @@ define(
     function (AboutController) {
 
         describe("The About controller", function () {
-            let testVersions;
-            let mockWindow;
-            let controller;
+            var testVersions,
+                mockWindow,
+                controller;
 
             beforeEach(function () {
                 testVersions = [
-                    {
-                        name: "Some name",
-                        value: "1.2.3"
-                    },
-                    {
-                        name: "Some other name",
-                        value: "3.2.1"
-                    }
+                    { name: "Some name", value: "1.2.3" },
+                    { name: "Some other name", value: "3.2.1" }
                 ];
                 mockWindow = jasmine.createSpyObj("$window", ["open"]);
                 controller = new AboutController(testVersions, mockWindow);
@@ -56,6 +50,8 @@ define(
                 controller.openLicenses();
                 expect(mockWindow.open).toHaveBeenCalledWith("#/licenses");
             });
+
+
         });
 
     }

platform/commonUI/about/test/LicenseControllerSpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

platform/commonUI/about/test/LogoControllerSpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

platform/commonUI/browse/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -49,7 +49,7 @@ define([
 ) {
 
     return {
-        name: "platform/commonUI/browse",
+        name:"platform/commonUI/browse",
         definition: {
             "extensions": {
                 "routes": [
@@ -143,8 +143,8 @@ define([
                             "$window"
                         ],
                         "group": "windowing",
-                        "priority": 10,
-                        "cssClass": "icon-new-window"
+                        "cssClass": "icon-new-window",
+                        "priority": "preferred"
                     }
                 ],
                 "runs": [

platform/commonUI/browse/res/templates/back-arrow.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

platform/commonUI/browse/res/templates/browse-object.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

platform/commonUI/browse/res/templates/browse.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 
@@ -58,7 +58,7 @@
 
                 <div class='holder holder-object-and-inspector abs' id='content-area'
                      ng-controller="InspectorPaneController as modelPaneInspect"
-                     ng-class="modelPaneInspect.visible() ? 'pane-inspect-showing' : 'pane-inspect-hidden'"
+                     ng-class="modelPaneInspect.visible() ? 'pane-inspect-showing' : 'pane-inspect-hidden'" 
                      hide-parameter="hideInspector">
 
                     <mct-split-pane class='l-object-and-inspector contents abs' anchor='right' alias="rightSide">

platform/commonUI/browse/res/templates/browse/inspector-region.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

platform/commonUI/browse/res/templates/browse/object-header-frame.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 
@@ -28,4 +28,4 @@
         key="'menu-arrow'"
         mct-object='domainObject'
         class="flex-elem context-available-w"></mct-representation>
-</span>
+</span>

platform/commonUI/browse/res/templates/browse/object-header.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 
@@ -32,4 +32,4 @@
         key="'menu-arrow'"
         mct-object='domainObject'
         class="flex-elem context-available-w"></mct-representation>
-</span>
+</span>

platform/commonUI/browse/res/templates/browse/object-properties.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

platform/commonUI/browse/res/templates/menu-arrow.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

platform/commonUI/browse/src/InspectorRegion.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

platform/commonUI/browse/src/navigation/NavigateAction.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -46,7 +46,6 @@ define(
         NavigateAction.prototype.perform = function () {
             if (this.navigationService.shouldNavigate()) {
                 this.navigationService.setNavigation(this.domainObject, true);
-
                 return Promise.resolve({});
             }
 

platform/commonUI/browse/src/navigation/NavigationService.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -69,10 +69,8 @@ define(
         NavigationService.prototype.setNavigation = function (domainObject, force) {
             if (force) {
                 this.doNavigation(domainObject);
-
                 return true;
             }
-
             if (this.navigated === domainObject) {
                 return true;
             }
@@ -83,7 +81,6 @@ define(
             }
 
             this.doNavigation(domainObject);
-
             return true;
         };
 
@@ -123,7 +120,6 @@ define(
          */
         NavigationService.prototype.shouldNavigate = function () {
             var doNotNavigate = this.shouldWarnBeforeNavigate();
-
             return !doNotNavigate || this.$window.confirm(doNotNavigate);
         };
 
@@ -139,7 +135,6 @@ define(
          */
         NavigationService.prototype.checkBeforeNavigation = function (checkFn) {
             this.checks.push(checkFn);
-
             return function removeCheck() {
                 this.checks = this.checks.filter(function (fn) {
                     return checkFn !== fn;
@@ -177,7 +172,6 @@ define(
             if (reasons.length) {
                 return reasons.join('\n');
             }
-
             return false;
         };
 
@@ -192,7 +186,6 @@ define(
             if (shouldWarnBeforeNavigate) {
                 return shouldWarnBeforeNavigate;
             }
-
             if (this.oldUnload) {
                 return this.oldUnload.apply(undefined, [].slice.apply(arguments));
             }

platform/commonUI/browse/src/navigation/OrphanNavigationHandler.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -40,7 +40,6 @@ define([], function () {
 
         function getParent(domainObject) {
             var context = domainObject.getCapability('context');
-
             return context.getParent();
         }
 

platform/commonUI/browse/src/windowing/NewTabAction.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

platform/commonUI/browse/test/InspectorRegionSpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

platform/commonUI/browse/test/navigation/NavigateActionSpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -53,7 +53,6 @@ define([
 
         it("sets navigation if it is allowed", function () {
             mockNavigationService.shouldNavigate.and.returnValue(true);
-
             return action.perform()
                 .then(function () {
                     expect(mockNavigationService.setNavigation)
@@ -64,7 +63,6 @@ define([
         it("does not set navigation if it is not allowed", function () {
             mockNavigationService.shouldNavigate.and.returnValue(false);
             var onSuccess = jasmine.createSpy('onSuccess');
-
             return action.perform()
                 .then(onSuccess, function () {
                     expect(onSuccess).not.toHaveBeenCalled();

platform/commonUI/browse/test/navigation/NavigationServiceSpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -79,6 +79,7 @@ define(
                 navigationService.addListener(callback);
                 navigationService.removeListener(callback);
 
+
                 navigationService.setNavigation(testObject);
                 expect(callback).not.toHaveBeenCalled();
             });

platform/commonUI/browse/test/navigation/OrphanNavigationHandlerSpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* Open MCT, Copyright (c) 2014-2021, United States Government
+* Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -70,7 +70,6 @@ define([
                     jasmine.createSpy('throttled-' + mockThrottledFns.length);
                 mockThrottledFn.and.callFake(fn);
                 mockThrottledFns.push(mockThrottledFn);
-
                 return mockThrottledFn;
             });
             mockTopic.and.returnValue(mockMutationTopic);
@@ -82,7 +81,7 @@ define([
                 }[c];
             });
             mockDomainObject.hasCapability.and.callFake(function (c) {
-                return Boolean(mockDomainObject.getCapability(c));
+                return !!mockDomainObject.getCapability(c);
             });
             mockParentObject.getCapability.and.callFake(function (c) {
                 return {
@@ -103,6 +102,7 @@ define([
             );
         });
 
+
         it("listens for mutation with a throttled function", function () {
             expect(mockMutationTopic.listen)
                 .toHaveBeenCalledWith(jasmine.any(Function));
@@ -129,8 +129,8 @@ define([
                 });
 
                 [false, true].forEach(function (isEditRoot) {
-                    var caseName = isEditRoot
-                        ? "that are being edited" : "that are not being edited";
+                    var caseName = isEditRoot ?
+                        "that are being edited" : "that are not being edited";
 
                     function itNavigatesAsExpected() {
                         if (isOrphan && !isEditRoot) {

platform/commonUI/browse/test/windowing/NewTabActionSpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

platform/commonUI/dialog/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -45,7 +45,7 @@ define([
 ) {
 
     return {
-        name: "platform/commonUI/dialog",
+        name:"platform/commonUI/dialog",
         definition: {
             "extensions": {
                 "services": [

platform/commonUI/dialog/res/templates/dialog.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 
@@ -31,13 +31,13 @@
     </mct-form>
 </div>
 <div class="c-overlay__button-bar">
-    <button class='c-button c-button--major'
+    <a class='c-button c-button--major'
        ng-class="{ disabled: !createForm.$valid }"
        ng-click="ngModel.confirm()">
         OK
-    </button>
-    <button class='c-button  '
+    </a>
+    <a class='c-button  '
        ng-click="ngModel.cancel()">
         Cancel
-    </button>
+    </a>
 </div>

platform/commonUI/dialog/res/templates/overlay-blocking-message.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

platform/commonUI/dialog/res/templates/overlay-dialog.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

platform/commonUI/dialog/res/templates/overlay-options.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 
@@ -31,13 +31,13 @@
         </mct-include>
     </div>
     <div class="c-overlay__button-bar">
-        <button ng-repeat="option in ngModel.dialog.options"
+        <a ng-repeat="option in ngModel.dialog.options"
            href=''
            class="s-button lg"
            title="{{option.description}}"
            ng-click="ngModel.confirm(option.key)"
            ng-class="{ major: $first, subtle: !$first }">
             {{option.name}}
-        </button>
+        </a>
     </div>
 </mct-container>

platform/commonUI/dialog/res/templates/overlay.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2021, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 
@@ -24,7 +24,7 @@
     <div class="c-overlay__outer">
         <button ng-click="ngModel.cancel()"
            ng-if="ngModel.cancel"
-           class="c-click-icon c-overlay__close-button icon-x"></button>
+           class="c-click-icon c-overlay__close-button icon-x-in-circle"></button>
         <div class="c-overlay__contents" ng-transclude></div>
     </div>
 </div>

platform/commonUI/dialog/src/DialogService.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2021, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *