resolve merge conflict

- Fixed incorrect CSS naming: `c-frame-edit__move` changed to
 `c-frame__move-bar`;
 - Fixed `display: contents` that was erroneously applied to
 `u-angular-object-view-wrapper` and preventing styling from being
 applied to plots, renamed class to `.l-angular-ov-wrapper`;
 - Removed commented CSS;

.eslintrc.js

@@ -120,6 +120,8 @@ module.exports = {
         "no-useless-computed-key": "error",
         // https://eslint.org/docs/rules/rest-spread-spacing
         "rest-spread-spacing": ["error"],
+        // https://eslint.org/docs/rules/one-var
+        "one-var": ["error", "never"],
 
         "vue/html-indent": [
             "error",

.gitignore

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

CONTRIBUTING.md

@@ -226,9 +226,9 @@ typically from the author of the change and its reviewer.
 Automated testing shall occur whenever changes are merged into the main
 development branch and must be confirmed alongside any pull request.
 
-Automated tests are typically unit tests which exercise individual software
+Automated tests are tests which exercise plugins, API, and utility classes. 
-components. Tests are subject to code review along with the actual
+Tests are subject to code review along with the actual implementation, to 
-implementation, to ensure that tests are applicable and useful.
+ensure that tests are applicable and useful.
 
 Examples of useful tests:
 * Tests which replicate bugs (or their root causes) to verify their
@@ -238,8 +238,26 @@ Examples of useful tests:
 * Tests which verify expected interactions with other components in the
   system.
 
-During automated testing, code coverage metrics will be reported. Line
+#### Guidelines
-coverage must remain at or above 80%.
+* 100% statement coverage is achievable and desirable.
+* Do blackbox testing. Test external behaviors, not internal details. Write tests that describe what your plugin is supposed to do. How it does this doesn't matter, so don't test it.
+* Unit test specs for plugins should be defined at the plugin level. Start with one test spec per plugin named pluginSpec.js, and as this test spec grows too big, break it up into multiple test specs that logically group related tests.
+* Unit tests for API or for utility functions and classes may be defined at a per-source file level.
+* Wherever possible only use and mock public API, builtin functions, and UI in your test specs. Do not directly invoke any private functions. ie. only call or mock functions and objects exposed by openmct.* (eg. openmct.telemetry, openmct.objectView, etc.), and builtin browser functions (fetch, requestAnimationFrame, setTimeout, etc.).
+* Where builtin functions have been mocked, be sure to clear them between tests.
+* Test at an appropriate level of isolation. Eg. 
+    * If you’re testing a view, you do not need to test the whole application UI, you can just fetch the view provider using the public API and render the view into an element that you have created. 
+    * You do not need to test that the view switcher works, there should be separate tests for that. 
+    * You do not need to test that telemetry providers work, you can mock openmct.telemetry.request() to feed test data to the view.
+    * Use your best judgement when deciding on appropriate scope.
+* Automated tests for plugins should start by actually installing the plugin being tested, and then test that installing the plugin adds the desired features and behavior to Open MCT, observing the above rules.
+* All variables used in a test spec, including any instances of the Open MCT API should be declared inside of an appropriate block scope (not at the root level of the source file), and should be initialized in the relevant beforeEach block. `beforeEach` is preferable to `beforeAll` to avoid leaking of state between tests.
+* A `afterEach` or `afterAll` should be used to do any clean up necessary to prevent leakage of state between test specs. This can happen when functions on `window` are wrapped, or when the URL is changed. [A convenience function](https://github.com/nasa/openmct/blob/master/src/utils/testing.js#L59) is provided for resetting the URL and clearing builtin spies between tests.
+* If writing unit tests for legacy Angular code be sure to follow [best practices in order to avoid memory leaks](https://www.thecodecampus.de/blog/avoid-memory-leaks-angularjs-unit-tests/).
+
+#### Examples
+* [Example of an automated test spec for an object view plugin](https://github.com/nasa/openmct/blob/master/src/plugins/telemetryTable/pluginSpec.js)
+* [Example of an automated test spec for API](https://github.com/nasa/openmct/blob/master/src/api/time/TimeAPISpec.js)
 
 ### Commit Message Standards
 

LICENSE.md

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

example/eventGenerator/src/EventTelemetry.js

@@ -35,9 +35,9 @@ define(
 
         function EventTelemetry(request, interval) {
 
-            var latestObservedTime = Date.now(),
+            var latestObservedTime = Date.now();
-                count = Math.floor((latestObservedTime - firstObservedTime) / interval),
+            var count = Math.floor((latestObservedTime - firstObservedTime) / interval);
-                generatorData = {};
+            var generatorData = {};
 
             generatorData.getPointCount = function () {
                 return count;
@@ -49,8 +49,8 @@ define(
             };
 
             generatorData.getRangeValue = function (i, range) {
-                var domainDelta = this.getDomainValue(i) - firstObservedTime,
+                var domainDelta = this.getDomainValue(i) - firstObservedTime;
-                    ind = i % messages.length;
+                var ind = i % messages.length;
                 return messages[ind] + " - [" + domainDelta.toString() + "]";
             };
 

example/eventGenerator/src/EventTelemetryProvider.js

@@ -34,9 +34,9 @@ define(
          * @constructor
          */
         function EventTelemetryProvider($q, $timeout) {
-            var subscriptions = [],
+            var subscriptions = [];
-                genInterval = 1000,
+            var genInterval = 1000;
-                generating = false;
+            var generating = false;
 
             //
             function matchesSource(request) {

example/export/ExportTelemetryAsCSVAction.js

@@ -40,23 +40,23 @@ define([], function () {
     }
 
     ExportTelemetryAsCSVAction.prototype.perform = function () {
-        var context = this.context,
+        var context = this.context;
-            domainObject = context.domainObject,
+        var domainObject = context.domainObject;
-            telemetry = domainObject.getCapability("telemetry"),
+        var telemetry = domainObject.getCapability("telemetry");
-            metadata = telemetry.getMetadata(),
+        var metadata = telemetry.getMetadata();
-            domains = metadata.domains,
+        var domains = metadata.domains;
-            ranges = metadata.ranges,
+        var ranges = metadata.ranges;
-            exportService = this.exportService;
+        var exportService = this.exportService;
 
         function getName(domainOrRange) {
             return domainOrRange.name;
         }
 
         telemetry.requestData({}).then(function (series) {
-            var headers = domains.map(getName).concat(ranges.map(getName)),
+            var headers = domains.map(getName).concat(ranges.map(getName));
-                rows = [],
+            var rows = [];
-                row,
+            var row;
-                i;
+            var i;
 
             function copyDomainsToRow(telemetryRow, index) {
                 domains.forEach(function (domain) {

example/generator/GeneratorMetadataProvider.js

@@ -28,6 +28,16 @@ define([
                         domain: 2
                     }
                 },
+                // Need to enable "LocalTimeSystem" plugin to make use of this
+                // {
+                //     key: "local",
+                //     name: "Time",
+                //     format: "local-format",
+                //     source: "utc",
+                //     hints: {
+                //         domain: 3
+                //     }
+                // },
                 {
                     key: "sin",
                     name: "Sine",
@@ -61,6 +71,15 @@ define([
                         domain: 1
                     }
                 },
+                {
+                    key: "local",
+                    name: "Time",
+                    format: "utc",
+                    source: "utc",
+                    hints: {
+                        domain: 2
+                    }
+                },
                 {
                     key: "state",
                     source: "value",

example/generator/SinewaveLimitProvider.js

@@ -28,39 +28,39 @@ define([
 ) {
 
     var RED = {
-            sin: 0.9,
+        sin: 0.9,
-            cos: 0.9
+        cos: 0.9
+    };
+    var YELLOW = {
+        sin: 0.5,
+        cos: 0.5
+    };
+    var LIMITS = {
+        rh: {
+            cssClass: "is-limit--upr is-limit--red",
+            low: RED,
+            high: Number.POSITIVE_INFINITY,
+            name: "Red High"
         },
-        YELLOW = {
+        rl: {
-            sin: 0.5,
+            cssClass: "is-limit--lwr is-limit--red",
-            cos: 0.5
+            high: -RED,
+            low: Number.NEGATIVE_INFINITY,
+            name: "Red Low"
         },
-        LIMITS = {
+        yh: {
-            rh: {
+            cssClass: "is-limit--upr is-limit--yellow",
-                cssClass: "is-limit--upr is-limit--red",
+            low: YELLOW,
-                low: RED,
+            high: RED,
-                high: Number.POSITIVE_INFINITY,
+            name: "Yellow High"
-                name: "Red High"
+        },
-            },
+        yl: {
-            rl: {
+            cssClass: "is-limit--lwr is-limit--yellow",
-                cssClass: "is-limit--lwr is-limit--red",
+            low: -RED,
-                high: -RED,
+            high: -YELLOW,
-                low: Number.NEGATIVE_INFINITY,
+            name: "Yellow Low"
-                name: "Red Low"
+        }
-            },
+    };
-            yh: {
-                cssClass: "is-limit--upr is-limit--yellow",
-                low: YELLOW,
-                high: RED,
-                name: "Yellow High"
-            },
-            yl: {
-                cssClass: "is-limit--lwr is-limit--yellow",
-                low: -RED,
-                high: -YELLOW,
-                name: "Yellow Low"
-            }
-        };
 
     function SinewaveLimitProvider() {
 

example/identity/src/ExampleIdentityService.js

@@ -25,24 +25,24 @@ define(
     function () {
         "use strict";
 
-        var DEFAULT_IDENTITY = { key: "user", name: "Example User" },
+        var DEFAULT_IDENTITY = { key: "user", name: "Example User" };
-            DIALOG_STRUCTURE = {
+        var DIALOG_STRUCTURE = {
-                name: "Identify Yourself",
+            name: "Identify Yourself",
-                sections: [{ rows: [
+            sections: [{ rows: [
-                    {
+                {
-                        name: "User ID",
+                    name: "User ID",
-                        control: "textfield",
+                    control: "textfield",
-                        key: "key",
+                    key: "key",
-                        required: true
+                    required: true
-                    },
+                },
-                    {
+                {
-                        name: "Human name",
+                    name: "Human name",
-                        control: "textfield",
+                    control: "textfield",
-                        key: "name",
+                    key: "name",
-                        required: true
+                    required: true
-                    }
+                }
-                ]}]
+            ]}]
-            };
+        };
 
 
         /**

example/msl/src/RemsTelemetryModelProvider.js

@@ -25,12 +25,12 @@ define(
     function () {
         "use strict";
 
-        var PREFIX = "msl_tlm:",
+        var PREFIX = "msl_tlm:";
-            FORMAT_MAPPINGS = {
+        var FORMAT_MAPPINGS = {
-                float: "number",
+            float: "number",
-                integer: "number",
+            integer: "number",
-                string: "string"
+            string: "string"
-            };
+        };
 
         function RemsTelemetryModelProvider(adapter) {
 
@@ -64,8 +64,8 @@ define(
                 }
 
                 function addInstrument(subsystem, spacecraftId) {
-                    var measurements = (subsystem.measurements || []),
+                    var measurements = (subsystem.measurements || []);
-                        instrumentId = makeId(subsystem);
+                    var instrumentId = makeId(subsystem);
 
                     models[instrumentId] = {
                         type: "msl.instrument",

example/msl/src/RemsTelemetryProvider.js

@@ -42,9 +42,9 @@ define (
          * object that wraps the telemetry returned from the telemetry source.
          */
         RemsTelemetryProvider.prototype.requestTelemetry = function (requests) {
-            var packaged = {},
+            var packaged = {};
-                relevantReqs,
+            var relevantReqs;
-                adapter = this.adapter;
+            var adapter = this.adapter;
 
             function matchesSource(request) {
                 return (request.source === SOURCE);

example/msl/src/RemsTelemetryServerAdapter.js

@@ -30,8 +30,8 @@ define(
     function (MSLDataDictionary, module) {
         "use strict";
 
-        var TERRESTRIAL_DATE = "terrestrial_date",
+        var TERRESTRIAL_DATE = "terrestrial_date";
-            LOCAL_DATA = "../data/rems.json";
+        var LOCAL_DATA = "../data/rems.json";
 
         /**
          * Fetches historical data from the REMS instrument on the Curiosity
@@ -69,8 +69,8 @@ define(
          * @private
          */
         RemsTelemetryServerAdapter.prototype.requestHistory = function (request) {
-            var self = this,
+            var self = this;
-                id = request.key;
+            var id = request.key;
 
             var dataTransforms = this.dataTransforms;
 

example/notifications/src/DialogLaunchController.js

@@ -44,31 +44,31 @@ define(
              periodically with the progress of an ongoing process.
              */
             $scope.launchProgress = function (knownProgress) {
-                var dialog,
+                var dialog;
-                    model = {
+                var model = {
-                        title: "Progress Dialog Example",
+                    title: "Progress Dialog Example",
-                        progress: 0,
+                    progress: 0,
-                        hint: "Do not navigate away from this page or close this browser tab while this operation is in progress.",
+                    hint: "Do not navigate away from this page or close this browser tab while this operation is in progress.",
-                        actionText: "Calculating...",
+                    actionText: "Calculating...",
-                        unknownProgress: !knownProgress,
+                    unknownProgress: !knownProgress,
-                        unknownDuration: false,
+                    unknownDuration: false,
-                        severity: "info",
+                    severity: "info",
-                        options: [
+                    options: [
-                            {
+                        {
-                                label: "Cancel Operation",
+                            label: "Cancel Operation",
-                                callback: function () {
+                            callback: function () {
-                                    $log.debug("Operation cancelled");
+                                $log.debug("Operation cancelled");
-                                    dialog.dismiss();
+                                dialog.dismiss();
-                                }
-                            },
-                            {
-                                label: "Do something else...",
-                                callback: function () {
-                                    $log.debug("Something else pressed");
-                                }
                             }
-                        ]
+                        },
-                    };
+                        {
+                            label: "Do something else...",
+                            callback: function () {
+                                $log.debug("Something else pressed");
+                            }
+                        }
+                    ]
+                };
 
                 function incrementProgress() {
                     model.progress = Math.min(100, Math.floor(model.progress + Math.random() * 30));
@@ -96,28 +96,28 @@ define(
              Demonstrates launching an error dialog
              */
             $scope.launchError = function () {
-                var dialog,
+                var dialog;
-                    model = {
+                var model = {
-                        title: "Error Dialog Example",
+                    title: "Error Dialog Example",
-                        actionText: "Something happened, and it was not good.",
+                    actionText: "Something happened, and it was not good.",
-                        severity: "error",
+                    severity: "error",
-                        options: [
+                    options: [
-                            {
+                        {
-                                label: "Try Again",
+                            label: "Try Again",
-                                callback: function () {
+                            callback: function () {
-                                    $log.debug("Try Again Pressed");
+                                $log.debug("Try Again Pressed");
-                                    dialog.dismiss();
+                                dialog.dismiss();
-                                }
-                            },
-                            {
-                                label: "Cancel",
-                                callback: function () {
-                                    $log.debug("Cancel Pressed");
-                                    dialog.dismiss();
-                                }
                             }
-                        ]
+                        },
-                    };
+                        {
+                            label: "Cancel",
+                            callback: function () {
+                                $log.debug("Cancel Pressed");
+                                dialog.dismiss();
+                            }
+                        }
+                    ]
+                };
                 dialog = dialogService.showBlockingMessage(model);
 
                 if (!dialog) {
@@ -129,21 +129,21 @@ define(
              Demonstrates launching an error dialog
              */
             $scope.launchInfo = function () {
-                var dialog,
+                var dialog;
-                    model = {
+                var model = {
-                        title: "Info Dialog Example",
+                    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",
+                    severity: "info",
-                        primaryOption: {
+                    primaryOption: {
-                            label: "OK",
+                        label: "OK",
-                            callback: function () {
+                        callback: function () {
-                                $log.debug("OK Pressed");
+                            $log.debug("OK Pressed");
-                                dialog.dismiss();
+                            dialog.dismiss();
-                            }
                         }
-                    };
+                    }
+                };
 
                 dialog = dialogService.showBlockingMessage(model);
 

example/persistence/src/BrowserPersistenceProvider.js

@@ -33,13 +33,13 @@ define(
 
 
         function BrowserPersistenceProvider($q, SPACE) {
-            var spaces = SPACE ? [SPACE] : [],
+            var spaces = SPACE ? [SPACE] : [];
-                caches = {},
+            var caches = {};
-                promises = {
+            var promises = {
-                    as: function (value) {
+                as: function (value) {
-                        return $q.when(value);
+                    return $q.when(value);
-                    }
+                }
-                };
+            };
 
             spaces.forEach(function (space) {
                 caches[space] = {};

example/policy/src/ExamplePolicy.js

@@ -33,10 +33,10 @@ define(
                  * "foo."
                  */
                 allow: function (action, context) {
-                    var domainObject = (context || {}).domainObject,
+                    var domainObject = (context || {}).domainObject;
-                        model = (domainObject && domainObject.getModel()) || {},
+                    var model = (domainObject && domainObject.getModel()) || {};
-                        name = model.name || "",
+                    var name = model.name || "";
-                        metadata = action.getMetadata() || {};
+                    var metadata = action.getMetadata() || {};
                     return metadata.key !== 'remove' || name.indexOf('foo') < 0;
                 }
             };

example/profiling/src/DigestIndicator.js

@@ -34,13 +34,13 @@ define(
          * @implements {Indicator}
          */
         function DigestIndicator($interval, $rootScope) {
-            var digests = 0,
+            var digests = 0;
-                displayed = 0,
+            var displayed = 0;
-                start = Date.now();
+            var start = Date.now();
 
             function update() {
-                var now = Date.now(),
+                var now = Date.now();
-                    secs = (now - start) / 1000;
+                var secs = (now - start) / 1000;
                 displayed = Math.round(digests / secs);
                 start = now;
                 digests = 0;

index.html

@@ -34,8 +34,8 @@
     <body>
     </body>
     <script>
-        const FIVE_MINUTES = 5 * 60 * 1000;
+        const THIRTY_SECONDS = 30 * 1000;
-        const THIRTY_MINUTES = 30 * 60 * 1000;
+        const THIRTY_MINUTES = THIRTY_SECONDS * 60;
 
         [
             'example/eventGenerator'
@@ -63,7 +63,39 @@
                     bounds: {
                         start: Date.now() - THIRTY_MINUTES,
                         end: Date.now()
-                    }
+                    },
+                    // commonly used bounds can be stored in history
+                    // bounds (start and end) can accept either a milliseconds number
+                    // or a callback function returning a milliseconds number
+                    // a function is useful for invoking Date.now() at exact moment of preset selection
+                    presets: [
+                        {
+                            label: 'Last Day',
+                            bounds: {
+                                start: () => Date.now() - 1000 * 60 * 60 * 24,
+                                end: () => Date.now()
+                            }
+                        },
+                        {
+                            label: 'Last 2 hours',
+                            bounds: {
+                                start: () => Date.now() - 1000 * 60 * 60 * 2,
+                                end: () => Date.now()
+                            }
+                        },
+                        {
+                            label: 'Last hour',
+                            bounds: {
+                                start: () => Date.now() - 1000 * 60 * 60,
+                                end: () => Date.now()
+                            }
+                        }
+                    ],
+                    // maximum recent bounds to retain in conductor history
+                    records: 10,
+                    // maximum duration between start and end bounds
+                    // for utc-based time systems this is in milliseconds
+                    limit: 1000 * 60 * 60 * 24
                 },
                 {
                     name: "Realtime",
@@ -71,7 +103,7 @@
                     clock: 'local',
                     clockOffsets: {
                         start: - THIRTY_MINUTES,
-                        end: FIVE_MINUTES
+                        end: THIRTY_SECONDS
                     }
                 }
             ]
@@ -81,7 +113,10 @@
         openmct.install(openmct.plugins.LADTable());
         openmct.install(openmct.plugins.Filters(['table', 'telemetry.plot.overlay']));
         openmct.install(openmct.plugins.ObjectMigration());
-        openmct.install(openmct.plugins.ClearData(['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked']));
+        openmct.install(openmct.plugins.ClearData(
+            ['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked'],
+            {indicator: true}
+        ));
         openmct.start();
     </script>
 </html>

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' : 'ChromeHeadless'];
+const browsers = [process.env.NODE_ENV === 'debug' ? 'ChromeDebugging' : 'FirefoxHeadless'];
 const coverageEnabled = process.env.COVERAGE === 'true';
 const reporters = ['progress', 'html'];
 
@@ -95,6 +95,7 @@ module.exports = (config) => {
             stats: 'errors-only',
             logLevel: 'warn'
         },
-        singleRun: true
+        singleRun: true,
+        browserNoActivityTimeout: 90000
     });
 }

package.json

@@ -4,7 +4,7 @@
   "description": "The Open MCT core platform",
   "dependencies": {},
   "devDependencies": {
-    "angular": "1.7.9",
+    "angular": ">=1.8.0",
     "angular-route": "1.4.14",
     "babel-eslint": "8.2.6",
     "comma-separated-values": "^3.6.4",
@@ -41,6 +41,7 @@
     "jsdoc": "^3.3.2",
     "karma": "^2.0.3",
     "karma-chrome-launcher": "^2.2.0",
+    "karma-firefox-launcher": "^1.3.0",
     "karma-cli": "^1.0.1",
     "karma-coverage": "^1.1.2",
     "karma-coverage-istanbul-reporter": "^2.1.1",
@@ -59,7 +60,7 @@
     "moment-timezone": "0.5.28",
     "node-bourbon": "^4.2.3",
     "node-sass": "^4.9.2",
-    "painterro": "^0.2.65",
+    "painterro": "^1.0.35",
     "printj": "^1.2.1",
     "raw-loader": "^0.5.1",
     "request": "^2.69.0",

platform/commonUI/about/test/AboutControllerSpec.js

@@ -25,9 +25,9 @@ define(
     function (AboutController) {
 
         describe("The About controller", function () {
-            var testVersions,
+            var testVersions;
-                mockWindow,
+            var mockWindow;
-                controller;
+            var controller;
 
             beforeEach(function () {
                 testVersions = [

platform/commonUI/about/test/LicenseControllerSpec.js

@@ -25,8 +25,8 @@ define(
     function (LicenseController) {
 
         describe("The License controller", function () {
-            var testLicenses,
+            var testLicenses;
-                controller;
+            var controller;
 
             beforeEach(function () {
                 testLicenses = [

platform/commonUI/about/test/LogoControllerSpec.js

@@ -25,8 +25,8 @@ define(
     function (LogoController) {
 
         describe("The About controller", function () {
-            var mockOverlayService,
+            var mockOverlayService;
-                controller;
+            var controller;
 
             beforeEach(function () {
                 mockOverlayService = jasmine.createSpyObj(

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

@@ -30,9 +30,9 @@ define([
 ) {
 
     describe("The navigate action", function () {
-        var mockNavigationService,
+        var mockNavigationService;
-            mockDomainObject,
+        var mockDomainObject;
-            action;
+        var action;
 
         beforeEach(function () {
             mockNavigationService = jasmine.createSpyObj(

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

@@ -28,8 +28,8 @@ define(
     function (NavigationService) {
 
         describe("The navigation service", function () {
-            var $window,
+            let $window;
-                navigationService;
+            let navigationService;
 
             beforeEach(function () {
                 $window = jasmine.createSpyObj('$window', ['confirm']);
@@ -37,8 +37,8 @@ define(
             });
 
             it("stores navigation state", function () {
-                var testObject = { someKey: 42 },
+                var testObject = { someKey: 42 };
-                    otherObject = { someKey: "some value" };
+                var otherObject = { someKey: "some value" };
                 expect(navigationService.getNavigation())
                     .toBeUndefined();
                 navigationService.setNavigation(testObject);
@@ -52,8 +52,8 @@ define(
             });
 
             it("notifies listeners on change", function () {
-                var testObject = { someKey: 42 },
+                var testObject = { someKey: 42 };
-                    callback = jasmine.createSpy("callback");
+                var callback = jasmine.createSpy("callback");
 
                 navigationService.addListener(callback);
                 expect(callback).not.toHaveBeenCalled();
@@ -63,8 +63,8 @@ define(
             });
 
             it("does not notify listeners when no changes occur", function () {
-                var testObject = { someKey: 42 },
+                var testObject = { someKey: 42 };
-                    callback = jasmine.createSpy("callback");
+                var callback = jasmine.createSpy("callback");
 
                 navigationService.addListener(callback);
                 navigationService.setNavigation(testObject);
@@ -73,8 +73,8 @@ define(
             });
 
             it("stops notifying listeners after removal", function () {
-                var testObject = { someKey: 42 },
+                var testObject = { someKey: 42 };
-                    callback = jasmine.createSpy("callback");
+                var callback = jasmine.createSpy("callback");
 
                 navigationService.addListener(callback);
                 navigationService.removeListener(callback);

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

@@ -24,18 +24,18 @@ define([
     '../../src/navigation/OrphanNavigationHandler'
 ], function (OrphanNavigationHandler) {
     describe("OrphanNavigationHandler", function () {
-        var mockTopic,
+        var mockTopic;
-            mockThrottle,
+        var mockThrottle;
-            mockMutationTopic,
+        var mockMutationTopic;
-            mockNavigationService,
+        var mockNavigationService;
-            mockDomainObject,
+        var mockDomainObject;
-            mockParentObject,
+        var mockParentObject;
-            mockContext,
+        var mockContext;
-            mockActionCapability,
+        var mockActionCapability;
-            mockEditor,
+        var mockEditor;
-            testParentComposition,
+        var testParentComposition;
-            testId,
+        var testId;
-            mockThrottledFns;
+        var mockThrottledFns;
 
         beforeEach(function () {
             testId = 'some-identifier';

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

@@ -25,12 +25,12 @@ define(
     function (NewTabAction) {
 
         describe("The new tab action", function () {
-            var actionSelected,
+            var actionSelected;
-                actionCurrent,
+            var actionCurrent;
-                mockWindow,
+            var mockWindow;
-                mockContextCurrent,
+            var mockContextCurrent;
-                mockContextSelected,
+            var mockContextSelected;
-                mockUrlService;
+            var mockUrlService;
 
             beforeEach(function () {
                 mockWindow = jasmine.createSpyObj("$window", ["open", "location"]);

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

@@ -31,13 +31,13 @@
     </mct-form>
 </div>
 <div class="c-overlay__button-bar">
-    <a class='c-button c-button--major'
+    <button class='c-button c-button--major'
        ng-class="{ disabled: !createForm.$valid }"
        ng-click="ngModel.confirm()">
         OK
-    </a>
+    </button>
-    <a class='c-button  '
+    <button class='c-button  '
        ng-click="ngModel.cancel()">
         Cancel
-    </a>
+    </button>
 </div>

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

@@ -31,13 +31,13 @@
         </mct-include>
     </div>
     <div class="c-overlay__button-bar">
-        <a ng-repeat="option in ngModel.dialog.options"
+        <button 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}}
-        </a>
+        </button>
     </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-in-circle"></button>
+           class="c-click-icon c-overlay__close-button icon-x"></button>
         <div class="c-overlay__contents" ng-transclude></div>
     </div>
 </div>

platform/commonUI/dialog/src/DialogService.js

@@ -62,10 +62,10 @@ define(
         DialogService.prototype.getDialogResponse = function (key, model, resultGetter, typeClass) {
             // We will return this result as a promise, because user
             // input is asynchronous.
-            var deferred = this.$q.defer(),
+            var deferred = this.$q.defer();
-                self = this,
+            var self = this;
-                overlay,
+            var overlay;
-                handleEscKeydown;
+            var handleEscKeydown;
 
             // Confirm function; this will be passed in to the
             // overlay-dialog template and associated with a
@@ -247,12 +247,12 @@ define(
             if (this.canShowDialog(dialogModel)) {
                 // Add the overlay using the OverlayService, which
                 // will handle actual insertion into the DOM
-                var self = this,
+                var self = this;
-                    overlay = this.overlayService.createOverlay(
+                var overlay = this.overlayService.createOverlay(
-                        "overlay-blocking-message",
+                    "overlay-blocking-message",
-                        dialogModel,
+                    dialogModel,
-                        "t-dialog-sm"
+                    "t-dialog-sm"
-                    );
+                );
 
                 this.activeOverlay = overlay;
 

platform/commonUI/dialog/src/OverlayService.js

@@ -76,8 +76,8 @@ define(
          */
         OverlayService.prototype.createOverlay = function (key, overlayModel, typeClass) {
             // Create a new scope for this overlay
-            var scope = this.newScope(),
+            var scope = this.newScope();
-                element;
+            var element;
 
             // Stop showing the overlay; additionally, release the scope
             // that it uses.

platform/commonUI/dialog/test/DialogServiceSpec.js

@@ -28,14 +28,14 @@ define(
     function (DialogService) {
 
         describe("The dialog service", function () {
-            var mockOverlayService,
+            var mockOverlayService;
-                mockQ,
+            var mockQ;
-                mockLog,
+            var mockLog;
-                mockOverlay,
+            var mockOverlay;
-                mockDeferred,
+            var mockDeferred;
-                mockDocument,
+            var mockDocument;
-                mockBody,
+            var mockBody;
-                dialogService;
+            var dialogService;
 
             beforeEach(function () {
                 mockOverlayService = jasmine.createSpyObj(
@@ -188,8 +188,8 @@ define(
                 });
 
                 it("individual dialogs can be dismissed", function () {
-                    var secondDialogHandle,
+                    var secondDialogHandle;
-                        secondMockOverlay;
+                    var secondMockOverlay;
 
                     dialogHandle.dismiss();
 

platform/commonUI/dialog/test/OverlayServiceSpec.js

@@ -28,15 +28,15 @@ define(
     function (OverlayService) {
 
         describe("The overlay service", function () {
-            var mockDocument,
+            var mockDocument;
-                mockCompile,
+            var mockCompile;
-                mockRootScope,
+            var mockRootScope;
-                mockBody,
+            var mockBody;
-                mockTemplate,
+            var mockTemplate;
-                mockElement,
+            var mockElement;
-                mockScope,
+            var mockScope;
-                mockTimeout,
+            var mockTimeout;
-                overlayService;
+            var overlayService;
 
             beforeEach(function () {
                 mockDocument = jasmine.createSpyObj("$document", ["find"]);

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

@@ -86,8 +86,8 @@ define(
          *        will be performed; should contain a `domainObject` property
          */
         EditAction.appliesTo = function (context) {
-            var domainObject = (context || {}).domainObject,
+            var domainObject = (context || {}).domainObject;
-                type = domainObject && domainObject.getCapability('type');
+            var type = domainObject && domainObject.getCapability('type');
 
             // Only allow editing of types that support it and are not already
             // being edited

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

@@ -37,8 +37,8 @@ define(
         }
 
         EditAndComposeAction.prototype.perform = function () {
-            var self = this,
+            var self = this;
-                editAction = this.domainObject.getCapability('action').getActions("edit")[0];
+            var editAction = this.domainObject.getCapability('action').getActions("edit")[0];
 
             // Link these objects
             function doLink() {

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

@@ -46,9 +46,9 @@ define(
         }
 
         PropertiesAction.prototype.perform = function () {
-            var type = this.domainObject.getCapability('type'),
+            var type = this.domainObject.getCapability('type');
-                domainObject = this.domainObject,
+            var domainObject = this.domainObject;
-                dialogService = this.dialogService;
+            var dialogService = this.dialogService;
 
             // Update the domain object model based on user input
             function updateModel(userInput, dialog) {
@@ -81,9 +81,14 @@ define(
          * context.
          */
         PropertiesAction.appliesTo = function (context) {
-            var domainObject = (context || {}).domainObject,
+
-                type = domainObject && domainObject.getCapability('type'),
+            var domainObject = (context || {}).domainObject;
-                creatable = type && type.hasFeature('creation');
+            var type = domainObject && domainObject.getCapability('type');
+            var creatable = type && type.hasFeature('creation');
+
+            if (domainObject && domainObject.model && domainObject.model.locked) {
+                return false;
+            }
 
             // Only allow creatable types to be edited
             return domainObject && creatable;

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

@@ -49,9 +49,9 @@ define(
          * @memberof platform/commonUI/edit.SaveAction#
          */
         SaveAction.prototype.perform = function () {
-            var self = this,
+            var self = this;
-                domainObject = this.domainObject,
+            var domainObject = this.domainObject;
-                dialog = new SaveInProgressDialog(this.dialogService);
+            var dialog = new SaveInProgressDialog(this.dialogService);
 
             // Invoke any save behavior introduced by the editor capability;
             // this is introduced by EditableDomainObject which is

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

@@ -50,8 +50,8 @@ define(
          * @memberof platform/commonUI/edit.SaveAndStopEditingAction#
          */
         SaveAndStopEditingAction.prototype.perform = function () {
-            var domainObject = this.domainObject,
+            var domainObject = this.domainObject;
-                saveAction = new SaveAction(this.dialogService, this.notificationService, this.context);
+            var saveAction = new SaveAction(this.dialogService, this.notificationService, this.context);
 
             function closeEditor() {
                 return domainObject.getCapability("editor").finish();

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

@@ -99,11 +99,11 @@ function (
          * @private
          */
     SaveAsAction.prototype.save = function () {
-        var self = this,
+        var self = this;
-            domainObject = this.domainObject,
+        var domainObject = this.domainObject;
-            copyService = this.copyService,
+        var copyService = this.copyService;
-            dialog = new SaveInProgressDialog(this.dialogService),
+        var dialog = new SaveInProgressDialog(this.dialogService);
-            toUndirty = [];
+        var toUndirty = [];
 
         function doWizardSave(parent) {
             var wizard = self.createWizard(parent);

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

@@ -49,10 +49,10 @@ define(
          * transaction is in progress.
          */
         TransactionCapabilityDecorator.prototype.getCapabilities = function () {
-            var self = this,
+            var self = this;
-                capabilities = this.capabilityService.getCapabilities
+            var capabilities = this.capabilityService.getCapabilities
-                    .apply(this.capabilityService, arguments),
+                .apply(this.capabilityService, arguments);
-                persistenceCapability = capabilities.persistence;
+            var persistenceCapability = capabilities.persistence;
 
             capabilities.persistence = function (domainObject) {
                 var original =

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

@@ -29,8 +29,8 @@ define(
     function () {
 
         function cancelEditing(domainObject) {
-            var navigatedObject = domainObject,
+            var navigatedObject = domainObject;
-                editorCapability = navigatedObject &&
+            var editorCapability = navigatedObject &&
                     navigatedObject.getCapability("editor");
 
             return editorCapability &&

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

@@ -34,12 +34,12 @@ define(
 
             // Update root object based on represented object
             function updateRoot(domainObject) {
-                var root = self.rootDomainObject,
+                var root = self.rootDomainObject;
-                    context = domainObject &&
+                var context = domainObject &&
-                        domainObject.getCapability('context'),
+                        domainObject.getCapability('context');
-                    newRoot = context && context.getTrueRoot(),
+                var newRoot = context && context.getTrueRoot();
-                    oldId = root && root.getId(),
+                var oldId = root && root.getId();
-                    newId = newRoot && newRoot.getId();
+                var newId = newRoot && newRoot.getId();
 
                 // Only update if this has actually changed,
                 // to avoid excessive refreshing.

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

@@ -63,9 +63,9 @@ define(
          * This will prompt for user input first.
          */
         CreateAction.prototype.perform = function () {
-            var newModel = this.type.getInitialModel(),
+            var newModel = this.type.getInitialModel();
-                openmct = this.openmct,
+            var openmct = this.openmct;
-                newObject;
+            var newObject;
 
             function onCancel() {
                 openmct.editor.cancel();
@@ -78,13 +78,13 @@ define(
             }
 
             function navigateAndEdit(object) {
-                let objectPath = object.getCapability('context').getPath(),
+                let objectPath = object.getCapability('context').getPath();
-                    url = '#/browse/' + objectPath
+                let url = '#/browse/' + objectPath
-                        .slice(1)
+                    .slice(1)
-                        .map(function (o) {
+                    .map(function (o) {
-                            return o && openmct.objects.makeKeyString(o.getId());
+                        return o && openmct.objects.makeKeyString(o.getId());
-                        })
+                    })
-                        .join('/');
+                    .join('/');
 
                 window.location.href = url;
 

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

@@ -50,10 +50,10 @@ define(
         }
 
         CreateActionProvider.prototype.getActions = function (actionContext) {
-            var context = actionContext || {},
+            var context = actionContext || {};
-                key = context.key,
+            var key = context.key;
-                destination = context.domainObject,
+            var destination = context.domainObject;
-                self = this;
+            var self = this;
 
             // We only provide Create actions, and we need a
             // domain object to serve as the container for the

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

@@ -55,8 +55,8 @@ define(
          *         show in the create dialog
          */
         CreateWizard.prototype.getFormStructure = function (includeLocation) {
-            var sections = [],
+            var sections = [];
-                domainObject = this.domainObject;
+            var domainObject = this.domainObject;
 
             function validateLocation(parent) {
                 return parent && this.openmct.composition.checkPolicy(parent.useCapability('adapter'), domainObject.useCapability('adapter'));
@@ -107,8 +107,8 @@ define(
          * @returns {DomainObject}
          */
         CreateWizard.prototype.populateObjectFromInput = function (formValue) {
-            var parent = this.getLocation(formValue),
+            var parent = this.getLocation(formValue);
-                formModel = this.createModel(formValue);
+            var formModel = this.createModel(formValue);
 
             formModel.location = parent.getId();
             this.domainObject.useCapability("mutation", function () {
@@ -126,10 +126,10 @@ define(
          */
         CreateWizard.prototype.getInitialFormValue = function () {
             // Start with initial values for properties
-            var model = this.model,
+            var model = this.model;
-                formValue = this.properties.map(function (property) {
+            var formValue = this.properties.map(function (property) {
-                    return property.getValue(model);
+                return property.getValue(model);
-                });
+            });
 
             // Include the createParent
             formValue.createParent = this.parent;

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

@@ -63,17 +63,17 @@ define(
          *         object has been created
          */
         CreationService.prototype.createObject = function (model, parent) {
-            var persistence = parent.getCapability("persistence"),
+            var persistence = parent.getCapability("persistence");
-                newObject = parent.useCapability("instantiation", model),
+            var newObject = parent.useCapability("instantiation", model);
-                newObjectPersistence = newObject.getCapability("persistence"),
+            var newObjectPersistence = newObject.getCapability("persistence");
-                self = this;
+            var self = this;
 
             // Add the newly-created object's id to the parent's
             // composition, so that it will subsequently appear
             // as a child contained by that parent.
             function addToComposition() {
-                var compositionCapability = parent.getCapability('composition'),
+                var compositionCapability = parent.getCapability('composition');
-                    addResult = compositionCapability &&
+                var addResult = compositionCapability &&
                         compositionCapability.add(newObject);
 
                 return self.$q.when(addResult).then(function (result) {

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

@@ -39,8 +39,8 @@ define(
             //              used for bi-directional object selection.
             function setLocatingObject(domainObject, priorObject) {
                 var context = domainObject &&
-                    domainObject.getCapability("context"),
+                    domainObject.getCapability("context");
-                    contextRoot = context && context.getRoot();
+                var contextRoot = context && context.getRoot();
 
                 if (contextRoot && contextRoot !== $scope.rootObject) {
                     $scope.rootObject = undefined;

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

@@ -36,8 +36,6 @@ define(
         }
 
         EditPersistableObjectsPolicy.prototype.allow = function (action, context) {
-            var identifier;
-            var provider;
             var domainObject = context.domainObject;
             var key = action.getMetadata().key;
             var category = (context || {}).category;
@@ -46,9 +44,8 @@ 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') {
-                identifier = objectUtils.parseKeyString(domainObject.getId());
+                let newStyleObject = objectUtils.toNewFormat(domainObject, 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

@@ -58,9 +58,9 @@ define(
          * @param {String} message a message to log with the commit message.
          */
         EditRepresenter.prototype.commit = function (message) {
-            var model = this.$scope.model,
+            var model = this.$scope.model;
-                configuration = this.$scope.configuration,
+            var configuration = this.$scope.configuration;
-                domainObject = this.domainObject;
+            var domainObject = this.domainObject;
 
             this.$log.debug([
                 "Committing ",

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

@@ -25,12 +25,12 @@ define(
     function (CancelAction) {
 
         describe("The Cancel action", function () {
-            var mockDomainObject,
+            var mockDomainObject;
-                mockParentObject,
+            var mockParentObject;
-                capabilities = {},
+            var capabilities = {};
-                parentCapabilities = {},
+            var parentCapabilities = {};
-                actionContext,
+            var actionContext;
-                action;
+            var action;
 
             function mockPromise(value) {
                 return {

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

@@ -25,15 +25,15 @@ define(
     function (EditAction) {
 
         describe("The Edit action", function () {
-            var mockLocation,
+            var mockLocation;
-                mockNavigationService,
+            var mockNavigationService;
-                mockLog,
+            var mockLog;
-                mockDomainObject,
+            var mockDomainObject;
-                mockType,
+            var mockType;
-                mockEditor,
+            var mockEditor;
-                actionContext,
+            var actionContext;
-                capabilities,
+            var capabilities;
-                action;
+            var action;
 
             beforeEach(function () {
                 mockLocation = jasmine.createSpyObj(

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

@@ -25,17 +25,17 @@ define(
     function (EditAndComposeAction) {
 
         describe("The Link action", function () {
-            var mockDomainObject,
+            var mockDomainObject;
-                mockParent,
+            var mockParent;
-                mockContext,
+            var mockContext;
-                mockComposition,
+            var mockComposition;
-                mockActionCapability,
+            var mockActionCapability;
-                mockEditAction,
+            var mockEditAction;
-                mockType,
+            var mockType;
-                actionContext,
+            var actionContext;
-                model,
+            var model;
-                capabilities,
+            var capabilities;
-                action;
+            var action;
 
             function mockPromise(value) {
                 return {

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

@@ -25,7 +25,13 @@ define(
     function (PropertiesAction) {
 
         describe("Properties action", function () {
-            var capabilities, model, object, context, input, dialogService, action;
+            var capabilities;
+            var model;
+            var object;
+            var context;
+            var input;
+            var dialogService;
+            var action;
 
             function mockPromise(value) {
                 return {

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

@@ -26,7 +26,10 @@ define(
 
         describe("Properties dialog", function () {
 
-            var type, properties, model, dialog;
+            var type;
+            var properties;
+            var model;
+            var dialog;
 
             beforeEach(function () {
                 type = {

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

@@ -26,14 +26,14 @@ define(
     function (SaveAction) {
 
         describe("The Save action", function () {
-            var mockDomainObject,
+            var mockDomainObject;
-                mockEditorCapability,
+            var mockEditorCapability;
-                actionContext,
+            var actionContext;
-                mockDialogService,
+            var mockDialogService;
-                mockNotificationService,
+            var mockNotificationService;
-                mockActionCapability,
+            var mockActionCapability;
-                capabilities = {},
+            var capabilities = {};
-                action;
+            var action;
 
             function mockPromise(value) {
                 return {

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

@@ -32,14 +32,14 @@ define(
             // depends on is not mocked, so we mock some
             // of SaveAction's own dependencies to make
             // it run.
-            var mockDomainObject,
+            var mockDomainObject;
-                mockEditorCapability,
+            var mockEditorCapability;
-                actionContext,
+            var actionContext;
-                dialogService,
+            var dialogService;
-                notificationService,
+            var notificationService;
-                mockActionCapability,
+            var mockActionCapability;
-                capabilities = {},
+            var capabilities = {};
-                action;
+            var action;
 
             function mockPromise(value) {
                 return {

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

@@ -26,18 +26,18 @@ define(
     function (SaveAsAction) {
 
         xdescribe("The Save As action", function () {
-            var mockDomainObject,
+            var mockDomainObject;
-                mockClonedObject,
+            var mockClonedObject;
-                mockEditorCapability,
+            var mockEditorCapability;
-                mockActionCapability,
+            var mockActionCapability;
-                mockObjectService,
+            var mockObjectService;
-                mockDialogService,
+            var mockDialogService;
-                mockCopyService,
+            var mockCopyService;
-                mockNotificationService,
+            var mockNotificationService;
-                mockParent,
+            var mockParent;
-                actionContext,
+            var actionContext;
-                capabilities = {},
+            var capabilities = {};
-                action;
+            var action;
 
             function noop() {}
 

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

@@ -25,14 +25,14 @@ define(
     function (EditorCapability) {
 
         xdescribe("The editor capability", function () {
-            var mockDomainObject,
+            var mockDomainObject;
-                capabilities,
+            var capabilities;
-                mockParentObject,
+            var mockParentObject;
-                mockTransactionService,
+            var mockTransactionService;
-                mockStatusCapability,
+            var mockStatusCapability;
-                mockParentStatus,
+            var mockParentStatus;
-                mockContextCapability,
+            var mockContextCapability;
-                capability;
+            var capability;
 
             function fastPromise(val) {
                 return {

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

@@ -28,10 +28,10 @@ define(
     function (TransactionalPersistenceCapability, TransactionCapabilityDecorator) {
 
         describe("The transaction capability decorator", function () {
-            var mockQ,
+            var mockQ;
-                mockTransactionService,
+            var mockTransactionService;
-                mockCapabilityService,
+            var mockCapabilityService;
-                provider;
+            var provider;
 
             beforeEach(function () {
                 mockQ = {};

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

@@ -36,12 +36,12 @@ define(
         }
 
         describe("The transactional persistence decorator", function () {
-            var mockQ,
+            var mockQ;
-                mockTransactionManager,
+            var mockTransactionManager;
-                mockPersistence,
+            var mockPersistence;
-                mockDomainObject,
+            var mockDomainObject;
-                testId,
+            var testId;
-                capability;
+            var capability;
 
             beforeEach(function () {
                 testId = "test-id";

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

@@ -48,9 +48,9 @@ define(
                 }
             }
 
-            var mockScope,
+            var mockScope;
-                mockActions,
+            var mockActions;
-                controller;
+            var controller;
 
             beforeEach(function () {
                 mockActions = jasmine.createSpyObj("action", ["getActions"]);

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

@@ -25,16 +25,16 @@ define(
     function (EditObjectController) {
 
         describe("The Edit Object controller", function () {
-            var mockScope,
+            var mockScope;
-                mockObject,
+            var mockObject;
-                testViews,
+            var testViews;
-                mockEditorCapability,
+            var mockEditorCapability;
-                mockLocation,
+            var mockLocation;
-                mockNavigationService,
+            var mockNavigationService;
-                removeCheck,
+            var removeCheck;
-                mockStatusCapability,
+            var mockStatusCapability;
-                mockCapabilities,
+            var mockCapabilities;
-                controller;
+            var controller;
 
             beforeEach(function () {
                 mockScope = jasmine.createSpyObj(

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

@@ -25,10 +25,10 @@ define(
     function (EditPanesController) {
 
         describe("The Edit Panes controller", function () {
-            var mockScope,
+            var mockScope;
-                mockDomainObject,
+            var mockDomainObject;
-                mockContext,
+            var mockContext;
-                controller;
+            var controller;
 
             beforeEach(function () {
                 mockScope = jasmine.createSpyObj("$scope", ["$watch"]);

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

@@ -28,12 +28,12 @@ define(
     function (CreateActionProvider) {
 
         describe("The create action provider", function () {
-            var mockTypeService,
+            var mockTypeService;
-                mockPolicyService,
+            var mockPolicyService;
-                mockCreationPolicy,
+            var mockCreationPolicy;
-                mockPolicyMap = {},
+            var mockPolicyMap = {};
-                mockTypes,
+            var mockTypes;
-                provider;
+            var provider;
 
             function createMockType(name) {
                 var mockType = jasmine.createSpyObj(

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

@@ -28,13 +28,13 @@ define(
     function (CreateAction) {
 
         xdescribe("The create action", function () {
-            var mockType,
+            var mockType;
-                mockParent,
+            var mockParent;
-                mockContext,
+            var mockContext;
-                mockDomainObject,
+            var mockDomainObject;
-                capabilities = {},
+            var capabilities = {};
-                mockEditAction,
+            var mockEditAction;
-                action;
+            var action;
 
             function mockPromise(value) {
                 return {

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

@@ -28,9 +28,9 @@ define(
     function (CreateMenuController) {
 
         describe("The create menu controller", function () {
-            var mockScope,
+            var mockScope;
-                mockActions,
+            var mockActions;
-                controller;
+            var controller;
 
             beforeEach(function () {
                 mockActions = jasmine.createSpyObj("action", ["getActions"]);

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

@@ -28,13 +28,13 @@ define(
     function (CreateWizard) {
 
         xdescribe("The create wizard", function () {
-            var mockType,
+            var mockType;
-                mockParent,
+            var mockParent;
-                mockProperties,
+            var mockProperties;
-                mockPolicyService,
+            var mockPolicyService;
-                testModel,
+            var testModel;
-                mockDomainObject,
+            var mockDomainObject;
-                wizard;
+            var wizard;
 
             function createMockProperty(name) {
                 var mockProperty = jasmine.createSpyObj(
@@ -142,11 +142,11 @@ define(
 
             it("populates the model on the associated object", function () {
                 var formValue = {
-                        "A": "ValueA",
+                    "A": "ValueA",
-                        "B": "ValueB",
+                    "B": "ValueB",
-                        "C": "ValueC"
+                    "C": "ValueC"
-                    },
+                };
-                    compareModel = wizard.createModel(formValue);
+                var compareModel = wizard.createModel(formValue);
                 //populateObjectFromInput adds a .location attribute that is not added by createModel.
                 compareModel.location = undefined;
                 wizard.populateObjectFromInput(formValue);
@@ -156,19 +156,19 @@ define(
 
             it("validates selection types using policy", function () {
                 var mockDomainObj = jasmine.createSpyObj(
-                        'domainObject',
+                    'domainObject',
-                        ['getCapability']
+                    ['getCapability']
-                    ),
+                );
-                    mockOtherType = jasmine.createSpyObj(
+                var mockOtherType = jasmine.createSpyObj(
-                        'otherType',
+                    'otherType',
-                        ['getKey']
+                    ['getKey']
-                    ),
+                );
 
-                    //Create a form structure with location
+                //Create a form structure with location
-                    structure = wizard.getFormStructure(true),
+                var structure = wizard.getFormStructure(true);
-                    sections = structure.sections,
+                var sections = structure.sections;
-                    rows = structure.sections[sections.length - 1].rows,
+                var rows = structure.sections[sections.length - 1].rows;
-                    locationRow = rows[rows.length - 1];
+                var locationRow = rows[rows.length - 1];
 
                 mockDomainObj.getCapability.and.returnValue(mockOtherType);
                 locationRow.validate(mockDomainObj);

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

@@ -25,8 +25,8 @@ define(
     function (CreationPolicy) {
 
         describe("The creation policy", function () {
-            var mockType,
+            var mockType;
-                policy;
+            var policy;
 
             beforeEach(function () {
                 mockType = jasmine.createSpyObj(

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

@@ -28,18 +28,18 @@ define(
     function (CreationService) {
 
         describe("The creation service", function () {
-            var mockQ,
+            var mockQ;
-                mockLog,
+            var mockLog;
-                mockParentObject,
+            var mockParentObject;
-                mockNewObject,
+            var mockNewObject;
-                mockMutationCapability,
+            var mockMutationCapability;
-                mockPersistenceCapability,
+            var mockPersistenceCapability;
-                mockCompositionCapability,
+            var mockCompositionCapability;
-                mockContextCapability,
+            var mockContextCapability;
-                mockCreationCapability,
+            var mockCreationCapability;
-                mockCapabilities,
+            var mockCapabilities;
-                mockNewPersistenceCapability,
+            var mockNewPersistenceCapability;
-                creationService;
+            var creationService;
 
             function mockPromise(value) {
                 return (value && value.then) ? value : {
@@ -157,10 +157,10 @@ define(
 
             it("provides the newly-created object", function () {
                 var mockDomainObject = jasmine.createSpyObj(
-                        'newDomainObject',
+                    'newDomainObject',
-                        ['getId', 'getModel', 'getCapability']
+                    ['getId', 'getModel', 'getCapability']
-                    ),
+                );
-                    mockCallback = jasmine.createSpy('callback');
+                var mockCallback = jasmine.createSpy('callback');
 
                 // Act as if the object had been created
                 mockCompositionCapability.add.and.callFake(function (id) {
@@ -180,8 +180,8 @@ define(
 
             it("warns if parent has no persistence capability", function () {
                 // Callbacks
-                var success = jasmine.createSpy("success"),
+                var success = jasmine.createSpy("success");
-                    failure = jasmine.createSpy("failure");
+                var failure = jasmine.createSpy("failure");
 
                 mockCapabilities.persistence = undefined;
                 creationService.createObject({}, mockParentObject).then(

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

@@ -28,14 +28,14 @@ define(
     function (LocatorController) {
 
         describe("The locator controller", function () {
-            var mockScope,
+            var mockScope;
-                mockTimeout,
+            var mockTimeout;
-                mockDomainObject,
+            var mockDomainObject;
-                mockRootObject,
+            var mockRootObject;
-                mockContext,
+            var mockContext;
-                mockObjectService,
+            var mockObjectService;
-                getObjectsPromise,
+            var getObjectsPromise;
-                controller;
+            var controller;
 
             beforeEach(function () {
                 mockScope = jasmine.createSpyObj(

platform/commonUI/edit/test/policies/EditPersistableObjectsSpec.js

@@ -25,14 +25,14 @@ define(
     function (EditPersistableObjectsPolicy) {
 
         describe("The Edit persistable objects policy", function () {
-            var mockDomainObject,
+            var mockDomainObject;
-                mockEditAction,
+            var mockEditAction;
-                mockPropertiesAction,
+            var mockPropertiesAction;
-                mockOtherAction,
+            var mockOtherAction;
-                mockAPI,
+            var mockAPI;
-                mockObjectAPI,
+            var mockObjectAPI;
-                testContext,
+            var testContext;
-                policy;
+            var policy;
 
             beforeEach(function () {
                 mockDomainObject = jasmine.createSpyObj(
@@ -43,7 +43,7 @@ define(
                 );
 
                 mockObjectAPI = jasmine.createSpyObj('objectAPI', [
-                    'getProvider'
+                    'isPersistable'
                 ]);
 
                 mockAPI = {
@@ -69,34 +69,31 @@ define(
             });
 
             it("Applies to edit action", function () {
-                mockObjectAPI.getProvider.and.returnValue({});
+                expect(mockObjectAPI.isPersistable).not.toHaveBeenCalled();
-                expect(mockObjectAPI.getProvider).not.toHaveBeenCalled();
 
                 policy.allow(mockEditAction, testContext);
-                expect(mockObjectAPI.getProvider).toHaveBeenCalled();
+                expect(mockObjectAPI.isPersistable).toHaveBeenCalled();
             });
 
             it("Applies to properties action", function () {
-                mockObjectAPI.getProvider.and.returnValue({});
+                expect(mockObjectAPI.isPersistable).not.toHaveBeenCalled();
-                expect(mockObjectAPI.getProvider).not.toHaveBeenCalled();
 
                 policy.allow(mockPropertiesAction, testContext);
-                expect(mockObjectAPI.getProvider).toHaveBeenCalled();
+                expect(mockObjectAPI.isPersistable).toHaveBeenCalled();
             });
 
             it("does not apply to other actions", function () {
-                mockObjectAPI.getProvider.and.returnValue({});
+                expect(mockObjectAPI.isPersistable).not.toHaveBeenCalled();
-                expect(mockObjectAPI.getProvider).not.toHaveBeenCalled();
 
                 policy.allow(mockOtherAction, testContext);
-                expect(mockObjectAPI.getProvider).not.toHaveBeenCalled();
+                expect(mockObjectAPI.isPersistable).not.toHaveBeenCalled();
             });
 
             it("Tests object provider for editability", function () {
-                mockObjectAPI.getProvider.and.returnValue({});
+                mockObjectAPI.isPersistable.and.returnValue(false);
                 expect(policy.allow(mockEditAction, testContext)).toBe(false);
-                expect(mockObjectAPI.getProvider).toHaveBeenCalled();
+                expect(mockObjectAPI.isPersistable).toHaveBeenCalled();
-                mockObjectAPI.getProvider.and.returnValue({save: function () {}});
+                mockObjectAPI.isPersistable.and.returnValue(true);
                 expect(policy.allow(mockEditAction, testContext)).toBe(true);
             });
         });

platform/commonUI/edit/test/representers/EditRepresenterSpec.js

@@ -26,9 +26,9 @@ define([
     EditRepresenter
 ) {
     describe('EditRepresenter', function () {
-        var $log,
+        var $log;
-            $scope,
+        var $scope;
-            representer;
+        var representer;
 
 
         beforeEach(function () {
@@ -42,8 +42,8 @@ define([
         });
 
         describe('representation', function () {
-            var domainObject,
+            var domainObject;
-                representation;
+            var representation;
 
             beforeEach(function () {
                 domainObject = jasmine.createSpyObj('domainObject', [

platform/commonUI/edit/test/services/NestedTransactionSpec.js

@@ -25,8 +25,8 @@ define(["../../src/services/NestedTransaction"], function (NestedTransaction) {
     var TRANSACTION_METHODS = ['add', 'commit', 'cancel', 'size'];
 
     describe("A NestedTransaction", function () {
-        var mockTransaction,
+        var mockTransaction;
-            nestedTransaction;
+        var nestedTransaction;
 
         beforeEach(function () {
             mockTransaction =
@@ -42,8 +42,8 @@ define(["../../src/services/NestedTransaction"], function (NestedTransaction) {
         });
 
         describe("when callbacks are added", function () {
-            var mockCommit,
+            var mockCommit;
-                mockCancel;
+            var mockCancel;
 
             beforeEach(function () {
                 mockCommit = jasmine.createSpy('commit');

platform/commonUI/edit/test/services/TransactionManagerSpec.js

@@ -25,13 +25,13 @@ define(
     ["../../src/services/TransactionManager"],
     function (TransactionManager) {
         describe("TransactionManager", function () {
-            var mockTransactionService,
+            var mockTransactionService;
-                testId,
+            var testId;
-                mockOnCommit,
+            var mockOnCommit;
-                mockOnCancel,
+            var mockOnCancel;
-                mockRemoves,
+            var mockRemoves;
-                mockPromise,
+            var mockPromise;
-                manager;
+            var manager;
 
             beforeEach(function () {
                 mockRemoves = [];

platform/commonUI/edit/test/services/TransactionServiceSpec.js

@@ -26,9 +26,9 @@ define(
     function (TransactionService) {
 
         describe("The Transaction Service", function () {
-            var mockQ,
+            var mockQ;
-                mockLog,
+            var mockLog;
-                transactionService;
+            var transactionService;
 
             function fastPromise(val) {
                 return {
@@ -52,8 +52,8 @@ define(
             });
 
             it("addToTransaction queues onCommit and onCancel functions", function () {
-                var onCommit = jasmine.createSpy('onCommit'),
+                var onCommit = jasmine.createSpy('onCommit');
-                    onCancel = jasmine.createSpy('onCancel');
+                var onCancel = jasmine.createSpy('onCancel');
 
                 transactionService.startTransaction();
                 transactionService.addToTransaction(onCommit, onCancel);
@@ -61,8 +61,8 @@ define(
             });
 
             it("size function returns size of commit and cancel queues", function () {
-                var onCommit = jasmine.createSpy('onCommit'),
+                var onCommit = jasmine.createSpy('onCommit');
-                    onCancel = jasmine.createSpy('onCancel');
+                var onCancel = jasmine.createSpy('onCancel');
 
                 transactionService.startTransaction();
                 transactionService.addToTransaction(onCommit, onCancel);

platform/commonUI/edit/test/services/TransactionSpec.js

@@ -26,8 +26,8 @@ define(
     function (Transaction) {
 
         describe("A Transaction", function () {
-            var mockLog,
+            var mockLog;
-                transaction;
+            var transaction;
 
             beforeEach(function () {
                 mockLog = jasmine.createSpyObj(
@@ -42,9 +42,9 @@ define(
             });
 
             describe("when callbacks are added", function () {
-                var mockCommit,
+                var mockCommit;
-                    mockCancel,
+                var mockCancel;
-                    remove;
+                var remove;
 
                 beforeEach(function () {
                     mockCommit = jasmine.createSpy('commit');

platform/commonUI/formats/src/DurationFormat.js

@@ -26,10 +26,10 @@ define([
     moment
 ) {
 
-    var DATE_FORMAT = "HH:mm:ss",
+    var DATE_FORMAT = "HH:mm:ss";
-        DATE_FORMATS = [
+    var DATE_FORMATS = [
-            DATE_FORMAT
+        DATE_FORMAT
-        ];
+    ];
 
 
     /**

platform/commonUI/formats/src/UTCTimeFormat.js

@@ -26,14 +26,14 @@ define([
     moment
 ) {
 
-    var DATE_FORMAT = "YYYY-MM-DD HH:mm:ss.SSS",
+    var DATE_FORMAT = "YYYY-MM-DD HH:mm:ss.SSS";
-        DATE_FORMATS = [
+    var DATE_FORMATS = [
-            DATE_FORMAT,
+        DATE_FORMAT,
-            DATE_FORMAT + "Z",
+        DATE_FORMAT + "Z",
-            "YYYY-MM-DD HH:mm:ss",
+        "YYYY-MM-DD HH:mm:ss",
-            "YYYY-MM-DD HH:mm",
+        "YYYY-MM-DD HH:mm",
-            "YYYY-MM-DD"
+        "YYYY-MM-DD"
-        ];
+    ];
 
     /**
      * @typedef Scale

platform/commonUI/formats/test/FormatProviderSpec.js

@@ -27,9 +27,9 @@ define(
         var KEYS = ['a', 'b', 'c'];
 
         describe("The FormatProvider", function () {
-            var mockFormats,
+            var mockFormats;
-                mockFormatInstances,
+            var mockFormatInstances;
-                provider;
+            var provider;
 
             beforeEach(function () {
                 mockFormatInstances = KEYS.map(function (k) {

platform/commonUI/general/res/templates/label.html

@@ -19,7 +19,13 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div class="c-object-label">
+<div class="c-object-label"
-    <div class="c-object-label__type-icon {{type.getCssClass()}}" ng-class="{ 'l-icon-link':location.isLink() }"></div>
+     ng-class="{ 'is-missing': model.status === 'missing' }"
+>
+    <div class="c-object-label__type-icon {{type.getCssClass()}}"
+         ng-class="{ 'l-icon-link':location.isLink() }"
+    >
+        <span class="is-missing__indicator" title="This item is missing"></span>
+    </div>
     <div class='c-object-label__name'>{{model.name}}</div>
 </div>

platform/commonUI/general/src/StyleSheetLoader.js

@@ -41,19 +41,19 @@ define(
          *        stylesheets will be found
          */
         function StyleSheetLoader(stylesheets, $document, activeTheme, assetPath) {
-            var head = $document.find('head'),
+            var head = $document.find('head');
-                document = $document[0];
+            var document = $document[0];
 
             // Procedure for adding a single stylesheet
             function addStyleSheet(stylesheet) {
                 // Create a link element, and construct full path
-                var link = document.createElement('link'),
+                var link = document.createElement('link');
-                    path = [
+                var path = [
-                        assetPath,
+                    assetPath,
-                        stylesheet.bundle.path,
+                    stylesheet.bundle.path,
-                        stylesheet.bundle.resources,
+                    stylesheet.bundle.resources,
-                        stylesheet.stylesheetUrl
+                    stylesheet.stylesheetUrl
-                    ].join("/");
+                ].join("/");
 
                 // Initialize attributes on the link
                 link.setAttribute("rel", "stylesheet");

platform/commonUI/general/src/controllers/ActionGroupController.js

@@ -48,12 +48,12 @@ define(
             // Separate out the actions that have been retrieved
             // into groups, and populate scope with this.
             function groupActions(actions) {
-                var groups = {},
+                var groups = {};
-                    ungrouped = [];
+                var ungrouped = [];
 
                 function assignToGroup(action) {
-                    var metadata = action.getMetadata(),
+                    var metadata = action.getMetadata();
-                        group = metadata.group;
+                    var group = metadata.group;
                     if (group) {
                         groups[group] = groups[group] || [];
                         groups[group].push(action);
@@ -73,9 +73,9 @@ define(
             // Callback for when state which might influence action groupings
             // changes.
             function updateGroups() {
-                var actionCapability = $scope.action,
+                var actionCapability = $scope.action;
-                    params = $scope.parameters || {},
+                var params = $scope.parameters || {};
-                    category = params.category;
+                var category = params.category;
 
                 if (actionCapability && category) {
                     // Get actions by capability, and group them

platform/commonUI/general/src/controllers/DateTimePickerController.js

@@ -25,22 +25,22 @@ define(
     function (moment) {
 
         var TIME_NAMES = {
-                'hours': "Hour",
+            'hours': "Hour",
-                'minutes': "Minute",
+            'minutes': "Minute",
-                'seconds': "Second"
+            'seconds': "Second"
-            },
+        };
-            MONTHS = moment.months(),
+        var MONTHS = moment.months();
-            TIME_OPTIONS = (function makeRanges() {
+        var TIME_OPTIONS = (function makeRanges() {
-                var arr = [];
+            var arr = [];
-                while (arr.length < 60) {
+            while (arr.length < 60) {
-                    arr.push(arr.length);
+                arr.push(arr.length);
-                }
+            }
-                return {
+            return {
-                    hours: arr.slice(0, 24),
+                hours: arr.slice(0, 24),
-                    minutes: arr,
+                minutes: arr,
-                    seconds: arr
+                seconds: arr
-                };
+            };
-            }());
+        }());
 
         /**
          * Controller to support the date-time picker.
@@ -65,15 +65,15 @@ define(
          * Months are zero-indexed, day-of-months are one-indexed.
          */
         function DateTimePickerController($scope, now) {
-            var year,
+            var year;
-                month, // For picker state, not model state
+            var month; // For picker state, not model state
-                interacted = false;
+            var interacted = false;
 
             function generateTable() {
-                var m = moment.utc({ year: year, month: month }).day(0),
+                var m = moment.utc({ year: year, month: month }).day(0);
-                    table = [],
+                var table = [];
-                    row,
+                var row;
-                    col;
+                var col;
 
                 for (row = 0; row < 6; row += 1) {
                     table.push([]);

platform/commonUI/general/src/controllers/ObjectInspectorController.js

@@ -40,9 +40,9 @@ define(
 
             // Gets an array of the contextual parents/ancestors of the selected object
             function getContextualPath() {
-                var currentObj = $scope.domainObject,
+                var currentObj = $scope.domainObject;
-                    currentParent,
+                var currentParent;
-                    parents = [];
+                var parents = [];
 
                 currentParent = currentObj &&
                     currentObj.hasCapability('context') &&

platform/commonUI/general/src/controllers/SelectorController.js

@@ -35,10 +35,10 @@ define(
          * @param $scope Angular scope for this controller
          */
         function SelectorController(objectService, $scope) {
-            var treeModel = {},
+            var treeModel = {};
-                listModel = {},
+            var listModel = {};
-                previousSelected,
+            var previousSelected;
-                self = this;
+            var self = this;
 
             // For watch; look at the user's selection in the tree
             function getTreeSelection() {
@@ -126,8 +126,8 @@ define(
          * @param {DomainObject} the domain object to select
          */
         SelectorController.prototype.select = function (domainObject) {
-            var id = domainObject && domainObject.getId(),
+            var id = domainObject && domainObject.getId();
-                list = this.getField() || [];
+            var list = this.getField() || [];
             // Only select if we have a valid id,
             // and it isn't already selected
             if (id && list.indexOf(id) === -1) {
@@ -140,8 +140,8 @@ define(
          * @param {DomainObject} the domain object to select
          */
         SelectorController.prototype.deselect = function (domainObject) {
-            var id = domainObject && domainObject.getId(),
+            var id = domainObject && domainObject.getId();
-                list = this.getField() || [];
+            var list = this.getField() || [];
             // Only change if this was a valid id,
             // for an object which was already selected
             if (id && list.indexOf(id) !== -1) {

platform/commonUI/general/src/controllers/TimeRangeController.js

@@ -101,7 +101,12 @@ define([
     };
 
     TimeRangeController.prototype.updateTicks = function () {
-        var i, p, ts, start, end, span;
+        var i;
+        var p;
+        var ts;
+        var start;
+        var end;
+        var span;
         end = this.$scope.ngModel.outer.end;
         start = this.$scope.ngModel.outer.start;
         span = end - start;
@@ -197,9 +202,9 @@ define([
     };
 
     TimeRangeController.prototype.middleDrag = function (pixels) {
-        var delta = this.toMillis(pixels),
+        var delta = this.toMillis(pixels);
-            edge = delta < 0 ? 'start' : 'end',
+        var edge = delta < 0 ? 'start' : 'end';
-            opposite = delta < 0 ? 'end' : 'start';
+        var opposite = delta < 0 ? 'end' : 'start';
 
         // Adjust the position of the edge in the direction of drag
         this.$scope.ngModel.inner[edge] = clamp(

platform/commonUI/general/src/controllers/TreeNodeController.js

@@ -59,8 +59,8 @@ define(
          * @constructor
          */
         function TreeNodeController($scope, $timeout) {
-            var self = this,
+            var self = this;
-                selectedObject = ($scope.ngModel || {}).selectedObject;
+            var selectedObject = ($scope.ngModel || {}).selectedObject;
 
             // Look up the id for a domain object. A convenience
             // for mapping; additionally does some undefined-checking.
@@ -86,14 +86,14 @@ define(
             // Consider the currently-navigated object and update
             // parameters which support display.
             function checkSelection() {
-                var nodeObject = $scope.domainObject,
+                var nodeObject = $scope.domainObject;
-                    navObject = selectedObject,
+                var navObject = selectedObject;
-                    nodeContext = nodeObject &&
+                var nodeContext = nodeObject &&
-                        nodeObject.getCapability('context'),
+                        nodeObject.getCapability('context');
-                    navContext = navObject &&
+                var navContext = navObject &&
-                        navObject.getCapability('context'),
+                        navObject.getCapability('context');
-                    nodePath,
+                var nodePath;
-                    navPath;
+                var navPath;
 
                 // Deselect; we will reselect below, iff we are
                 // exactly at the end of the path.

platform/commonUI/general/src/directives/MCTClickElsewhere.js

@@ -42,13 +42,13 @@ define(
                 var body = $document.find('body');
 
                 function clickBody(event) {
-                    var x = event.clientX,
+                    var x = event.clientX;
-                        y = event.clientY,
+                    var y = event.clientY;
-                        rect = element[0].getBoundingClientRect(),
+                    var rect = element[0].getBoundingClientRect();
-                        xMin = rect.left,
+                    var xMin = rect.left;
-                        xMax = xMin + rect.width,
+                    var xMax = xMin + rect.width;
-                        yMin = rect.top,
+                    var yMin = rect.top;
-                        yMax = yMin + rect.height;
+                    var yMax = yMin + rect.height;
 
                     if (x < xMin || x > xMax || y < yMin || y > yMax) {
                         scope.$apply(function () {

platform/commonUI/general/src/directives/MCTContainer.js

@@ -62,10 +62,10 @@ define(
                 // Populate initial scope based on attributes requested
                 // by the container definition
                 link: function (scope, element, attrs) {
-                    var key = attrs.key,
+                    var key = attrs.key;
-                        container = containerMap[key],
+                    var container = containerMap[key];
-                        alias = "container",
+                    var alias = "container";
-                        copiedAttributes = {};
+                    var copiedAttributes = {};
 
                     if (container) {
                         alias = container.alias || alias;
@@ -78,8 +78,8 @@ define(
                 },
 
                 template: function (element, attrs) {
-                    var key = attrs.key,
+                    var key = attrs.key;
-                        container = containerMap[key];
+                    var container = containerMap[key];
                     return container ? container.template : "";
                 }
             };

platform/commonUI/general/src/directives/MCTDrag.js

@@ -54,12 +54,12 @@ define(
                 // mouse event handlers; mousedown and mouseup cannot
                 // only be attached to the element being linked, as the
                 // mouse may leave this element during the drag.
-                var body = $document.find('body'),
+                var body = $document.find('body');
-                    isMobile = agentService.isMobile(),
+                var isMobile = agentService.isMobile();
-                    touchEvents,
+                var touchEvents;
-                    initialPosition,
+                var initialPosition;
-                    $event,
+                var $event;
-                    delta;
+                var delta;
 
                 if (isMobile) {
                     touchEvents = {

platform/commonUI/general/src/directives/MCTPopup.js

@@ -44,10 +44,10 @@ define(
          */
         function MCTPopup($compile, popupService) {
             function link(scope, element, attrs, ctrl, transclude) {
-                var div = $compile(TEMPLATE)(scope),
+                var div = $compile(TEMPLATE)(scope);
-                    rect = element.parent()[0].getBoundingClientRect(),
+                var rect = element.parent()[0].getBoundingClientRect();
-                    position = [rect.left, rect.top],
+                var position = [rect.left, rect.top];
-                    popup = popupService.display(div, position);
+                var popup = popupService.display(div, position);
 
                 div.addClass('t-popup');
                 transclude(function (clone) {

platform/commonUI/general/src/directives/MCTResize.js

@@ -55,9 +55,9 @@ define(
 
             // Link; start listening for changes to an element's size
             function link(scope, element, attrs) {
-                var lastBounds,
+                var lastBounds;
-                    linking = true,
+                var linking = true;
-                    active = true;
+                var active = true;
 
                 // Determine how long to wait before the next update
                 function currentInterval() {

platform/commonUI/general/src/directives/MCTScroll.js

@@ -44,8 +44,8 @@ define(
          */
         function MCTScroll($parse, property, attribute) {
             function link(scope, element, attrs) {
-                var expr = attrs[attribute],
+                var expr = attrs[attribute];
-                    parsed = $parse(expr);
+                var parsed = $parse(expr);
 
                 // Set the element's scroll to match the scope's state
                 function updateElement(value) {

platform/commonUI/general/src/directives/MCTSplitPane.js

@@ -25,47 +25,47 @@ define(
     function () {
 
         // Pixel width to allocate for the splitter itself
-        var DEFAULT_ANCHOR = 'left',
+        var DEFAULT_ANCHOR = 'left';
-            POLLING_INTERVAL = 15, // milliseconds
+        var POLLING_INTERVAL = 15; // milliseconds
-            CHILDREN_WARNING_MESSAGE = [
+        var CHILDREN_WARNING_MESSAGE = [
-                "Invalid mct-split-pane contents.",
+            "Invalid mct-split-pane contents.",
-                "This element should contain exactly three",
+            "This element should contain exactly three",
-                "child elements, where the middle-most element",
+            "child elements, where the middle-most element",
-                "is an mct-splitter."
+            "is an mct-splitter."
-            ].join(" "),
+        ].join(" ");
-            ANCHOR_WARNING_MESSAGE = [
+        var ANCHOR_WARNING_MESSAGE = [
-                "Unknown anchor provided to mct-split-pane,",
+            "Unknown anchor provided to mct-split-pane;",
-                "defaulting to",
+            "defaulting to",
-                DEFAULT_ANCHOR + "."
+            DEFAULT_ANCHOR + "."
-            ].join(" "),
+        ].join(" ");
-            ANCHORS = {
+        var ANCHORS = {
-                left: {
+            left: {
-                    edge: "left",
+                edge: "left",
-                    opposite: "right",
+                opposite: "right",
-                    dimension: "width",
+                dimension: "width",
-                    orientation: "vertical"
+                orientation: "vertical"
-                },
+            },
-                right: {
+            right: {
-                    edge: "right",
+                edge: "right",
-                    opposite: "left",
+                opposite: "left",
-                    dimension: "width",
+                dimension: "width",
-                    orientation: "vertical",
+                orientation: "vertical",
-                    reversed: true
+                reversed: true
-                },
+            },
-                top: {
+            top: {
-                    edge: "top",
+                edge: "top",
-                    opposite: "bottom",
+                opposite: "bottom",
-                    dimension: "height",
+                dimension: "height",
-                    orientation: "horizontal"
+                orientation: "horizontal"
-                },
+            },
-                bottom: {
+            bottom: {
-                    edge: "bottom",
+                edge: "bottom",
-                    opposite: "top",
+                opposite: "top",
-                    dimension: "height",
+                dimension: "height",
-                    orientation: "horizontal",
+                orientation: "horizontal",
-                    reversed: true
+                reversed: true
-                }
+            }
-            };
+        };
 
         /**
          * Implements `mct-split-pane` directive.
@@ -95,19 +95,19 @@ define(
          */
         function MCTSplitPane($parse, $log, $interval, $window) {
             function controller($scope, $element, $attrs) {
-                var anchorKey = $attrs.anchor || DEFAULT_ANCHOR,
+                var anchorKey = $attrs.anchor || DEFAULT_ANCHOR;
-                    positionParsed = $parse($attrs.position),
+                var positionParsed = $parse($attrs.position);
-                    anchor,
+                var anchor;
-                    activeInterval,
+                var activeInterval;
-                    position,
+                var position;
-                    splitterSize,
+                var splitterSize;
 
-                    alias = $attrs.alias !== undefined ?
+                var alias = $attrs.alias !== undefined ?
-                        "mctSplitPane-" + $attrs.alias : undefined,
+                    "mctSplitPane-" + $attrs.alias : undefined;
 
-                    //convert string to number from localStorage
+                //convert string to number from localStorage
-                    userWidthPreference = $window.localStorage.getItem(alias) === null ?
+                var userWidthPreference = $window.localStorage.getItem(alias) === null ?
-                        undefined : Number($window.localStorage.getItem(alias));
+                    undefined : Number($window.localStorage.getItem(alias));
 
                 // Get relevant size (height or width) of DOM element
                 function getSize(domElement) {
@@ -121,10 +121,10 @@ define(
 
                     // Pick out correct elements to update, flowing from
                     // selected anchor edge.
-                    var first = children.eq(anchor.reversed ? 2 : 0),
+                    var first = children.eq(anchor.reversed ? 2 : 0);
-                        splitter = children.eq(1),
+                    var splitter = children.eq(1);
-                        last = children.eq(anchor.reversed ? 0 : 2),
+                    var last = children.eq(anchor.reversed ? 0 : 2);
-                        firstSize;
+                    var firstSize;
 
                     splitterSize = getSize(splitter[0]);
                     first.css(anchor.edge, "0px");

platform/commonUI/general/src/directives/MCTSplitter.js

@@ -37,8 +37,8 @@ define(
          */
         function MCTSplitter() {
             function link(scope, element, attrs, mctSplitPane) {
-                var initialPosition,
+                var initialPosition;
-                    newPosition;
+                var newPosition;
 
                 element.addClass("splitter");
 
@@ -50,9 +50,9 @@ define(
                     },
                     // Handle user changes to splitter position
                     move: function (delta) {
-                        var anchor = mctSplitPane.anchor(),
+                        var anchor = mctSplitPane.anchor();
-                            index = anchor.orientation === "vertical" ? 0 : 1,
+                        var index = anchor.orientation === "vertical" ? 0 : 1;
-                            pixelDelta = delta[index] *
+                        var pixelDelta = delta[index] *
                                 (anchor.reversed ? -1 : 1);
 
                         // Update the position of this splitter

platform/commonUI/general/src/services/PopupService.js

@@ -75,13 +75,13 @@ define(
          * @returns {platform/commonUI/general.Popup} the popup
          */
         PopupService.prototype.display = function (element, position, options) {
-            var $document = this.$document,
+            var $document = this.$document;
-                $window = this.$window,
+            var $window = this.$window;
-                body = $document.find('body'),
+            var body = $document.find('body');
-                winDim = [$window.innerWidth, $window.innerHeight],
+            var winDim = [$window.innerWidth, $window.innerHeight];
-                styles = { position: 'absolute' },
+            var styles = { position: 'absolute' };
-                margin,
+            var margin;
-                offset;
+            var offset;
 
             function adjustNegatives(value, index) {
                 return value < 0 ? (value + winDim[index]) : value;

platform/commonUI/general/src/services/UrlService.js

@@ -48,11 +48,11 @@ define(
          */
         UrlService.prototype.urlForLocation = function (mode, domainObject) {
             var context = domainObject &&
-                    domainObject.getCapability('context'),
+                    domainObject.getCapability('context');
-                objectPath = context ? context.getPath() : [],
+            var objectPath = context ? context.getPath() : [];
-                ids = objectPath.map(function (domainObj) {
+            var ids = objectPath.map(function (domainObj) {
-                    return domainObj.getId();
+                return domainObj.getId();
-                });
+            });
 
             // Parses the path together. Starts with the
             // default index.html file, then the mode passed
@@ -73,15 +73,15 @@ define(
          * @returns {string} URL for the domain object
          */
         UrlService.prototype.urlForNewTab = function (mode, domainObject) {
-            var search = this.$location.search(),
+            var search = this.$location.search();
-                arr = [];
+            var arr = [];
             for (var key in search) {
                 if (search.hasOwnProperty(key)) {
                     arr.push(key + '=' + search[key]);
                 }
             }
-            var searchPath = "?" + arr.join('&'),
+            var searchPath = "?" + arr.join('&');
-                newTabPath =
+            var newTabPath =
                     "#" + this.urlForLocation(mode, domainObject) +
                             searchPath;
             return newTabPath;

platform/commonUI/general/src/ui/TreeLabelView.js

@@ -47,8 +47,8 @@ define([
     }
 
     TreeLabelView.prototype.updateView = function (domainObject) {
-        var titleEl = this.el.find('.t-title-label'),
+        var titleEl = this.el.find('.t-title-label');
-            iconEl = this.el.find('.t-item-icon');
+        var iconEl = this.el.find('.t-item-icon');
 
         removePreviousIconClass(iconEl);
 

platform/commonUI/general/src/ui/TreeNodeView.js

@@ -116,8 +116,8 @@ define([
     }
 
     TreeNodeView.prototype.value = function (domainObject) {
-        var activeIdPath = getIdPath(this.activeObject),
+        var activeIdPath = getIdPath(this.activeObject);
-            selectedIdPath = getIdPath(domainObject);
+        var selectedIdPath = getIdPath(domainObject);
 
         if (this.onSelectionPath) {
             this.li.find('.js-tree__item').eq(0).removeClass('is-selected');