garbage collect plotly data.

.eslintrc.js

@@ -121,59 +121,6 @@ module.exports = {
         // https://eslint.org/docs/rules/rest-spread-spacing
         "rest-spread-spacing": ["error"],
 
-        // https://eslint.org/docs/rules/no-implicit-coercion
-        "no-implicit-coercion": "error",
-        //https://eslint.org/docs/rules/no-unneeded-ternary
-        "no-unneeded-ternary": "error",
-        // https://eslint.org/docs/rules/semi
-        "semi": ["error", "always"],
-        // https://eslint.org/docs/rules/no-multi-spaces
-        "no-multi-spaces": "error",
-        // https://eslint.org/docs/rules/key-spacing
-        "key-spacing": ["error", {
-            "afterColon": true
-        }],
-        // https://eslint.org/docs/rules/keyword-spacing
-        "keyword-spacing": ["error", {
-            "before": true,
-            "after": true
-        }],
-        // https://eslint.org/docs/rules/comma-spacing
-        // Also requires one line code fix
-        "comma-spacing": ["error", {
-            "after": true
-        }],
-        //https://eslint.org/docs/rules/no-whitespace-before-property
-        "no-whitespace-before-property": "error",
-        // https://eslint.org/docs/rules/object-curly-newline
-        "object-curly-newline": ["error", {"consistent": true, "multiline": true}],
-        // https://eslint.org/docs/rules/object-property-newline
-        "object-property-newline": "error",
-        // https://eslint.org/docs/rules/brace-style
-        "brace-style": "error",
-        // https://eslint.org/docs/rules/no-multiple-empty-lines
-        "no-multiple-empty-lines": ["error", {"max": 1}],
-        // https://eslint.org/docs/rules/operator-linebreak
-        "operator-linebreak": ["error", "before", {"overrides": {"=": "after"}}],
-        // https://eslint.org/docs/rules/padding-line-between-statements
-        "padding-line-between-statements":["error", {
-            "blankLine": "always",
-            "prev": "multiline-block-like",
-            "next": "*"
-        }, {
-            "blankLine": "always",
-            "prev": "*",
-            "next": "return"
-        }],
-        // https://eslint.org/docs/rules/space-infix-ops
-        "space-infix-ops": "error",
-        // https://eslint.org/docs/rules/space-unary-ops
-        "space-unary-ops": ["error", {"words": true, "nonwords": false}],
-        // https://eslint.org/docs/rules/arrow-spacing
-        "arrow-spacing": "error",
-        // https://eslint.org/docs/rules/semi-spacing
-        "semi-spacing": ["error", {"before": false, "after": true}],
-
         "vue/html-indent": [
             "error",
             4,

.gitignore

@@ -41,3 +41,4 @@ npm-debug.log
 report.*.json
 
 package-lock.json
+report.*.json

example/eventGenerator/src/EventTelemetry.js

@@ -44,14 +44,13 @@ define(
             };
 
             generatorData.getDomainValue = function (i, domain) {
-                return i * interval
+                return i * interval +
-                        + (domain !== 'delta' ? firstObservedTime : 0);
+                        (domain !== 'delta' ? firstObservedTime : 0);
             };
 
             generatorData.getRangeValue = function (i, range) {
                 var domainDelta = this.getDomainValue(i) - firstObservedTime,
                     ind = i % messages.length;
-
                 return messages[ind] + " - [" + domainDelta.toString() + "]";
             };
 

example/eventGenerator/src/EventTelemetryProvider.js

@@ -57,7 +57,6 @@ define(
                 results.forEach(function (result) {
                     packaged[result.key] = result.telemetry;
                 });
-
                 // Format as expected (sources -> keys -> telemetry)
                 return { eventGenerator: packaged };
             }

example/export/ExportTelemetryAsCSVAction.js

@@ -76,14 +76,13 @@ define([], function () {
                 copyRangesToRow(row, i);
                 rows.push(row);
             }
-
             exportService.exportCSV(rows, { headers: headers });
         });
     };
 
     ExportTelemetryAsCSVAction.appliesTo = function (context) {
-        return context.domainObject
+        return context.domainObject &&
-            && context.domainObject.hasCapability("telemetry");
+            context.domainObject.hasCapability("telemetry");
     };
 
     return ExportTelemetryAsCSVAction;

example/forms/src/ExampleFormController.js

@@ -152,22 +152,10 @@ define(
                                 name: "Choose something",
                                 control: "select",
                                 options: [
-                                    {
+                                    { name: "Hats", value: "hats" },
-                                        name: "Hats",
+                                    { name: "Bats", value: "bats" },
-                                        value: "hats"
+                                    { name: "Cats", value: "cats" },
-                                    },
+                                    { name: "Mats", value: "mats" }
-                                    {
-                                        name: "Bats",
-                                        value: "bats"
-                                    },
-                                    {
-                                        name: "Cats",
-                                        value: "cats"
-                                    },
-                                    {
-                                        name: "Mats",
-                                        value: "mats"
-                                    }
                                 ],
                                 key: "aChoice"
                             },
@@ -176,22 +164,10 @@ define(
                                 control: "select",
                                 required: true,
                                 options: [
-                                    {
+                                    { name: "Hats", value: "hats" },
-                                        name: "Hats",
+                                    { name: "Bats", value: "bats" },
-                                        value: "hats"
+                                    { name: "Cats", value: "cats" },
-                                    },
+                                    { name: "Mats", value: "mats" }
-                                    {
-                                        name: "Bats",
-                                        value: "bats"
-                                    },
-                                    {
-                                        name: "Cats",
-                                        value: "cats"
-                                    },
-                                    {
-                                        name: "Mats",
-                                        value: "mats"
-                                    }
                                 ],
                                 key: "aRequiredChoice"
                             }

example/generator/GeneratorMetadataProvider.js

@@ -108,7 +108,7 @@ define([
                 }
             ]
         }
-    };
+    }
 
     function GeneratorMetadataProvider() {
 

example/generator/GeneratorProvider.js

@@ -65,19 +65,15 @@ define([
             if (domainObject.telemetry && domainObject.telemetry.hasOwnProperty(prop)) {
                 workerRequest[prop] = domainObject.telemetry[prop];
             }
-
             if (request && request.hasOwnProperty(prop)) {
                 workerRequest[prop] = request[prop];
             }
-
             if (!workerRequest.hasOwnProperty(prop)) {
                 workerRequest[prop] = REQUEST_DEFAULTS[prop];
             }
-
             workerRequest[prop] = Number(workerRequest[prop]);
         });
         workerRequest.name = domainObject.name;
-
         return workerRequest;
     };
 
