Merge branch 'plotly-test' of https://github.com/nasa/openmct into plotly-test

.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

@@ -120,91 +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",
@@ -236,24 +151,28 @@ module.exports = {
             }
         }],
         "vue/multiline-html-element-content-newline": "off",
-        "vue/singleline-html-element-content-newline": "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",
+                "no-var": "off"
-                "one-var": "off"
             }
         }
     ]

.gitignore

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

example/eventGenerator/bundle.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, 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"

example/eventGenerator/src/EventTelemetry.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, 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
+                return i * interval +
-                        + (domain !== 'delta' ? firstObservedTime : 0);
+                        (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

@@ -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

@@ -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
+        return context.domainObject &&
-            && context.domainObject.hasCapability("telemetry");
+            context.domainObject.hasCapability("telemetry");
     };
 
     return ExportTelemetryAsCSVAction;

example/export/bundle.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([
     './ExportTelemetryAsCSVAction'

example/forms/bundle.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([
     "./src/ExampleFormController"

example/forms/src/ExampleFormController.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, 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: "Hats",
+                                    { name: "Bats", value: "bats" },
-                                        value: "hats"
+                                    { name: "Cats", value: "cats" },
-                                    },
+                                    { name: "Mats", value: "mats" }
-                                    {
-                                        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: "Hats",
+                                    { name: "Bats", value: "bats" },
-                                        value: "hats"
+                                    { name: "Cats", value: "cats" },
-                                    },
+                                    { name: "Mats", value: "mats" }
-                                    {
-                                        name: "Bats",
-                                        value: "bats"
-                                    },
-                                    {
-                                        name: "Cats",
-                                        value: "cats"
-                                    },
-                                    {
-                                        name: "Mats",
-                                        value: "mats"
-                                    }
                                 ],
                                 key: "aRequiredChoice"
                             }

example/generator/GeneratorMetadataProvider.js

@@ -41,7 +41,6 @@ define([
                 {
                     key: "sin",
                     name: "Sine",
-                    unit: "Hz",
                     formatString: '%0.2f',
                     hints: {
                         range: 1
@@ -50,7 +49,6 @@ define([
                 {
                     key: "cos",
                     name: "Cosine",
-                    unit: "deg",
                     formatString: '%0.2f',
                     hints: {
                         range: 2
@@ -110,14 +108,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

@@ -62,22 +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 && request.hasOwnProperty(prop)) {
-            if (request && Object.prototype.hasOwnProperty.call(request, prop)) {
                 workerRequest[prop] = request[prop];
             }
-
+            if (!workerRequest.hasOwnProperty(prop)) {
-            if (!Object.prototype.hasOwnProperty.call(workerRequest, prop)) {
                 workerRequest[prop] = REQUEST_DEFAULTS[prop];
             }
-
             workerRequest[prop] = Number(workerRequest[prop]);
         });
         workerRequest.name = domainObject.name;
-
         return workerRequest;
     };
 
@@ -85,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

@@ -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

@@ -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

@@ -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 this.callbacks[messageId];
-            delete self.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-2020, 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;
@@ -69,7 +71,6 @@
                 });
                 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;
         }
@@ -115,7 +115,6 @@
                 cos: cos(nextStep, period, amplitude, offset, phase, randomness)
             });
         }
-
         self.postMessage({
             id: message.id,
             data: data
@@ -123,13 +122,13 @@
     }
 
     function cos(timestamp, period, amplitude, offset, phase, randomness) {
-        return amplitude
+        return amplitude *
-            * Math.cos(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
+            Math.cos(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
     }
 
     function sin(timestamp, period, amplitude, offset, phase, randomness) {
-        return amplitude
+        return amplitude *
-            * Math.sin(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
+            Math.sin(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
     }
 
     function sendError(error, message) {

example/generator/plugin.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([
     "./GeneratorProvider",
@@ -55,7 +56,7 @@ define([
             initialize: function (object) {
                 object.telemetry = {
                     duration: 5
-                };
+                }
             }
         });
 

example/identity/bundle.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([
     "./src/ExampleIdentityService"

example/identity/src/ExampleIdentityService.js

@@ -19,19 +19,16 @@
  * 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 = {
+        var DEFAULT_IDENTITY = { key: "user", name: "Example User" },
-                key: "user",
-                name: "Example User"
-            },
             DIALOG_STRUCTURE = {
                 name: "Identify Yourself",
-                sections: [{
+                sections: [{ rows: [
-                    rows: [
                     {
                         name: "User ID",
                         control: "textfield",
@@ -44,10 +41,10 @@ define(
                         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

@@ -85,28 +85,28 @@ define([
                     data.push(pointForTimestamp(start, domainObject.name));
                     start += 5000;
                 }
-
                 return Promise.resolve(data);
             }
         };
 
         var ladProvider = {
             supportsRequest: function (domainObject, options) {
-                return domainObject.type === 'example.imagery'
+                return domainObject.type === 'example.imagery' &&
-                    && options.strategy === 'latest';
+                    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 '
+                description: 'For development use. Creates example imagery ' +
-                    + 'data that mimics a live imagery stream.',
+                    'data that mimics a live imagery stream.',
                 creatable: true,
                 initialize: function (object) {
                     object.telemetry = {
@@ -140,7 +140,7 @@ define([
                                 }
                             }
                         ]
-                    };
+                    }
                 }
             });
 

example/mobile/bundle.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([], function () {
     "use strict";

example/msl/bundle.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([
     "./src/RemsTelemetryServerAdapter",
@@ -30,7 +31,6 @@ define([
     RemsTelemetryProvider
 ) {
     "use strict";
-
     return {
         name:"example/msl",
         definition: {

example/msl/src/MSLDataDictionary.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(
     [],

example/msl/src/RemsTelemetryModelProvider.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(
     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

@@ -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

@@ -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

@@ -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"
+                self.$log.warn("Loading REMS data failed, probably due to" +
-                    + " cross origin policy. Falling back to local data");
+                    " 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)
+                    return result.date >= (request.start || Number.MIN_VALUE) &&
-                        && result.date <= (request.end || Number.MAX_VALUE);
+                        result.date <= (request.end || Number.MAX_VALUE);
                 });
             }
 
             function packageAndResolve(results) {
-                return {
+                return {id: id, values: results};
-                    id: id,
-                    values: results
-                };
             }
 
+
             return (this.promise = this.promise || this.$http.get(this.REMS_WS_URL))
                 .catch(fallbackToLocal)
                 .then(processResponse)

example/notifications/bundle.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([
     "./src/DialogLaunchController",

example/notifications/src/DialogLaunchController.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(
     [],
@@ -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"
+                        actionText: "This is an example of a blocking info" +
-                        + " dialog. This dialog can be used to draw the user's"
+                        " dialog. This dialog can be used to draw the user's" +
-                        + " attention to an event.",
+                        " attention to an event.",
                         severity: "info",
                         primaryOption: {
                             label: "OK",
@@ -151,7 +153,6 @@ define(
             };
 
         }
-
         return DialogLaunchController;
     }
 );

example/notifications/src/DialogLaunchIndicator.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,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

@@ -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,7 +48,6 @@ 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)];
             }
 
@@ -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));
+                    progress = Math.min(100, Math.floor(progress + Math.random() * 30))
-                    let progressText = ["Estimated time"
+                    let progressText = ["Estimated time" +
-                    + " remaining:"
+                    " remaining:" +
-                    + " about ", 60 - Math.floor((progress / 100) * 60), " seconds"].join(" ");
+                    " 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

@@ -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

@@ -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"

example/persistence/src/BrowserPersistenceProvider.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*/
 
 /**
  * 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

@@ -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"

example/policy/src/ExamplePolicy.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(
     [],
@@ -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

@@ -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",

example/profiling/src/DigestIndicator.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(
     [],

example/profiling/src/WatchIndicator.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(
     [],

example/scratchpad/bundle.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([
     "./src/ScratchPersistenceProvider"

example/scratchpad/src/ScratchPersistenceProvider.js

@@ -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])
+                (space === 'scratch' && this.table[key]) ?
-                    ? JSON.parse(this.table[key]) : undefined
+                    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

@@ -29,104 +29,24 @@ define([
             "extensions":
         {
             "types": [
-                {
+                { "key": "styleguide.intro", "name": "Introduction", "cssClass": "icon-page", "description": "Introduction and overview to the style guide" },
-                    "key": "styleguide.intro",
+                { "key": "styleguide.standards", "name": "Standards", "cssClass": "icon-page", "description": "" },
-                    "name": "Introduction",
+                { "key": "styleguide.colors", "name": "Colors", "cssClass": "icon-page", "description": "" },
-                    "cssClass": "icon-page",
+                { "key": "styleguide.status", "name": "status", "cssClass": "icon-page", "description": "Limits, telemetry paused, etc." },
-                    "description": "Introduction and overview to the style guide"
+                { "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.standards",
+                { "key": "styleguide.menus", "name": "Menus", "cssClass": "icon-page", "description": "Context menus, dropdowns" }
-                    "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.intro",
+                { "key": "styleguide.standards", "type": "styleguide.standards", "template": standardsTemplate, "editable": false },
-                    "type": "styleguide.intro",
+                { "key": "styleguide.colors", "type": "styleguide.colors", "template": colorsTemplate, "editable": false },
-                    "template": introTemplate,
+                { "key": "styleguide.status", "type": "styleguide.status", "template": statusTemplate, "editable": false },
-                    "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.standards",
+                { "key": "styleguide.menus", "type": "styleguide.menus", "template": menusTemplate, "editable": false }
-                    "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": [
                 {

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 = {
+            pages.intro = { name: "Introduction", type: "styleguide.intro", location: "styleguide:home" };
-                name: "Introduction",
+            pages.standards = { name: "Standards", type: "styleguide.standards", location: "styleguide:home" };
-                type: "styleguide.intro",
+            pages.colors = { name: "Colors", type: "styleguide.colors", location: "styleguide:home" };
-                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.standards = {
+            pages.controls = { name: "Controls", type: "styleguide.controls", location: "styleguide:ui-elements" };
-                name: "Standards",
+            pages.input = { name: "Text Inputs", type: "styleguide.input", location: "styleguide:ui-elements" };
-                type: "styleguide.standards",
+            pages.menus = { name: "Menus", type: "styleguide.menus", location: "styleguide:ui-elements" };
-                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

@@ -113,10 +113,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(
+        openmct.install(openmct.plugins.ClearData(['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked']));
-            ['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked'],
-            {indicator: true}
-        ));
         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

@@ -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: 64
+                    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
-        singleRun: true,
-        browserNoActivityTimeout: 400000
     });
-};
+}

openmct.js

@@ -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,11 @@
 {
   "name": "openmct",
-  "version": "1.3.0-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,7 +21,7 @@
     "d3-selection": "1.3.x",
     "d3-time": "1.0.x",
     "d3-time-format": "2.1.x",
-    "eslint": "7.0.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",
@@ -39,28 +38,29 @@
     "istanbul-instrumenter-loader": "^3.0.1",
     "jasmine-core": "^3.1.0",
     "jsdoc": "^3.3.2",
-    "karma": "5.1.1",
+    "karma": "5.0.9",
     "karma-chrome-launcher": "3.1.0",
-    "karma-firefox-launcher": "1.3.0",
+    "karma-cli": "^1.0.1",
-    "karma-cli": "2.0.0",
+    "karma-coverage": "^1.1.2",
-    "karma-coverage": "2.0.3",
+    "karma-coverage-istanbul-reporter": "^2.1.1",
-    "karma-coverage-istanbul-reporter": "3.0.3",
+    "karma-html-reporter": "^0.2.7",
-    "karma-html-reporter": "0.2.7",
+    "karma-jasmine": "^2.0.0",
-    "karma-jasmine": "3.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
-    "karma-sourcemap-loader": "0.3.7",
+    "karma-webpack": "^3.0.0",
-    "karma-webpack": "4.0.2",
     "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",
+    "node-sass": "^4.9.2",
-    "painterro": "^1.0.35",
+    "painterro": "^0.2.65",
+    "plotly.js-basic-dist-min": "^1.54.6",
+    "plotly.js-gl2d-dist-min": "^1.54.5",
     "printj": "^1.2.1",
     "raw-loader": "^0.5.1",
     "request": "^2.69.0",

platform/commonUI/about/src/AboutController.js

@@ -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/test/AboutControllerSpec.js

@@ -25,20 +25,14 @@ define(
     function (AboutController) {
 
         describe("The About controller", function () {
-            let testVersions;
+            var testVersions,
-            let mockWindow;
+                mockWindow,
-            let controller;
+                controller;
 
             beforeEach(function () {
                 testVersions = [
-                    {
+                    { name: "Some name", value: "1.2.3" },
-                        name: "Some name",
+                    { name: "Some other name", value: "3.2.1" }
-                        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/browse/src/navigation/NavigateAction.js

@@ -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

@@ -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

@@ -40,7 +40,6 @@ define([], function () {
 
         function getParent(domainObject) {
             var context = domainObject.getCapability('context');
-
             return context.getParent();
         }
 

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

@@ -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

@@ -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

@@ -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
+                    var caseName = isEditRoot ?
-                        ? "that are being edited" : "that are not being edited";
+                        "that are being edited" : "that are not being edited";
 
                     function itNavigatesAsExpected() {
                         if (isOrphan && !isEditRoot) {

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

@@ -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>
+    </a>
-    <button class='c-button  '
+    <a class='c-button  '
        ng-click="ngModel.cancel()">
         Cancel
-    </button>
+    </a>
 </div>

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

@@ -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

@@ -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/OverlayService.js

@@ -28,6 +28,7 @@ define(
         // the a specific template that can be included via mct-include
         var TEMPLATE = '<mct-include ng-model="overlay" key="key" ng-class="typeClass"></mct-include>';
 
+
         /**
          * The OverlayService is responsible for pre-pending templates to
          * the body of the document, which is useful for displaying templates
@@ -52,7 +53,6 @@ define(
             this.findBody = function () {
                 return $document.find('body');
             };
-
             this.newScope = function () {
                 return $rootScope.$new();
             };

platform/commonUI/dialog/test/DialogServiceSpec.js

@@ -129,8 +129,8 @@ define(
                 );
             });
 
-            it("invokes the overlay service with the correct parameters when"
+            it("invokes the overlay service with the correct parameters when" +
-                + " a blocking dialog is requested", function () {
+                " a blocking dialog is requested", function () {
                 var dialogModel = {};
                 expect(dialogService.showBlockingMessage(dialogModel)).not.toBe(false);
                 expect(mockOverlayService.createOverlay).toHaveBeenCalledWith(

platform/commonUI/dialog/test/OverlayServiceSpec.js

@@ -48,7 +48,7 @@ define(
                 mockScope = jasmine.createSpyObj("scope", ["$destroy"]);
                 mockTimeout = function (callback) {
                     callback();
-                };
+                }
 
                 mockDocument.find.and.returnValue(mockBody);
                 mockCompile.and.returnValue(mockTemplate);

platform/commonUI/edit/src/actions/CancelAction.js

@@ -56,7 +56,6 @@ define(
                     //navigate back to parent because nothing to show.
                     return domainObject.getCapability("location").getOriginal().then(function (original) {
                         parent = original.getCapability("context").getParent();
-
                         return parent.getCapability("action").perform("navigate");
                     });
                 }
@@ -79,10 +78,9 @@ define(
          */
         CancelAction.appliesTo = function (context) {
             var domainObject = (context || {}).domainObject;
-
+            return domainObject !== undefined &&
-            return domainObject !== undefined
+                domainObject.hasCapability('editor') &&
-                && domainObject.hasCapability('editor')
+                domainObject.getCapability('editor').isEditContextRoot();
-                && domainObject.getCapability('editor').isEditContextRoot();
         };
 
         return CancelAction;

platform/commonUI/edit/src/actions/EditAction.js

@@ -91,9 +91,9 @@ define(
 
             // Only allow editing of types that support it and are not already
             // being edited
-            return type && type.hasFeature('creation')
+            return type && type.hasFeature('creation') &&
-                && domainObject.hasCapability('editor')
+                domainObject.hasCapability('editor') &&
-                && !domainObject.getCapability('editor').isEditContextRoot();
+                !domainObject.getCapability('editor').isEditContextRoot();
         };
 
         return EditAction;

platform/commonUI/edit/src/actions/EditAndComposeAction.js

@@ -24,6 +24,7 @@ define(
     [],
     function () {
 
+
         /**
          * Add one domain object to another's composition.
          * @constructor
@@ -41,9 +42,8 @@ define(
 
             // Link these objects
             function doLink() {
-                var composition = self.domainObject
+                var composition = self.domainObject &&
-                        && self.domainObject.getCapability('composition');
+                        self.domainObject.getCapability('composition');
-
                 return composition && composition.add(self.selectedObject);
             }
 

platform/commonUI/edit/src/actions/PropertiesAction.js

@@ -99,3 +99,4 @@ define(
 
 );
 
+

platform/commonUI/edit/src/actions/PropertiesDialog.js

@@ -51,7 +51,6 @@ define(
                         // Property definition is same as form row definition
                         var row = JSON.parse(JSON.stringify(property.getDefinition()));
                         row.key = index;
-
                         return row;
                     }).filter(function (row) {
                         // Only show properties which are editable

platform/commonUI/edit/src/actions/SaveAction.js

@@ -86,11 +86,10 @@ define(
          */
         SaveAction.appliesTo = function (context) {
             var domainObject = (context || {}).domainObject;
-
+            return domainObject !== undefined &&
-            return domainObject !== undefined
+                domainObject.hasCapability('editor') &&
-                && domainObject.hasCapability('editor')
+                domainObject.getCapability('editor').isEditContextRoot() &&
-                && domainObject.getCapability('editor').isEditContextRoot()
+                domainObject.getModel().persisted !== undefined;
-                && domainObject.getModel().persisted !== undefined;
         };
 
         return SaveAction;

platform/commonUI/edit/src/actions/SaveAsAction.js

@@ -20,6 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
+
 define([
     '../creation/CreateWizard',
     './SaveInProgressDialog'
@@ -49,7 +50,6 @@ function (
         this.injectObjectService = function () {
             this.objectService = $injector.get("objectService");
         };
-
         this.dialogService = dialogService;
         this.copyService = copyService;
         this.notificationService = notificationService;
@@ -75,10 +75,15 @@ function (
         if (!this.objectService) {
             this.injectObjectService();
         }
-
         return this.objectService;
     };
 
+    function resolveWith(object) {
+        return function () {
+            return object;
+        };
+    }
+
     /**
          * Save changes and conclude editing.
          *
@@ -96,6 +101,7 @@ function (
     SaveAsAction.prototype.save = function () {
         var self = this,
             domainObject = this.domainObject,
+            copyService = this.copyService,
             dialog = new SaveInProgressDialog(this.dialogService),
             toUndirty = [];
 
@@ -112,13 +118,11 @@ function (
 
         function showBlockingDialog(object) {
             dialog.show();
-
             return object;
         }
 
         function hideBlockingDialog(object) {
             dialog.hide();
-
             return object;
         }
 
@@ -132,22 +136,18 @@ function (
             return fetchObject(object.getModel().location);
         }
 
-        function saveObject(parent) {
+        function allowClone(objectToClone) {
-            return self.openmct.editor.save().then(() => {
+            var allowed =
-                // Force mutation for search indexing
+                    (objectToClone.getId() === domainObject.getId()) ||
-                return parent;
+                        objectToClone.getCapability('location').isOriginal();
-            });
+            if (allowed) {
+                toUndirty.push(objectToClone);
+            }
+            return allowed;
         }
 
-        function addSavedObjectToParent(parent) {
+        function cloneIntoParent(parent) {
-            return parent.getCapability("composition")
+            return copyService.perform(domainObject, parent, allowClone);
-                .add(domainObject)
-                .then(function (addedObject) {
-                    return parent.getCapability("persistence").persist()
-                        .then(function () {
-                            return addedObject;
-                        });
-                });
         }
 
         function undirty(object) {
@@ -156,22 +156,30 @@ function (
 
         function undirtyOriginals(object) {
             return Promise.all(toUndirty.map(undirty))
-                .then(() => {
+                .then(resolveWith(object));
-                    return object;
-                });
         }
 
-        function indexForSearch(addedObject) {
+        function saveAfterClone(clonedObject) {
-            addedObject.useCapability('mutation', (model) => {
+            return this.openmct.editor.save().then(() => {
+                // Force mutation for search indexing
+                return clonedObject;
+            })
+        }
+
+        function finishEditing(clonedObject) {
+            return fetchObject(clonedObject.getId())
+        }
+
+        function indexForSearch(savedObject) {
+            savedObject.useCapability('mutation', (model) => {
                 return model;
             });
 
-            return addedObject;
+            return savedObject;
         }
 
         function onSuccess(object) {
             self.notificationService.info("Save Succeeded");
-
             return object;
         }
 
@@ -180,7 +188,6 @@ function (
             if (reason !== "user canceled") {
                 self.notificationService.error("Save Failed");
             }
-
             throw reason;
         }
 
@@ -188,18 +195,17 @@ function (
             .then(doWizardSave)
             .then(showBlockingDialog)
             .then(getParent)
-            .then(saveObject)
+            .then(cloneIntoParent)
-            .then(addSavedObjectToParent)
             .then(undirtyOriginals)
-            .then((addedObject) => {
+            .then(saveAfterClone)
-                return fetchObject(addedObject.getId());
+            .then(finishEditing)
-            })
             .then(indexForSearch)
             .then(hideBlockingDialog)
             .then(onSuccess)
             .catch(onFailure);
     };
 
+
     /**
          * Check if this action is applicable in a given context.
          * This will ensure that a domain object is present in the context,
@@ -208,11 +214,10 @@ function (
          */
     SaveAsAction.appliesTo = function (context) {
         var domainObject = (context || {}).domainObject;
-
+        return domainObject !== undefined &&
-        return domainObject !== undefined
+                domainObject.hasCapability('editor') &&
-                && domainObject.hasCapability('editor')
+                domainObject.getCapability('editor').isEditContextRoot() &&
-                && domainObject.getCapability('editor').isEditContextRoot()
+                domainObject.getModel().persisted === undefined;
-                && domainObject.getModel().persisted === undefined;
     };
 
     return SaveAsAction;

platform/commonUI/edit/src/capabilities/EditorCapability.js

@@ -83,7 +83,6 @@ define(
          */
         EditorCapability.prototype.save = function () {
             console.warn('DEPRECATED: cannot save via edit capability, use openmct.editor instead.');
-
             return Promise.resolve();
         };
 
@@ -96,7 +95,6 @@ define(
          */
         EditorCapability.prototype.finish = function () {
             console.warn('DEPRECATED: cannot finish via edit capability, use openmct.editor instead.');
-
             return Promise.resolve();
         };
 

platform/commonUI/edit/src/capabilities/TransactionCapabilityDecorator.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(
     ['./TransactionalPersistenceCapability'],
@@ -55,10 +56,9 @@ define(
 
             capabilities.persistence = function (domainObject) {
                 var original =
-                    (typeof persistenceCapability === 'function')
+                    (typeof persistenceCapability === 'function') ?
-                        ? persistenceCapability(domainObject)
+                        persistenceCapability(domainObject) :
-                        : persistenceCapability;
+                        persistenceCapability;
-
                 return new TransactionalPersistenceCapability(
                     self.$q,
                     self.transactionService,
@@ -66,7 +66,6 @@ define(
                     domainObject
                 );
             };
-
             return capabilities;
         };
 

platform/commonUI/edit/src/capabilities/TransactionalPersistenceCapability.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(
     [],
@@ -63,7 +64,6 @@ define(
                     wrappedPersistence.persist.bind(wrappedPersistence),
                     wrappedPersistence.refresh.bind(wrappedPersistence)
                 );
-
                 //Need to return a promise from this function
                 return this.$q.when(true);
             } else {
@@ -74,7 +74,6 @@ define(
         TransactionalPersistenceCapability.prototype.refresh = function () {
             this.transactionManager
                 .clearTransactionsFor(this.domainObject.getId());
-
             return this.persistenceCapability.refresh();
         };
 

platform/commonUI/edit/src/controllers/EditActionController.js

@@ -48,9 +48,9 @@ define(
             // Maintain all "conclude-editing" and "save" actions in the
             // present context.
             function updateActions() {
-                $scope.saveActions = $scope.action
+                $scope.saveActions = $scope.action ?
-                    ? $scope.action.getActions(SAVE_ACTION_CONTEXT)
+                    $scope.action.getActions(SAVE_ACTION_CONTEXT) :
-                    : [];
+                    [];
 
                 $scope.saveActionsAsMenuOptions = $scope.saveActions.map(actionToMenuOption);
 
@@ -58,9 +58,9 @@ define(
                     clickedAction.perform();
                 };
 
-                $scope.otherEditActions = $scope.action
+                $scope.otherEditActions = $scope.action ?
-                    ? $scope.action.getActions(OTHERS_ACTION_CONTEXT)
+                    $scope.action.getActions(OTHERS_ACTION_CONTEXT) :
-                    : [];
+                    [];
 
                 // Required because Angular does not allow 'bind'
                 // in expressions.

platform/commonUI/edit/src/controllers/EditObjectController.js

@@ -30,11 +30,11 @@ define(
 
         function cancelEditing(domainObject) {
             var navigatedObject = domainObject,
-                editorCapability = navigatedObject
+                editorCapability = navigatedObject &&
-                    && navigatedObject.getCapability("editor");
+                    navigatedObject.getCapability("editor");
 
-            return editorCapability
+            return editorCapability &&
-                && editorCapability.finish();
+                editorCapability.finish();
         }
 
         /**

platform/commonUI/edit/src/controllers/EditPanesController.js

@@ -35,8 +35,8 @@ define(
             // Update root object based on represented object
             function updateRoot(domainObject) {
                 var root = self.rootDomainObject,
-                    context = domainObject
+                    context = domainObject &&
-                        && domainObject.getCapability('context'),
+                        domainObject.getCapability('context'),
                     newRoot = context && context.getTrueRoot(),
                     oldId = root && root.getId(),
                     newId = newRoot && newRoot.getId();
@@ -51,7 +51,6 @@ define(
             // Update root when represented object changes
             $scope.$watch('domainObject', updateRoot);
         }
-
         /**
          * Get the root-level domain object, as reported by the
          * represented domain object.

platform/commonUI/edit/src/creation/CreateAction.js

@@ -104,6 +104,7 @@ define(
             // We will disable this.
         };
 
+
         /**
          * Metadata associated with a Create action.
          * @typedef {ActionMetadata} CreateActionMetadata

platform/commonUI/edit/src/creation/CreateMenuController.js

@@ -38,9 +38,9 @@ define(
         function CreateMenuController($scope) {
             // Update the set of Create actions
             function refreshActions() {
-                $scope.createActions = $scope.action
+                $scope.createActions = $scope.action ?
-                    ? $scope.action.getActions('create')
+                    $scope.action.getActions('create') :
-                    : [];
+                    [];
             }
 
             // Listen for new instances of the represented object's

platform/commonUI/edit/src/creation/CreateWizard.js

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

platform/commonUI/edit/src/creation/CreationService.js

@@ -73,13 +73,12 @@ define(
             // as a child contained by that parent.
             function addToComposition() {
                 var compositionCapability = parent.getCapability('composition'),
-                    addResult = compositionCapability
+                    addResult = compositionCapability &&
-                        && compositionCapability.add(newObject);
+                        compositionCapability.add(newObject);
 
                 return self.$q.when(addResult).then(function (result) {
                     if (!result) {
                         self.$log.error("Could not modify " + parent.getId());
-
                         return undefined;
                     }
 
@@ -93,7 +92,6 @@ define(
             // what space to create the new object's model in.
             if (!persistence || !newObjectPersistence) {
                 self.$log.warn(NON_PERSISTENT_WARNING);
-
                 return self.$q.reject(new Error(NON_PERSISTENT_WARNING));
             }
 
@@ -101,6 +99,8 @@ define(
             return newObjectPersistence.persist().then(addToComposition);
         };
 
+
+
         return CreationService;
     }
 );

platform/commonUI/edit/src/creation/LocatorController.js

@@ -38,8 +38,8 @@ define(
             // * treeModel: The model for the embedded tree representation,
             //              used for bi-directional object selection.
             function setLocatingObject(domainObject, priorObject) {
-                var context = domainObject
+                var context = domainObject &&
-                    && domainObject.getCapability("context"),
+                    domainObject.getCapability("context"),
                     contextRoot = context && context.getRoot();
 
                 if (contextRoot && contextRoot !== $scope.rootObject) {
@@ -65,12 +65,11 @@ define(
                 $scope.ngModel[$scope.field] = domainObject;
 
                 // Restrict which locations can be selected
-                if (domainObject
+                if (domainObject &&
-                        && $scope.structure
+                        $scope.structure &&
-                            && $scope.structure.validate) {
+                            $scope.structure.validate) {
                     if (!$scope.structure.validate(domainObject)) {
                         setLocatingObject(priorObject, undefined);
-
                         return;
                     }
                 }
@@ -79,7 +78,7 @@ define(
                 if ($scope.ngModelController) {
                     $scope.ngModelController.$setValidity(
                         'composition',
-                        Boolean($scope.treeModel.selectedObject)
+                        !!$scope.treeModel.selectedObject
                     );
                 }
             }

platform/commonUI/edit/src/policies/EditPersistableObjectsPolicy.js

@@ -36,6 +36,8 @@ define(
         }
 
         EditPersistableObjectsPolicy.prototype.allow = function (action, context) {
+            var identifier;
+            var provider;
             var domainObject = context.domainObject;
             var key = action.getMetadata().key;
             var category = (context || {}).category;
@@ -44,9 +46,9 @@ define(
             // is also invoked during the create process which should be allowed,
             // because it may be saved elsewhere
             if ((key === 'edit' && category === 'view-control') || key === 'properties') {
-                let newStyleObject = objectUtils.toNewFormat(domainObject, domainObject.getId());
+                identifier = objectUtils.parseKeyString(domainObject.getId());
-
+                provider = this.openmct.objects.getProvider(identifier);
-                return this.openmct.objects.isPersistable(newStyleObject);
+                return provider.save !== undefined;
             }
 
             return true;

platform/commonUI/edit/src/representers/EditRepresenter.js

@@ -74,7 +74,6 @@ define(
                     model.configuration = model.configuration || {};
                     model.configuration[this.key] = configuration;
                 }
-
                 domainObject.useCapability('mutation', function () {
                     return model;
                 });

platform/commonUI/edit/src/services/NestedTransaction.js

@@ -41,7 +41,6 @@ define(['./Transaction'], function (Transaction) {
             Transaction.prototype.commit.bind(this),
             Transaction.prototype.cancel.bind(this)
         );
-
         return Promise.resolve(true);
     };
 

platform/commonUI/edit/src/services/Transaction.js

@@ -41,12 +41,8 @@ define([], function () {
      *          pair of callbacks from the transaction
      */
     Transaction.prototype.add = function (commit, cancel) {
-        var callback = {
+        var callback = { commit: commit, cancel: cancel };
-            commit: commit,
-            cancel: cancel
-        };
         this.callbacks.push(callback);
-
         return function () {
             this.callbacks = this.callbacks.filter(function (c) {
                 return c !== callback;
@@ -95,5 +91,6 @@ define([], function () {
         };
     });
 
+
     return Transaction;
 });

platform/commonUI/edit/src/services/TransactionManager.js

@@ -50,7 +50,7 @@ define([], function () {
      * @returns {boolean} true if callbacks have been added
      */
     TransactionManager.prototype.isScheduled = function (id) {
-        return Boolean(this.clearTransactionFns[id]);
+        return !!this.clearTransactionFns[id];
     };
 
     /**
@@ -77,7 +77,6 @@ define([], function () {
                 return promiseFn().then(nextFn);
             };
         }
-
         /**
          * Clear any existing persistence calls for object with given ID. This ensures only the most recent persistence
          * call is executed. This should prevent stale objects being persisted and overwriting fresh ones.

platform/commonUI/edit/src/services/TransactionService.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(
     ['./Transaction', './NestedTransaction'],
     function (Transaction, NestedTransaction) {
@@ -47,9 +48,9 @@ define(
          * #cancel} are called
          */
         TransactionService.prototype.startTransaction = function () {
-            var transaction = this.isActive()
+            var transaction = this.isActive() ?
-                ? new NestedTransaction(this.transactions[0])
+                new NestedTransaction(this.transactions[0]) :
-                : new Transaction(this.$log);
+                new Transaction(this.$log);
 
             this.transactions.push(transaction);
         };
@@ -98,16 +99,13 @@ define(
             if (!transaction) {
                 return Promise.reject();
             }
-
             if (!this.isActive()) {
                 return transaction.commit()
                     .then(function (r) {
                         this.cacheService.flush();
-
                         return r;
                     }.bind(this));
             }
-
             return transaction.commit();
         };
 
@@ -121,7 +119,6 @@ define(
          */
         TransactionService.prototype.cancel = function () {
             var transaction = this.transactions.pop();
-
             return transaction ? transaction.cancel() : Promise.reject();
         };
 

platform/commonUI/edit/test/actions/CancelActionSpec.js

@@ -102,7 +102,7 @@ define(
                 });
 
                 mockDomainObject.hasCapability.and.callFake(function (name) {
-                    return Boolean(capabilities[name]);
+                    return !!capabilities[name];
                 });
 
                 capabilities.editor.finish.and.returnValue(mockPromise(true));
@@ -123,8 +123,8 @@ define(
                 expect(CancelAction.appliesTo(actionContext)).toBeFalsy();
             });
 
-            it("invokes the editor capability's cancel functionality when"
+            it("invokes the editor capability's cancel functionality when" +
-                + " performed", function () {
+                " performed", function () {
                 mockDomainObject.getModel.and.returnValue({persisted: 1});
                 //Return true from navigate action
                 capabilities.action.perform.and.returnValue(mockPromise(true));

platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js

@@ -93,6 +93,7 @@ define(
                 action = new EditAndComposeAction(actionContext);
             });
 
+
             it("adds to the parent's composition when performed", function () {
                 action.perform();
                 expect(mockComposition.add)
@@ -105,8 +106,8 @@ define(
                 expect(mockEditAction.perform).toHaveBeenCalled();
             });
 
-            it("Does not enable edit mode for objects that do not have an"
+            it("Does not enable edit mode for objects that do not have an" +
-                + " edit action", function () {
+                " edit action", function () {
                 mockActionCapability.getActions.and.returnValue([]);
                 action.perform();
                 expect(mockEditAction.perform).not.toHaveBeenCalled();

platform/commonUI/edit/test/actions/PropertiesActionSpec.js

@@ -64,10 +64,7 @@ define(
                         return true;
                     }
                 };
-                context = {
+                context = { someKey: "some value", domainObject: object };
-                    someKey: "some value",
-                    domainObject: object
-                };
                 dialogService = {
                     getUserInput: function () {
                         return mockPromise(input);

platform/commonUI/edit/test/actions/SaveActionSpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, 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.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global describe,it,expect,beforeEach,jasmine*/
 
 define(
     ["../../src/actions/SaveAction"],
@@ -137,7 +138,6 @@ define(
                 it("notifies if saving succeeded", function () {
                     var mockCallback = jasmine.createSpy("callback");
                     mockEditorCapability.save.and.returnValue(Promise.resolve());
-
                     return action.perform().then(mockCallback).then(function () {
                         expect(mockNotificationService.info).toHaveBeenCalled();
                         expect(mockNotificationService.error).not.toHaveBeenCalled();
@@ -147,7 +147,6 @@ define(
                 it("notifies if saving failed", function () {
                     var mockCallback = jasmine.createSpy("callback");
                     mockEditorCapability.save.and.returnValue(Promise.reject("some failure reason"));
-
                     return action.perform().then(mockCallback).then(function () {
                         expect(mockNotificationService.error).toHaveBeenCalled();
                         expect(mockNotificationService.info).not.toHaveBeenCalled();

platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.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 describe,it,expect,beforeEach,jasmine*/
 
 define(
     ["../../src/actions/SaveAndStopEditingAction"],
@@ -96,6 +97,7 @@ define(
                 action = new SaveAndStopEditingAction(dialogService, notificationService, actionContext);
             });
 
+
             it("only applies to domain object with an editor capability", function () {
                 expect(SaveAndStopEditingAction.appliesTo(actionContext)).toBe(true);
                 expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor");

platform/commonUI/edit/test/actions/SaveAsActionSpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, 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.
  *
@@ -19,6 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global describe,it,expect,beforeEach,jasmine,spyOn*/
 
 define(
     ["../../src/actions/SaveAsAction"],
@@ -41,8 +42,8 @@ define(
             function noop() {}
 
             function mockPromise(value) {
-                return (value || {}).then ? value
+                return (value || {}).then ? value :
-                    : {
+                    {
                         then: function (callback) {
                             return mockPromise(callback(value));
                         },
@@ -66,10 +67,7 @@ define(
                 mockDomainObject.getCapability.and.callFake(function (capability) {
                     return capabilities[capability];
                 });
-                mockDomainObject.getModel.and.returnValue({
+                mockDomainObject.getModel.and.returnValue({location: 'a', persisted: undefined});
-                    location: 'a',
-                    persisted: undefined
-                });
                 mockDomainObject.getId.and.returnValue(0);
 
                 mockClonedObject = jasmine.createSpyObj(
@@ -170,8 +168,8 @@ define(
                 expect(SaveAsAction.appliesTo(actionContext)).toBe(false);
             });
 
-            it("only applies to domain object that has not already been"
+            it("only applies to domain object that has not already been" +
-                + " persisted", function () {
+                " persisted", function () {
                 expect(SaveAsAction.appliesTo(actionContext)).toBe(true);
                 expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor");
 

platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js

@@ -118,8 +118,8 @@ define(
                 expect(capability.isEditContextRoot()).toBe(true);
             });
 
-            it("inEditingContext returns true if parent object is being"
+            it("inEditingContext returns true if parent object is being" +
-                + " edited", function () {
+                " edited", function () {
                 mockStatusCapability.get.and.returnValue(false);
                 mockParentStatus.get.and.returnValue(false);
                 expect(capability.inEditContext()).toBe(false);
@@ -179,8 +179,8 @@ define(
                     capability.edit();
                     capability.finish();
                 });
-                it("returns true if the object has been modified since it"
+                it("returns true if the object has been modified since it" +
-                    + " was last persisted", function () {
+                    " was last persisted", function () {
                     mockTransactionService.size.and.returnValue(0);
                     expect(capability.dirty()).toBe(false);
                     mockTransactionService.size.and.returnValue(1);

platform/commonUI/edit/test/capabilities/TransactionalPersistenceCapabilitySpec.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, 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.
  *
@@ -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,describe,it,expect,beforeEach,jasmine*/
 
 define(
     [
@@ -75,15 +76,15 @@ define(
                 );
             });
 
-            it("if no transaction is active, passes through to persistence"
+            it("if no transaction is active, passes through to persistence" +
-                + " provider", function () {
+                " provider", function () {
                 mockTransactionManager.isActive.and.returnValue(false);
                 capability.persist();
                 expect(mockPersistence.persist).toHaveBeenCalled();
             });
 
-            it("if transaction is active, persist and cancel calls are"
+            it("if transaction is active, persist and cancel calls are" +
-                + " queued", function () {
+                " queued", function () {
                 mockTransactionManager.isActive.and.returnValue(true);
                 capability.persist();
                 expect(mockTransactionManager.addToTransaction).toHaveBeenCalled();

platform/commonUI/edit/test/controllers/EditActionControllerSpec.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 describe,it,expect,beforeEach,jasmine*/
 
 define(
     ["../../src/controllers/EditActionController"],
@@ -39,7 +40,6 @@ define(
                     mockedSaveActions.forEach(function (action) {
                         action.getMetadata.and.returnValue(mockSaveActionMetadata);
                     });
-
                     return mockedSaveActions;
                 } else if (actionContext.category === "conclude-editing") {
                     return ["a", "b", "c"];

platform/commonUI/edit/test/controllers/EditObjectControllerSpec.js

@@ -77,10 +77,7 @@ define(
 
                 testViews = [
                     { key: 'abc' },
-                    {
+                    { key: 'def', someKey: 'some value' },
-                        key: 'def',
-                        someKey: 'some value'
-                    },
                     { key: 'xyz' }
                 ];
 

platform/commonUI/edit/test/controllers/EditPanesControllerSpec.js

@@ -48,10 +48,10 @@ define(
                 mockContext.getTrueRoot.and.callFake(function () {
                     var mockRoot = jasmine.createSpyObj('root', ['getId']);
                     mockRoot.getId.and.returnValue('root-id');
-
                     return mockRoot;
                 });
 
+
                 controller = new EditPanesController(mockScope);
             });
 
@@ -97,7 +97,6 @@ define(
                 mockContext.getTrueRoot.and.callFake(function () {
                     var mockRoot = jasmine.createSpyObj('root', ['getId']);
                     mockRoot.getId.and.returnValue('other-root-id');
-
                     return mockRoot;
                 });
 

platform/commonUI/edit/test/creation/CreateActionProviderSpec.js

@@ -51,7 +51,6 @@ define(
                 );
                 mockType.hasFeature.and.returnValue(true);
                 mockType.getName.and.returnValue(name);
-
                 return mockType;
             }
 
@@ -76,7 +75,7 @@ define(
                 };
 
                 mockPolicyService.allow.and.callFake(function (category, type) {
-                    return Boolean(category === "creation" && mockCreationPolicy(type));
+                    return category === "creation" && mockCreationPolicy(type) ? true : false;
                 });
 
                 mockTypeService.listTypes.and.returnValue(mockTypes);