@@ -85,13 +81,11 @@ define([
         var workerRequest = this.makeWorkerRequest(domainObject, request);
         workerRequest.start = request.start;
         workerRequest.end = request.end;
-
         return this.workerInterface.request(workerRequest);
     };
 
     GeneratorProvider.prototype.subscribe = function (domainObject, callback) {
         var workerRequest = this.makeWorkerRequest(domainObject, {});
-
         return this.workerInterface.subscribe(workerRequest, callback);
     };
 

example/generator/SinewaveLimitProvider.js

@@ -78,15 +78,12 @@ define([
                 if (datum[range] > RED[range]) {
                     return LIMITS.rh;
                 }
-
                 if (datum[range] < -RED[range]) {
                     return LIMITS.rl;
                 }
-
                 if (datum[range] > YELLOW[range]) {
                     return LIMITS.yh;
                 }
-
                 if (datum[range] < -YELLOW[range]) {
                     return LIMITS.yl;
                 }

example/generator/StateGeneratorProvider.js

@@ -48,7 +48,7 @@ define([
         var interval = setInterval(function () {
             var now = Date.now();
             var datum = pointForTimestamp(now, duration, domainObject.name);
-            datum.value = String(datum.value);
+            datum.value += "";
             callback(datum);
         }, duration);
 
@@ -57,6 +57,7 @@ define([
         };
     };
 
+
     StateGeneratorProvider.prototype.supportsRequest = function (domainObject, options) {
         return domainObject.type === 'example.state-generator';
     };
@@ -68,13 +69,11 @@ define([
         if (options.strategy === 'latest' || options.size === 1) {
             start = end;
         }
-
         var data = [];
         while (start <= end && data.length < 5000) {
             data.push(pointForTimestamp(start, duration, domainObject.name));
             start += duration;
         }
-
         return Promise.resolve(data);
     };
 

example/generator/WorkerInterface.js

@@ -78,7 +78,6 @@ define([
             } else {
                 deferred.resolve(message.data);
             }
-
             delete this.callbacks[messageId];
         }
 
@@ -102,5 +101,8 @@ define([
         }.bind(this);
     };
 
+
+
+
     return WorkerInterface;
 });

example/generator/generatorWorker.js

@@ -71,7 +71,6 @@
                 });
                 nextStep += step;
             }
-
             return nextStep;
         }
 
@@ -88,7 +87,6 @@
         if (request.end === undefined) {
             request.end = Date.now();
         }
-
         if (request.start === undefined) {
             request.start = request.end - FIFTEEN_MINUTES;
         }
@@ -117,7 +115,6 @@
                 cos: cos(nextStep, period, amplitude, offset, phase, randomness)
             });
         }
-
         self.postMessage({
             id: message.id,
             data: data
@@ -125,13 +122,13 @@
     }
 
     function cos(timestamp, period, amplitude, offset, phase, randomness) {
-        return amplitude
+        return amplitude *
-            * Math.cos(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
+            Math.cos(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
     }
 
     function sin(timestamp, period, amplitude, offset, phase, randomness) {
-        return amplitude
+        return amplitude *
-            * Math.sin(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
+            Math.sin(phase + (timestamp / period / 1000 * Math.PI * 2)) + (amplitude * Math.random() * randomness) + offset;
     }
 
     function sendError(error, message) {

example/generator/plugin.js

@@ -56,7 +56,7 @@ define([
             initialize: function (object) {
                 object.telemetry = {
                     duration: 5
-                };
+                }
             }
         });
 

example/identity/src/ExampleIdentityService.js

@@ -25,14 +25,10 @@ define(
     function () {
         "use strict";
 
-        var DEFAULT_IDENTITY = {
+        var DEFAULT_IDENTITY = { key: "user", name: "Example User" },
-                key: "user",
-                name: "Example User"
-            },
             DIALOG_STRUCTURE = {
                 name: "Identify Yourself",
-                sections: [{
+                sections: [{ rows: [
-                    rows: [
                     {
                         name: "User ID",
                         control: "textfield",
@@ -45,10 +41,10 @@ define(
                         key: "name",
                         required: true
                     }
-                    ]
+                ]}]
-                }]
             };
 
+
         /**
          * Example implementation of an identity service. This prompts the
          * user to enter a name and user ID; in a more realistic
@@ -81,14 +77,14 @@ define(
          */
         ExampleIdentityProvider.prototype.returnUser = function (user) {
             return this.user = user;
-        };
+        }
 
         /**
          * @private
          */
         ExampleIdentityProvider.prototype.returnUndefined = function () {
             return undefined;
-        };
+        }
 
         return ExampleIdentityProvider;
     }

example/imagery/plugin.js

@@ -85,28 +85,28 @@ define([
                     data.push(pointForTimestamp(start, domainObject.name));
                     start += 5000;
                 }
-
                 return Promise.resolve(data);
             }
         };
 
         var ladProvider = {
             supportsRequest: function (domainObject, options) {
-                return domainObject.type === 'example.imagery'
+                return domainObject.type === 'example.imagery' &&
-                    && options.strategy === 'latest';
+                    options.strategy === 'latest';
             },
             request: function (domainObject, options) {
                 return Promise.resolve([pointForTimestamp(Date.now(), domainObject.name)]);
             }
         };
 
+
         return function install(openmct) {
             openmct.types.addType('example.imagery', {
                 key: 'example.imagery',
                 name: 'Example Imagery',
                 cssClass: 'icon-image',
-                description: 'For development use. Creates example imagery '
+                description: 'For development use. Creates example imagery ' +
-                    + 'data that mimics a live imagery stream.',
+                    'data that mimics a live imagery stream.',
                 creatable: true,
                 initialize: function (object) {
                     object.telemetry = {
@@ -140,7 +140,7 @@ define([
                                 }
                             }
                         ]
-                    };
+                    }
                 }
             });
 

example/msl/bundle.js

@@ -31,7 +31,6 @@ define([
     RemsTelemetryProvider
 ) {
     "use strict";
-
     return {
         name:"example/msl",
         definition: {

example/msl/src/RemsTelemetryModelProvider.js

@@ -81,7 +81,6 @@ define(
                 (dictionary.instruments || []).forEach(function (instrument) {
                     addInstrument(instrument, "msl:curiosity");
                 });
-
                 return models;
             }
 
@@ -91,7 +90,6 @@ define(
                 }
             };
         }
-
         return RemsTelemetryModelProvider;
     }
 );

example/msl/src/RemsTelemetryProvider.js

@@ -74,7 +74,6 @@ define (
         RemsTelemetryProvider.prototype.subscribe = function (callback, requests) {
             return function () {};
         };
-
         RemsTelemetryProvider.prototype.unsubscribe = function (callback, requests) {
             return function () {};
         };

example/msl/src/RemsTelemetrySeries.js

@@ -57,7 +57,6 @@ define(
         RemsTelemetrySeries.prototype.getPointCount = function () {
             return this.data.length;
         };
-
         /**
          * The domain value at the given index. The Rems telemetry data is
          * time ordered, so the domain value is the time stamp of each data

example/msl/src/RemsTelemetryServerAdapter.js

@@ -95,32 +95,28 @@ define(
                         });
                     }
                 });
-
                 return data;
             }
 
             function fallbackToLocal() {
-                self.$log.warn("Loading REMS data failed, probably due to"
+                self.$log.warn("Loading REMS data failed, probably due to" +
-                    + " cross origin policy. Falling back to local data");
+                    " cross origin policy. Falling back to local data");
-
                 return self.$http.get(self.localDataURI);
             }
 
             //Filter results to match request parameters
             function filterResults(results) {
                 return results.filter(function (result) {
-                    return result.date >= (request.start || Number.MIN_VALUE)
+                    return result.date >= (request.start || Number.MIN_VALUE) &&
-                        && result.date <= (request.end || Number.MAX_VALUE);
+                        result.date <= (request.end || Number.MAX_VALUE);
                 });
             }
 
             function packageAndResolve(results) {
-                return {
+                return {id: id, values: results};
-                    id: id,
-                    values: results
-                };
             }
 
+
             return (this.promise = this.promise || this.$http.get(this.REMS_WS_URL))
                 .catch(fallbackToLocal)
                 .then(processResponse)

example/notifications/src/DialogLaunchController.js

@@ -91,6 +91,7 @@ define(
                 }
             };
 
+
             /*
              Demonstrates launching an error dialog
              */
@@ -131,9 +132,9 @@ define(
                 var dialog,
                     model = {
                         title: "Info Dialog Example",
-                        actionText: "This is an example of a blocking info"
+                        actionText: "This is an example of a blocking info" +
-                        + " dialog. This dialog can be used to draw the user's"
+                        " dialog. This dialog can be used to draw the user's" +
-                        + " attention to an event.",
+                        " attention to an event.",
                         severity: "info",
                         primaryOption: {
                             label: "OK",
@@ -152,7 +153,6 @@ define(
             };
 
         }
-
         return DialogLaunchController;
     }
 );

example/notifications/src/DialogLaunchIndicator.js

@@ -42,11 +42,9 @@ define(
         DialogLaunchIndicator.prototype.getGlyphClass = function () {
             return 'ok';
         };
-
         DialogLaunchIndicator.prototype.getText = function () {
             return "Launch test dialog";
         };
-
         DialogLaunchIndicator.prototype.getDescription = function () {
             return "Launch test dialog";
         };

example/notifications/src/NotificationLaunchController.js

@@ -48,7 +48,6 @@ define(
                     "Eros turpis, pulvinar turpis eros eu",
                     "Lundium nascetur a, lectus montes ac, parturient in natoque, duis risus risus pulvinar pid rhoncus, habitasse auctor natoque!"
                 ];
-
                 return actionTexts[Math.floor(Math.random()*3)];
             }
 
@@ -62,7 +61,6 @@ define(
                     severity: "error"
                 });
             };
-
             /**
              * Launch a new notification with a severity of 'Alert'.
              */
@@ -75,6 +73,7 @@ define(
                 });
             };
 
+
             /**
              * Launch a new notification with a progress bar that is updated
              * periodically, tracking an ongoing process.
@@ -94,10 +93,10 @@ define(
                  * @param notification
                  */
                 function incrementProgress() {
-                    progress = Math.min(100, Math.floor(progress + Math.random() * 30));
+                    progress = Math.min(100, Math.floor(progress + Math.random() * 30))
-                    let progressText = ["Estimated time"
+                    let progressText = ["Estimated time" +
-                    + " remaining:"
+                    " remaining:" +
-                    + " about ", 60 - Math.floor((progress / 100) * 60), " seconds"].join(" ");
+                    " about ", 60 - Math.floor((progress / 100) * 60), " seconds"].join(" ");
                     notification.progress(progress, progressText);
 
                     if (progress < 100) {
@@ -121,7 +120,6 @@ define(
             };
 
         }
-
         return NotificationLaunchController;
     }
 );

example/notifications/src/NotificationLaunchIndicator.js

@@ -42,11 +42,9 @@ define(
         NotificationLaunchIndicator.prototype.getGlyphClass = function () {
             return 'ok';
         };
-
         NotificationLaunchIndicator.prototype.getText = function () {
             return "Launch notification";
         };
-
         NotificationLaunchIndicator.prototype.getDescription = function () {
             return "Launch notification";
         };

example/persistence/src/BrowserPersistenceProvider.js

@@ -30,6 +30,8 @@ define(
     function () {
         'use strict';
 
+
+
         function BrowserPersistenceProvider($q, SPACE) {
             var spaces = SPACE ? [SPACE] : [],
                 caches = {},
@@ -49,7 +51,6 @@ define(
                 },
                 listObjects: function (space) {
                     var cache = caches[space];
-
                     return promises.as(
                         cache ? Object.keys(cache) : null
                     );
@@ -67,7 +68,6 @@ define(
                 },
                 readObject: function (space, key) {
                     var cache = caches[space];
-
                     return promises.as(
                         cache ? cache[key] : null
                     );

example/policy/src/ExamplePolicy.js

@@ -37,7 +37,6 @@ define(
                         model = (domainObject && domainObject.getModel()) || {},
                         name = model.name || "",
                         metadata = action.getMetadata() || {};
-
                     return metadata.key !== 'remove' || name.indexOf('foo') < 0;
                 }
             };

example/scratchpad/src/ScratchPersistenceProvider.js

@@ -54,14 +54,13 @@ define(
             if (space === 'scratch') {
                 this.table[key] = JSON.stringify(value);
             }
-
             return this.$q.when(space === 'scratch');
         };
 
         ScratchPersistenceProvider.prototype.readObject = function (space, key) {
             return this.$q.when(
-                (space === 'scratch' && this.table[key])
+                (space === 'scratch' && this.table[key]) ?
-                    ? JSON.parse(this.table[key]) : undefined
+                    JSON.parse(this.table[key]) : undefined
             );
         };
 
@@ -69,7 +68,6 @@ define(
             if (space === 'scratch') {
                 delete this.table[key];
             }
-
             return this.$q.when(space === 'scratch');
         };
 

example/simpleVuePlugin/HelloWorld.vue

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

example/simpleVuePlugin/plugin.js

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

example/styleguide/bundle.js

@@ -29,104 +29,24 @@ define([
             "extensions":
         {
             "types": [
-                {
+                { "key": "styleguide.intro", "name": "Introduction", "cssClass": "icon-page", "description": "Introduction and overview to the style guide" },
-                    "key": "styleguide.intro",
+                { "key": "styleguide.standards", "name": "Standards", "cssClass": "icon-page", "description": "" },
-                    "name": "Introduction",
+                { "key": "styleguide.colors", "name": "Colors", "cssClass": "icon-page", "description": "" },
-                    "cssClass": "icon-page",
+                { "key": "styleguide.status", "name": "status", "cssClass": "icon-page", "description": "Limits, telemetry paused, etc." },
-                    "description": "Introduction and overview to the style guide"
+                { "key": "styleguide.glyphs", "name": "Glyphs", "cssClass": "icon-page", "description": "Glyphs overview" },
-                },
+                { "key": "styleguide.controls", "name": "Controls", "cssClass": "icon-page", "description": "Buttons, selects, HTML controls" },
-                {
+                { "key": "styleguide.input", "name": "Text Inputs", "cssClass": "icon-page", "description": "Various text inputs" },
-                    "key": "styleguide.standards",
+                { "key": "styleguide.menus", "name": "Menus", "cssClass": "icon-page", "description": "Context menus, dropdowns" }
-                    "name": "Standards",
-                    "cssClass": "icon-page",
-                    "description": ""
-                },
-                {
-                    "key": "styleguide.colors",
-                    "name": "Colors",
-                    "cssClass": "icon-page",
-                    "description": ""
-                },
-                {
-                    "key": "styleguide.status",
-                    "name": "status",
-                    "cssClass": "icon-page",
-                    "description": "Limits, telemetry paused, etc."
-                },
-                {
-                    "key": "styleguide.glyphs",
-                    "name": "Glyphs",
-                    "cssClass": "icon-page",
-                    "description": "Glyphs overview"
-                },
-                {
-                    "key": "styleguide.controls",
-                    "name": "Controls",
-                    "cssClass": "icon-page",
-                    "description": "Buttons, selects, HTML controls"
-                },
-                {
-                    "key": "styleguide.input",
-                    "name": "Text Inputs",
-                    "cssClass": "icon-page",
-                    "description": "Various text inputs"
-                },
-                {
-                    "key": "styleguide.menus",
-                    "name": "Menus",
-                    "cssClass": "icon-page",
-                    "description": "Context menus, dropdowns"
-                }
             ],
             "views": [
-                {
+                { "key": "styleguide.intro", "type": "styleguide.intro", "template": introTemplate, "editable": false },
-                    "key": "styleguide.intro",
+                { "key": "styleguide.standards", "type": "styleguide.standards", "template": standardsTemplate, "editable": false },
-                    "type": "styleguide.intro",
+                { "key": "styleguide.colors", "type": "styleguide.colors", "template": colorsTemplate, "editable": false },
-                    "template": introTemplate,
+                { "key": "styleguide.status", "type": "styleguide.status", "template": statusTemplate, "editable": false },
-                    "editable": false
+                { "key": "styleguide.glyphs", "type": "styleguide.glyphs", "template": glyphsTemplate, "editable": false },
-                },
+                { "key": "styleguide.controls", "type": "styleguide.controls", "template": controlsTemplate, "editable": false },
-                {
+                { "key": "styleguide.input", "type": "styleguide.input", "template": inputTemplate, "editable": false },
-                    "key": "styleguide.standards",
+                { "key": "styleguide.menus", "type": "styleguide.menus", "template": menusTemplate, "editable": false }
-                    "type": "styleguide.standards",
-                    "template": standardsTemplate,
-                    "editable": false
-                },
-                {
-                    "key": "styleguide.colors",
-                    "type": "styleguide.colors",
-                    "template": colorsTemplate,
-                    "editable": false
-                },
-                {
-                    "key": "styleguide.status",
-                    "type": "styleguide.status",
-                    "template": statusTemplate,
-                    "editable": false
-                },
-                {
-                    "key": "styleguide.glyphs",
-                    "type": "styleguide.glyphs",
-                    "template": glyphsTemplate,
-                    "editable": false
-                },
-                {
-                    "key": "styleguide.controls",
-                    "type": "styleguide.controls",
-                    "template": controlsTemplate,
-                    "editable": false
-                },
-                {
-                    "key": "styleguide.input",
-                    "type": "styleguide.input",
-                    "template": inputTemplate,
-                    "editable": false
-                },
-                {
-                    "key": "styleguide.menus",
-                    "type": "styleguide.menus",
-                    "template": menusTemplate,
-                    "editable": false
-                }
             ],
             "roots": [
                 {

example/styleguide/src/ExampleStyleGuideModelProvider.js

@@ -30,46 +30,14 @@ define(
             var pages = {};
 
             // Add pages
-            pages.intro = {
+            pages.intro = { name: "Introduction", type: "styleguide.intro", location: "styleguide:home" };
-                name: "Introduction",
+            pages.standards = { name: "Standards", type: "styleguide.standards", location: "styleguide:home" };
-                type: "styleguide.intro",
+            pages.colors = { name: "Colors", type: "styleguide.colors", location: "styleguide:home" };
-                location: "styleguide:home"
+            pages.glyphs = { name: "Glyphs", type: "styleguide.glyphs", location: "styleguide:home" };
-            };
+            pages.status = { name: "Status Indication", type: "styleguide.status", location: "styleguide:home" };
-            pages.standards = {
+            pages.controls = { name: "Controls", type: "styleguide.controls", location: "styleguide:ui-elements" };
-                name: "Standards",
+            pages.input = { name: "Text Inputs", type: "styleguide.input", location: "styleguide:ui-elements" };
-                type: "styleguide.standards",
+            pages.menus = { name: "Menus", type: "styleguide.menus", location: "styleguide:ui-elements" };
-                location: "styleguide:home"
-            };
-            pages.colors = {
-                name: "Colors",
-                type: "styleguide.colors",
-                location: "styleguide:home"
-            };
-            pages.glyphs = {
-                name: "Glyphs",
-                type: "styleguide.glyphs",
-                location: "styleguide:home"
-            };
-            pages.status = {
-                name: "Status Indication",
-                type: "styleguide.status",
-                location: "styleguide:home"
-            };
-            pages.controls = {
-                name: "Controls",
-                type: "styleguide.controls",
-                location: "styleguide:ui-elements"
-            };
-            pages.input = {
-                name: "Text Inputs",
-                type: "styleguide.input",
-                location: "styleguide:ui-elements"
-            };
-            pages.menus = {
-                name: "Menus",
-                type: "styleguide.menus",
-                location: "styleguide:ui-elements"
-            };
 
             return {
                 getModels: function () {
@@ -78,6 +46,6 @@ define(
             };
         }
 
-        return ExampleStyleGuideModelProvider;
+        return ExampleStyleGuideModelProvider
     }
 );

package.json

@@ -2,7 +2,6 @@
   "name": "openmct",
   "version": "1.0.0-snapshot",
   "description": "The Open MCT core platform",
-  "dependencies": {},
   "devDependencies": {
     "angular": ">=1.8.0",
     "angular-route": "1.4.14",
@@ -61,6 +60,7 @@
     "node-bourbon": "^4.2.3",
     "node-sass": "^4.9.2",
     "painterro": "^1.0.35",
+    "plotly.js-dist": "^1.54.5",
     "printj": "^1.2.1",
     "raw-loader": "^0.5.1",
     "request": "^2.69.0",

platform/commonUI/about/src/AboutController.js

@@ -20,6 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
+
 /**
  * Implements Open MCT's About dialog.
  * @namespace platform/commonUI/about

platform/commonUI/about/test/AboutControllerSpec.js

@@ -31,14 +31,8 @@ define(
 
             beforeEach(function () {
                 testVersions = [
-                    {
+                    { name: "Some name", value: "1.2.3" },
-                        name: "Some name",
+                    { name: "Some other name", value: "3.2.1" }
-                        value: "1.2.3"
-                    },
-                    {
-                        name: "Some other name",
-                        value: "3.2.1"
-                    }
                 ];
                 mockWindow = jasmine.createSpyObj("$window", ["open"]);
                 controller = new AboutController(testVersions, mockWindow);
@@ -57,6 +51,7 @@ define(
                 expect(mockWindow.open).toHaveBeenCalledWith("#/licenses");
             });
 
+
         });
 
     }

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

@@ -46,7 +46,6 @@ define(
         NavigateAction.prototype.perform = function () {
             if (this.navigationService.shouldNavigate()) {
                 this.navigationService.setNavigation(this.domainObject, true);
-
                 return Promise.resolve({});
             }
 

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

@@ -69,10 +69,8 @@ define(
         NavigationService.prototype.setNavigation = function (domainObject, force) {
             if (force) {
                 this.doNavigation(domainObject);
-
                 return true;
             }
-
             if (this.navigated === domainObject) {
                 return true;
             }
@@ -83,7 +81,6 @@ define(
             }
 
             this.doNavigation(domainObject);
-
             return true;
         };
 
@@ -123,7 +120,6 @@ define(
          */
         NavigationService.prototype.shouldNavigate = function () {
             var doNotNavigate = this.shouldWarnBeforeNavigate();
-
             return !doNotNavigate || this.$window.confirm(doNotNavigate);
         };
 
@@ -139,7 +135,6 @@ define(
          */
         NavigationService.prototype.checkBeforeNavigation = function (checkFn) {
             this.checks.push(checkFn);
-
             return function removeCheck() {
                 this.checks = this.checks.filter(function (fn) {
                     return checkFn !== fn;
@@ -177,7 +172,6 @@ define(
             if (reasons.length) {
                 return reasons.join('\n');
             }
-
             return false;
         };
 
@@ -192,7 +186,6 @@ define(
             if (shouldWarnBeforeNavigate) {
                 return shouldWarnBeforeNavigate;
             }
-
             if (this.oldUnload) {
                 return this.oldUnload.apply(undefined, [].slice.apply(arguments));
             }

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

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

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

@@ -53,7 +53,6 @@ define([
 
         it("sets navigation if it is allowed", function () {
             mockNavigationService.shouldNavigate.and.returnValue(true);
-
             return action.perform()
                 .then(function () {
                     expect(mockNavigationService.setNavigation)
@@ -64,7 +63,6 @@ define([
         it("does not set navigation if it is not allowed", function () {
             mockNavigationService.shouldNavigate.and.returnValue(false);
             var onSuccess = jasmine.createSpy('onSuccess');
-
             return action.perform()
                 .then(onSuccess, function () {
                     expect(onSuccess).not.toHaveBeenCalled();

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

@@ -79,6 +79,7 @@ define(
                 navigationService.addListener(callback);
                 navigationService.removeListener(callback);
 
+
                 navigationService.setNavigation(testObject);
                 expect(callback).not.toHaveBeenCalled();
             });

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

@@ -70,7 +70,6 @@ define([
                     jasmine.createSpy('throttled-' + mockThrottledFns.length);
                 mockThrottledFn.and.callFake(fn);
                 mockThrottledFns.push(mockThrottledFn);
-
                 return mockThrottledFn;
             });
             mockTopic.and.returnValue(mockMutationTopic);
@@ -82,7 +81,7 @@ define([
                 }[c];
             });
             mockDomainObject.hasCapability.and.callFake(function (c) {
-                return Boolean(mockDomainObject.getCapability(c));
+                return !!mockDomainObject.getCapability(c);
             });
             mockParentObject.getCapability.and.callFake(function (c) {
                 return {
@@ -103,6 +102,7 @@ define([
             );
         });
 
+
         it("listens for mutation with a throttled function", function () {
             expect(mockMutationTopic.listen)
                 .toHaveBeenCalledWith(jasmine.any(Function));
@@ -129,8 +129,8 @@ define([
                 });
 
                 [false, true].forEach(function (isEditRoot) {
-                    var caseName = isEditRoot
+                    var caseName = isEditRoot ?
-                        ? "that are being edited" : "that are not being edited";
+                        "that are being edited" : "that are not being edited";
 
                     function itNavigatesAsExpected() {
                         if (isOrphan && !isEditRoot) {

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

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

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

@@ -31,13 +31,13 @@
         </mct-include>
     </div>
     <div class="c-overlay__button-bar">
-        <button ng-repeat="option in ngModel.dialog.options"
+        <a ng-repeat="option in ngModel.dialog.options"
            href=''
            class="s-button lg"
            title="{{option.description}}"
            ng-click="ngModel.confirm(option.key)"
            ng-class="{ major: $first, subtle: !$first }">
             {{option.name}}
-        </button>
+        </a>
     </div>
 </mct-container>

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

@@ -24,7 +24,7 @@
     <div class="c-overlay__outer">
         <button ng-click="ngModel.cancel()"
            ng-if="ngModel.cancel"
-           class="c-click-icon c-overlay__close-button icon-x"></button>
+           class="c-click-icon c-overlay__close-button icon-x-in-circle"></button>
         <div class="c-overlay__contents" ng-transclude></div>
     </div>
 </div>

platform/commonUI/dialog/src/OverlayService.js

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

platform/commonUI/dialog/test/DialogServiceSpec.js

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

platform/commonUI/dialog/test/OverlayServiceSpec.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -20,6 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
+
 define([
     '../creation/CreateWizard',
     './SaveInProgressDialog'
@@ -49,7 +50,6 @@ function (
         this.injectObjectService = function () {
             this.objectService = $injector.get("objectService");
         };
-
         this.dialogService = dialogService;
         this.copyService = copyService;
         this.notificationService = notificationService;
@@ -75,7 +75,6 @@ function (
         if (!this.objectService) {
             this.injectObjectService();
         }
-
         return this.objectService;
     };
 
@@ -119,13 +118,11 @@ function (
 
         function showBlockingDialog(object) {
             dialog.show();
-
             return object;
         }
 
         function hideBlockingDialog(object) {
             dialog.hide();
-
             return object;
         }
 
@@ -141,12 +138,11 @@ function (
 
         function allowClone(objectToClone) {
             var allowed =
-                    (objectToClone.getId() === domainObject.getId())
+                    (objectToClone.getId() === domainObject.getId()) ||
-                        || objectToClone.getCapability('location').isOriginal();
+                        objectToClone.getCapability('location').isOriginal();
             if (allowed) {
                 toUndirty.push(objectToClone);
             }
-
             return allowed;
         }
 
@@ -167,11 +163,11 @@ function (
             return this.openmct.editor.save().then(() => {
                 // Force mutation for search indexing
                 return clonedObject;
-            });
+            })
         }
 
         function finishEditing(clonedObject) {
-            return fetchObject(clonedObject.getId());
+            return fetchObject(clonedObject.getId())
         }
 
         function indexForSearch(savedObject) {
@@ -184,7 +180,6 @@ function (
 
         function onSuccess(object) {
             self.notificationService.info("Save Succeeded");
-
             return object;
         }
 
@@ -193,7 +188,6 @@ function (
             if (reason !== "user canceled") {
                 self.notificationService.error("Save Failed");
             }
-
             throw reason;
         }
 
@@ -211,6 +205,7 @@ function (
             .catch(onFailure);
     };
 
+
     /**
          * Check if this action is applicable in a given context.
          * This will ensure that a domain object is present in the context,
@@ -219,11 +214,10 @@ function (
          */
     SaveAsAction.appliesTo = function (context) {
         var domainObject = (context || {}).domainObject;
-
+        return domainObject !== undefined &&
-        return domainObject !== undefined
+                domainObject.hasCapability('editor') &&
-                && domainObject.hasCapability('editor')
+                domainObject.getCapability('editor').isEditContextRoot() &&
-                && domainObject.getCapability('editor').isEditContextRoot()
+                domainObject.getModel().persisted === undefined;
-                && domainObject.getModel().persisted === undefined;
     };
 
     return SaveAsAction;

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

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

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

@@ -56,10 +56,9 @@ define(
 
             capabilities.persistence = function (domainObject) {
                 var original =
-                    (typeof persistenceCapability === 'function')
+                    (typeof persistenceCapability === 'function') ?
-                        ? persistenceCapability(domainObject)
+                        persistenceCapability(domainObject) :
-                        : persistenceCapability;
+                        persistenceCapability;
-
                 return new TransactionalPersistenceCapability(
                     self.$q,
                     self.transactionService,
@@ -67,7 +66,6 @@ define(
                     domainObject
                 );
             };
-
             return capabilities;
         };
 

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

@@ -64,7 +64,6 @@ define(
                     wrappedPersistence.persist.bind(wrappedPersistence),
                     wrappedPersistence.refresh.bind(wrappedPersistence)
                 );
-
                 //Need to return a promise from this function
                 return this.$q.when(true);
             } else {
@@ -75,7 +74,6 @@ define(
         TransactionalPersistenceCapability.prototype.refresh = function () {
             this.transactionManager
                 .clearTransactionsFor(this.domainObject.getId());
-
             return this.persistenceCapability.refresh();
         };
 

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

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

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

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

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

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

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

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

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

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

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

@@ -114,7 +114,6 @@ define(
             this.domainObject.useCapability("mutation", function () {
                 return formModel;
             });
-
             return this.domainObject;
         };
 

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

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

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

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

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

@@ -45,7 +45,6 @@ define(
             // because it may be saved elsewhere
             if ((key === 'edit' && category === 'view-control') || key === 'properties') {
                 let newStyleObject = objectUtils.toNewFormat(domainObject, domainObject.getId());
-
                 return this.openmct.objects.isPersistable(newStyleObject);
             }
 

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

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

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

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

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

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

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

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

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

@@ -48,9 +48,9 @@ define(
          * #cancel} are called
          */
         TransactionService.prototype.startTransaction = function () {
-            var transaction = this.isActive()
+            var transaction = this.isActive() ?
-                ? new NestedTransaction(this.transactions[0])
+                new NestedTransaction(this.transactions[0]) :
-                : new Transaction(this.$log);
+                new Transaction(this.$log);
 
             this.transactions.push(transaction);
         };
@@ -99,16 +99,13 @@ define(
             if (!transaction) {
                 return Promise.reject();
             }
-
             if (!this.isActive()) {
                 return transaction.commit()
                     .then(function (r) {
                         this.cacheService.flush();
-
                         return r;
                     }.bind(this));
             }
-
             return transaction.commit();
         };
 
@@ -122,7 +119,6 @@ define(
          */
         TransactionService.prototype.cancel = function () {
             var transaction = this.transactions.pop();
-
             return transaction ? transaction.cancel() : Promise.reject();
         };
 

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

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

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

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

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

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

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

@@ -138,7 +138,6 @@ define(
                 it("notifies if saving succeeded", function () {
                     var mockCallback = jasmine.createSpy("callback");
                     mockEditorCapability.save.and.returnValue(Promise.resolve());
-
                     return action.perform().then(mockCallback).then(function () {
                         expect(mockNotificationService.info).toHaveBeenCalled();
                         expect(mockNotificationService.error).not.toHaveBeenCalled();
@@ -148,7 +147,6 @@ define(
                 it("notifies if saving failed", function () {
                     var mockCallback = jasmine.createSpy("callback");
                     mockEditorCapability.save.and.returnValue(Promise.reject("some failure reason"));
-
                     return action.perform().then(mockCallback).then(function () {
                         expect(mockNotificationService.error).toHaveBeenCalled();
                         expect(mockNotificationService.info).not.toHaveBeenCalled();

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

@@ -97,6 +97,7 @@ define(
                 action = new SaveAndStopEditingAction(dialogService, notificationService, actionContext);
             });
 
+
             it("only applies to domain object with an editor capability", function () {
                 expect(SaveAndStopEditingAction.appliesTo(actionContext)).toBe(true);
                 expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor");

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

@@ -42,8 +42,8 @@ define(
             function noop() {}
 
             function mockPromise(value) {
-                return (value || {}).then ? value
+                return (value || {}).then ? value :
-                    : {
+                    {
                         then: function (callback) {
                             return mockPromise(callback(value));
                         },
@@ -67,10 +67,7 @@ define(
                 mockDomainObject.getCapability.and.callFake(function (capability) {
                     return capabilities[capability];
                 });
-                mockDomainObject.getModel.and.returnValue({
+                mockDomainObject.getModel.and.returnValue({location: 'a', persisted: undefined});
-                    location: 'a',
-                    persisted: undefined
-                });
                 mockDomainObject.getId.and.returnValue(0);
 
                 mockClonedObject = jasmine.createSpyObj(
@@ -171,8 +168,8 @@ define(
                 expect(SaveAsAction.appliesTo(actionContext)).toBe(false);
             });
 
-            it("only applies to domain object that has not already been"
+            it("only applies to domain object that has not already been" +
-                + " persisted", function () {
+                " persisted", function () {
                 expect(SaveAsAction.appliesTo(actionContext)).toBe(true);
                 expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor");
 

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

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

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

@@ -76,15 +76,15 @@ define(
                 );
             });
 
-            it("if no transaction is active, passes through to persistence"
+            it("if no transaction is active, passes through to persistence" +
-                + " provider", function () {
+                " provider", function () {
                 mockTransactionManager.isActive.and.returnValue(false);
                 capability.persist();
                 expect(mockPersistence.persist).toHaveBeenCalled();
             });
 
-            it("if transaction is active, persist and cancel calls are"
+            it("if transaction is active, persist and cancel calls are" +
-                + " queued", function () {
+                " queued", function () {
                 mockTransactionManager.isActive.and.returnValue(true);
                 capability.persist();
                 expect(mockTransactionManager.addToTransaction).toHaveBeenCalled();

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

@@ -40,7 +40,6 @@ define(
                     mockedSaveActions.forEach(function (action) {
                         action.getMetadata.and.returnValue(mockSaveActionMetadata);
                     });
-
                     return mockedSaveActions;
                 } else if (actionContext.category === "conclude-editing") {
                     return ["a", "b", "c"];

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

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

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

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

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

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

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

@@ -77,7 +77,7 @@ define(
                     ]
                 );
                 mockDomainObject.hasCapability.and.callFake(function (name) {
-                    return Boolean(capabilities[name]);
+                    return !!capabilities[name];
                 });
                 mockDomainObject.getCapability.and.callFake(function (name) {
                     return capabilities[name];
@@ -150,8 +150,8 @@ define(
                     expect(mockEditAction.perform).toHaveBeenCalled();
                 });
 
-                it("uses the save-as action if object does not have an edit action"
+                it("uses the save-as action if object does not have an edit action" +
-                    + " available", function () {
+                    " available", function () {
                     capabilities.action.getActions.and.returnValue([]);
                     capabilities.action.perform.and.returnValue(mockPromise(undefined));
                     capabilities.editor.save.and.returnValue(promise);

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

@@ -45,7 +45,6 @@ define(
                     control: "textfield"
                 });
                 mockProperty.getValue.and.returnValue(name);
-
                 return mockProperty;
             }
 
@@ -121,10 +120,7 @@ define(
                 // Should have gotten a setValue call
                 mockProperties.forEach(function (mockProperty, i) {
                     expect(mockProperty.setValue).toHaveBeenCalledWith(
-                        {
+                        { someKey: "some value", type: 'test' },
-                            someKey: "some value",
-                            type: 'test'
-                        },
                         "field " + i
                     );
                 });
@@ -192,6 +188,7 @@ define(
                 })).toEqual(false);
             });
 
+
         });
     }
 );

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

@@ -58,10 +58,7 @@ define(
             }
 
             beforeEach(function () {
-                mockQ = {
+                mockQ = { when: mockPromise, reject: mockReject };
-                    when: mockPromise,
-                    reject: mockReject
-                };
                 mockLog = jasmine.createSpyObj(
                     "$log",
                     ["error", "warn", "info", "debug"]
@@ -116,8 +113,8 @@ define(
 
                 mockNewObject.getId.and.returnValue('newId');
                 mockNewObject.getCapability.and.callFake(function (c) {
-                    return c === 'persistence'
+                    return c === 'persistence' ?
-                        ? mockNewPersistenceCapability : undefined;
+                        mockNewPersistenceCapability : undefined;
                 });
 
                 mockPersistenceCapability.persist
@@ -170,7 +167,6 @@ define(
                     mockDomainObject.getId.and.returnValue(id);
                     mockCompositionCapability.invoke
                         .and.returnValue(mockPromise([mockDomainObject]));
-
                     return mockPromise(mockDomainObject);
                 });
 
@@ -211,6 +207,7 @@ define(
                 expect(mockLog.error).toHaveBeenCalled();
             });
 
+
         });
     }
 );

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

@@ -30,6 +30,7 @@ define([
             $scope,
             representer;
 
+
         beforeEach(function () {
             $log = jasmine.createSpyObj('$log', ['debug']);
             $scope = {};
@@ -83,5 +84,6 @@ define([
 
         });
 
+
     });
 });

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

@@ -74,3 +74,4 @@ define(["../../src/services/NestedTransaction"], function (NestedTransaction) {
     });
 });
 
+

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

@@ -51,7 +51,6 @@ define(
                     var mockRemove =
                         jasmine.createSpy('remove-' + mockRemoves.length);
                     mockRemoves.push(mockRemove);
-
                     return mockRemove;
                 });
 

platform/commonUI/formats/bundle.js

@@ -68,8 +68,8 @@ define([
                         "version": "3.0.0",
                         "description": "Incorporates modified code from d3 Time Scales",
                         "author": "Mike Bostock",
-                        "copyright": "Copyright 2010-2016 Mike Bostock. "
+                        "copyright": "Copyright 2010-2016 Mike Bostock. " +
-                    + "All rights reserved.",
+                    "All rights reserved.",
                         "link": "https://github.com/d3/d3/blob/master/LICENSE"
                     }
                 ]

platform/commonUI/formats/src/DurationFormat.js

@@ -31,6 +31,7 @@ define([
             DATE_FORMAT
         ];
 
+
     /**
      * Formatter for duration. Uses moment to produce a date from a given
      * value, but output is formatted to display only time. Can be used for

platform/commonUI/formats/src/FormatProvider.js

@@ -114,7 +114,6 @@ define([
         if (!format) {
             throw new Error("FormatProvider: No format found for " + key);
         }
-
         return format;
     };
 

platform/commonUI/formats/src/UTCTimeFormat.js

@@ -71,7 +71,6 @@ define([
         if (typeof text === 'number') {
             return text;
         }
-
         return moment.utc(text, DATE_FORMATS).valueOf();
     };
 

platform/commonUI/formats/test/FormatProviderSpec.js

@@ -43,9 +43,7 @@ define(
                     function MockFormat() {
                         return mockFormatInstances[i];
                     }
-
                     MockFormat.key = k;
-
                     return MockFormat;
                 });
                 provider = new FormatProvider(mockFormats);

platform/commonUI/general/src/SplashScreenManager.js

@@ -20,6 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
+
 define([
 
 ], function (
@@ -33,7 +34,6 @@ define([
         if (!splash) {
             return;
         }
-
         splash.className += ' fadeout';
         splash.addEventListener('transitionend', function () {
             splash.parentNode.removeChild(splash);

platform/commonUI/general/src/StyleSheetLoader.js

@@ -67,8 +67,8 @@ define(
             // Stylesheets which specify themes should only be applied
             // when that theme has been declared.
             function matchesTheme(stylesheet) {
-                return stylesheet.theme === undefined
+                return stylesheet.theme === undefined ||
-                    || stylesheet.theme === activeTheme;
+                    stylesheet.theme === activeTheme;
             }
 
             assetPath = assetPath || ".";

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

@@ -46,22 +46,18 @@ define(
                   notification button
                  */
                 $event.stopPropagation();
-
                 return action();
             };
-
             $scope.dismiss = function (notification, $event) {
                 $event.stopPropagation();
                 notification.dismiss();
             };
-
             $scope.maximize = function (notification) {
                 if (notification.model.severity !== "info") {
                     var dialog;
                     notification.model.cancel = function () {
                         dialog.dismiss();
                     };
-
                     //If the notification is dismissed by the user, close
                     // the dialog.
                     notification.on('dismiss', function () {
@@ -72,6 +68,5 @@ define(
                 }
             };
         }
-
         return BannerController;
     });

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

@@ -56,7 +56,6 @@ define(
             this.state = false;
             this.$document.off("mouseup", this.clickaway);
         };
-
         ClickAwayController.prototype.activate = function () {
             this.state = true;
             this.$document.on("mouseup", this.clickaway);

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

@@ -47,13 +47,12 @@ define(
             function updateFromModel(value) {
                 // Only reformat if the value is different from user
                 // input (to avoid reformatting valid input while typing.)
-                if (!formatter.validate($scope.textValue)
+                if (!formatter.validate($scope.textValue) ||
-                        || formatter.parse($scope.textValue) !== value) {
+                        formatter.parse($scope.textValue) !== value) {
                     $scope.textValue = formatter.format(value);
                     $scope.textInvalid = false;
                     $scope.lastValidValue = $scope.textValue;
                 }
-
                 $scope.pickerModel = { value: value };
             }
 

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

@@ -35,7 +35,6 @@ define(
                 while (arr.length < 60) {
                     arr.push(arr.length);
                 }
-
                 return {
                     hours: arr.slice(0, 24),
                     minutes: arr,
@@ -71,10 +70,7 @@ define(
                 interacted = false;
 
             function generateTable() {
-                var m = moment.utc({
+                var m = moment.utc({ year: year, month: month }).day(0),
-                        year: year,
-                        month: month
-                    }).day(0),
                     table = [],
                     row,
                     col;
@@ -146,10 +142,9 @@ define(
 
             $scope.isSelected = function (cell) {
                 var date = $scope.date || {};
-
+                return cell.day === date.day &&
-                return cell.day === date.day
+                    cell.month === date.month &&
-                    && cell.month === date.month
+                    cell.year === date.year;
-                    && cell.year === date.year;
             };
 
             $scope.select = function (cell) {
@@ -161,9 +156,9 @@ define(
             };
 
             $scope.dateEquals = function (d1, d2) {
-                return d1.year === d2.year
+                return d1.year === d2.year &&
-                    && d1.month === d2.month
+                    d1.month === d2.month &&
-                    && d1.day === d2.day;
+                    d1.day === d2.day;
             };
 
             $scope.changeMonth = function (delta) {
@@ -172,12 +167,10 @@ define(
                     month = 0;
                     year += 1;
                 }
-
                 if (month < 0) {
                     month = 11;
                     year -= 1;
                 }
-
                 interacted = true;
                 updateScopeForMonth();
             };
@@ -194,8 +187,8 @@ define(
 
             // Ensure some useful default
             $scope.ngModel[$scope.field] =
-                $scope.ngModel[$scope.field] === undefined
+                $scope.ngModel[$scope.field] === undefined ?
-                    ? now() : $scope.ngModel[$scope.field];
+                    now() : $scope.ngModel[$scope.field];
 
             $scope.$watch('ngModel[field]', updateFromModel);
             $scope.$watchCollection('date', updateFromView);

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

@@ -44,12 +44,12 @@ define(
                     currentParent,
                     parents = [];
 
-                currentParent = currentObj
+                currentParent = currentObj &&
-                    && currentObj.hasCapability('context')
+                    currentObj.hasCapability('context') &&
-                    && currentObj.getCapability('context').getParent();
+                    currentObj.getCapability('context').getParent();
 
-                while (currentParent && currentParent.getModel().type !== 'root'
+                while (currentParent && currentParent.getModel().type !== 'root' &&
-                        && currentParent.hasCapability('context')) {
+                        currentParent.hasCapability('context')) {
                     // Record this object
                     parents.unshift(currentParent);
 
@@ -87,16 +87,16 @@ define(
 
             // Gets the metadata for the selected object
             function getMetadata() {
-                $scope.metadata = $scope.domainObject
+                $scope.metadata = $scope.domainObject &&
-                    && $scope.domainObject.hasCapability('metadata')
+                    $scope.domainObject.hasCapability('metadata') &&
-                    && $scope.domainObject.useCapability('metadata');
+                    $scope.domainObject.useCapability('metadata');
             }
 
             // Set scope variables when the selected object changes
             $scope.$watch('domainObject', function () {
-                $scope.isLink = $scope.domainObject
+                $scope.isLink = $scope.domainObject &&
-                    && $scope.domainObject.hasCapability('location')
+                    $scope.domainObject.hasCapability('location') &&
-                    && $scope.domainObject.getCapability('location').isLink();
+                    $scope.domainObject.getCapability('location').isLink();
 
                 if ($scope.isLink) {
                     getPrimaryPath();
@@ -113,7 +113,6 @@ define(
             var unlisten = mutation.listen(getMetadata);
             $scope.$on('$destroy', unlisten);
         }
-
         return ObjectInspectorController;
     }
 );