[Tutorials] Add hello world example

API.md

@@ -129,10 +129,8 @@ provider.
 
 The "composition" of a domain object is the list of objects it contains,
 as shown (for example) in the tree for browsing. Open MCT provides a
-[default solution](#default-composition-provider) for composition, but there
-may be cases where you want to provide the composition of a certain object
-(or type of object) dynamically.
-
+default solution for composition, but there may be cases where you want
+to provide the composition of a certain object (or type of object) dynamically.
 For instance, you may want to populate a hierarchy under a custom root-level
 object based on the contents of a telemetry dictionary.
 To do this, you can add a new CompositionProvider:
@@ -148,29 +146,6 @@ openmct.composition.addProvider({
 });
 ```
 
-#### Default Composition Provider
-
-The default composition provider applies to any domain object with
-a `composition` property. The value of `composition` should be an
-array of identifiers, e.g.:
-
-```js
-var domainObject = {
-    name: "My Object",
-    type: 'folder',
-    composition: [
-        {
-            key: '412229c3-922c-444b-8624-736d85516247',
-            namespace: 'foo'
-        },
-        {
-            key: 'd6e0ce02-5b85-4e55-8006-a8a505b64c75',
-            namespace: 'foo'
-        }
-    ]
-};
-```
-
 ### Adding Telemetry Providers
 
 When connecting to a new telemetry source, you will want to register a new
@@ -294,27 +269,12 @@ The plugin will be invoked to configure Open MCT before it is started.
 
 Open MCT is packaged along with a few general-purpose plugins:
 
-* `openmct.plugins.CouchDB` is an adapter for using CouchDB for persistence
-  of user-created objects. This is a constructor that takes the URL for the
-  CouchDB database as a parameter, e.g.
-  `openmct.install(new openmct.plugins.CouchDB('http://localhost:5984/openmct'))`
-* `openmct.plugins.Elasticsearch` is an adapter for using Elasticsearch for
-  persistence of user-created objects. This is a
-  constructor that takes the URL for the Elasticsearch instance as a
-  parameter, e.g.
-  `openmct.install(new openmct.plugins.CouchDB('http://localhost:9200'))`.
-  Domain objects will be indexed at `/mct/domain_object`.
-* `openmct.plugins.espresso` and `openmct.plugins.snow` are two different
-  themes (dark and light) available for Open MCT. Note that at least one
-  of these themes must be installed for Open MCT to appear correctly.
 * `openmct.plugins.localStorage` provides persistence of user-created
   objects in browser-local storage. This is particularly useful in
   development environments.
 * `openmct.plugins.myItems` adds a top-level folder named "My Items"
   when the application is first started, providing a place for a
   user to store created items.
-* `openmct.plugins.utcTimeSystem` provides support for using the time
-  conductor with UTC time.
 
 Generally, you will want to either install these plugins, or install
 different plugins that provide persistence and an initial folder

README.md

@@ -1,6 +1,6 @@
 # Open MCT [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
 
-Open MCT (Open Mission Control Technologies) is a next-generation mission control framework for visualization of data on desktop and mobile devices. It is developed at NASA's Ames Research Center, and is being used by NASA for data analysis of spacecraft missions, as well as planning and operation of experimental rover systems. As a generalizable and open source framework, Open MCT could be used as the basis for building applications for planning, operation, and analysis of any systems producing telemetry data.
+Open MCT is a next-generation mission control framework for visualization of data on desktop and mobile devices. It is developed at NASA's Ames Research Center, and is being used by NASA for data analysis of spacecraft missions, as well as planning and operation of experimental rover systems. As a generalizable and open source framework, Open MCT could be used as the basis for building applications for planning, operation, and analysis of any systems producing telemetry data.
 
 Please visit our [Official Site](https://nasa.github.io/openmct/) and [Getting Started Guide](https://nasa.github.io/openmct/getting-started/)
 

docs/src/architecture/framework.md

@@ -131,7 +131,7 @@ Keeping that in mind, there are a few useful patterns supported by the
 framework that are useful to keep in mind.
 
 The specific service infrastructure provided by the platform is described
-in the [Platform Architecture](platform.md).
+in the [Platform Architecture](Platform.md).
 
 ## Extension Categories
 

docs/src/guide/index.md

@@ -1339,6 +1339,41 @@ are supported:
 Open MCT defines several Angular directives that are intended for use both 
 internally within the platform, and by plugins. 
  
+## Chart 
+
+The `mct-chart` directive is used to support drawing of simple charts. It is 
+present to support the Plot view, and its functionality is limited to the 
+functionality that is relevant for that view.
+
+This directive is used at the element level and takes one attribute, `draw` 
+which is an Angular expression which will should evaluate to a drawing object. 
+This drawing object should contain the following properties:
+
+* `dimensions`: The size, in logical coordinates, of the chart area. A 
+two-element array or numbers. 
+* `origin`: The position, in logical coordinates, of the lower-left corner of 
+the chart area. A two-element array or numbers. 
+* `lines`: An array of lines (e.g. as a plot line) to draw, where each line is 
+expressed as an object containing: 
+    * `buffer`: A Float32Array containing points in the line, in logical 
+    coordinates, in sequential x,y pairs. 
+    * `color`: The color of the line, as a four-element RGBA array, where 
+    each element is a number in the range of 0.0-1.0. 
+    * `points`: The number of points in the line. 
+* `boxes`: An array of rectangles to draw in the chart area. Each is an object 
+containing: 
+    * `start`: The first corner of the rectangle, as a two-element array of 
+    numbers, in logical coordinates. 
+    * `end`: The opposite corner of the rectangle, as a two-element array of 
+    numbers, in logical coordinates. color : The color of the line, as a 
+    four-element RGBA array, where each element is a number in the range of 
+    0.0-1.0. 
+
+While `mct-chart` is intended to support plots specifically, it does perform 
+some useful management of canvas objects (e.g. choosing between WebGL and Canvas 
+2D APIs for drawing based on browser support) so its usage is recommended when 
+its supported drawing primitives are sufficient for other charting tasks. 
+ 
 ## Container 
 
 The `mct-container` is similar to the `mct-include` directive insofar as it allows 

docs/src/tutorials/hello.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <script src="openmct.js"></script>
+    </head>
+    <body>
+        <script type="text/javascript">
+            openmct.install(openmct.plugins.localStorage);
+            openmct.install(openmct.plugins.myItems);
+            openmct.start();
+        </script>
+    </body>
+</html>

docs/src/tutorials/index.md

@@ -129,7 +129,7 @@ We will create this file in the directory tutorials/todo (we can hereafter refer
 to this plugin as tutorials/todo as well.) We will start with an "empty bundle", 
 one which exposes no extensions - which looks like:
 
-```js
+```diff
 define([
     'openmct'
 ], function (
@@ -154,7 +154,7 @@ The tutorials will be updated with the new bundle registration mechanism once it
 has been finalized. 
 
 #### Before
-```html
+```diff
 <!--
  Open MCT, Copyright (c) 2014-2016, United States Government
  as represented by the Administrator of the National Aeronautics and Space
@@ -219,7 +219,7 @@ __index.html__
 
 #### After
 
-```html
+```diff
 <!--
  Open MCT, Copyright (c) 2014-2016, United States Government
  as represented by the Administrator of the National Aeronautics and Space
@@ -305,7 +305,7 @@ In the case of our to-do list feature, the to-do list itself is the thing we'll
 want users to be able to create and edit. So, we will add that as a new type in 
 our bundle definition:
 
-```js
+```diff
 define([
     'openmct'
 ], function (
@@ -340,9 +340,8 @@ Going through the properties we've defined:
 domain objects of this type.
 * The `name` of "To-Do List" is the human-readable name for this type, and will 
 be shown to users.
-* The `cssclass` maps to an icon that will be shown for each To-Do List. The icons 
-are defined in our [custom open MCT icon set](https://github.com/nasa/openmct/blob/master/platform/commonUI/general/res/sass/_glyphs.scss). 
-A complete list of available icons will be provided in the future.
+* The `glyph` refers to a special character in Open MCT's custom font set; 
+this will be used as an icon.
 * The `description` is also human-readable, and will be used whenever a longer 
 explanation of what this type is should be shown.
 * Finally, the `features` property describes some special features of objects of 
@@ -370,7 +369,7 @@ directory `tutorials/todo/res/templates` (`res` is, by default, the directory
 where bundle-related resources are kept, and `templates` is where HTML templates 
 are stored by convention.)
 
-```html
+```diff
 <div>
     <a href="">All</a>
     <a href="">Incomplete</a>
@@ -402,7 +401,7 @@ boolean `completed` flag.
 To expose this view in Open MCT, we need to declare it in our bundle 
 definition:
 
-```js
+```diff
 define([
     'openmct'
 ], function (
@@ -447,7 +446,7 @@ the domain object type, but could have chosen any unique name.
 domain objects of that type. This means that we'll see this view for To-do Lists 
 that we create, but not for other domain objects (such as Folders.)
 
-* The `cssclass` and `name` properties describe the icon and human-readable name 
+* The `glyph` and `name` properties describe the icon and human-readable name 
 for this view to display in the UI where needed (if multiple views are available 
 for To-do Lists, the user will be able to choose one.)
 
@@ -459,7 +458,7 @@ the user to create these yet. As a temporary workaround to test the view, we
 will specify an initial state for To-do List domain object models in the 
 definition of that type.
 
-```js
+```diff
 define([
     'openmct'
 ], function (
@@ -530,7 +529,7 @@ in the directory `tutorials/todo/src/controllers` (`src` is, by default, the
 directory where bundle-related source code is kept, and controllers is where 
 Angular controllers are stored by convention.)
 
-```js
+```diff
 define(function () {
     function TodoController($scope) {
         var showAll = true,
@@ -595,7 +594,7 @@ prior to our template being utilized.
 On its own, this controller merely exposes these functions; the next step is to 
 use them from our template:
 
-```html
+```diff
 +  <div ng-controller="TodoController">
         <div>
 +          <a ng-click="setVisibility(true)">All</a>
@@ -631,7 +630,7 @@ If we were to try to run at this point, we'd run into problems because the
 `TodoController` has not been registered with Angular. We need to first declare 
 it in our bundle definition, as an extension of category `controllers`:
 
-```js
+```diff
 define([
     'openmct',
 +    './src/controllers/TodoController'
@@ -725,7 +724,7 @@ An Editing user interface is typically handled in a tool bar associated with a
 view. The contents of this tool bar are defined declaratively in a view's 
 extension definition.
 
-```js
+```diff
 define([
     'openmct',
     './src/controllers/TodoController'
@@ -814,7 +813,7 @@ all the applicable controls, which means no controls at all.
 
 To support selection, we will need to make some changes to our controller:
 
-```js
+```diff
 define(function () {
 +    // Form to display when adding new tasks
 +    var NEW_TASK_FORM = {
@@ -929,7 +928,7 @@ Additionally, we need to make changes to our template to select specific tasks
 in response to some user gesture. Here, we will select tasks when a user clicks 
 the description.
 
-```html
+```diff
 <div ng-controller="TodoController">
     <div>
         <a ng-click="setVisibility(true)">All</a>
@@ -955,7 +954,7 @@ __tutorials/todo/res/templates/todo.html__
 Finally, the `TodoController` uses the `dialogService` now, so we need to 
 declare that dependency in its extension definition:
 
-```js
+```diff
 define([
     'openmct',
     './src/controllers/TodoController'
@@ -1059,7 +1058,7 @@ In this section, our goal is to:
 To support the first two, we'll need to expose some methods for checking these 
 states in the controller:
 
-```js
+```diff
 define(function () {
     // Form to display when adding new tasks
     var NEW_TASK_FORM = {
@@ -1176,7 +1175,7 @@ states visually, and to generally improve the appearance of our view. We add
 another file to the res directory of our bundle; this time, it is `css/todo.css` 
 (with the `css` directory again being a convention.)
 
-```css
+```diff
 .example-todo div.example-button-group {
     margin-top: 12px;
     margin-bottom: 12px;
@@ -1220,7 +1219,7 @@ To include this CSS file in our running instance of Open MCT, we need to
 declare it in our bundle definition, this time as an extension of category 
 `stylesheets`:
 
-```js
+```diff
 define([
     'openmct',
     './src/controllers/TodoController'
@@ -1300,7 +1299,7 @@ To-Do List's type above; now To-Do Lists will start off empty.
 
 Finally, let's utilize these changes from our view's template:
 
-```html
+```diff
 + <div ng-controller="TodoController" class="example-todo">
 +     <div class="example-button-group">
 +         <a ng-class="{ selected: checkVisibility(true) }"
@@ -1360,7 +1359,7 @@ We'll also be defining some custom styles, so we'll include that extension as
 well. We'll be creating this plugin in `tutorials/bargraph`, so our initial 
 bundle definition looks like:
 
-```js
+```diff
 define([
     'openmct'
 ], function (
@@ -1407,7 +1406,7 @@ For this tutorial, we'll assume that we've sketched out our template and CSS
 file ahead of time to describe the general look we want for the view. These 
 look like:
 
-```html
+```diff
 <div class="example-bargraph">
     <div class="example-tick-labels">
         <div class="example-tick-label" style="bottom: 0%">High</div>
@@ -1458,7 +1457,7 @@ bar corresponds to which telemetry point. Inline `style` attributes are used
 wherever dynamic positioning (handled by a script) is anticipated.
 The corresponding CSS file which styles and positions these elements:
 
-```css
+```diff
 .example-bargraph {
     position: absolute;
     top: 0;
@@ -1556,7 +1555,7 @@ Notably, we will not try to show telemetry data after this step.
 
 To support this, we will add a new controller which supports our Bar Graph view:
 
-```js
+```diff
 define(function () {
     function BarGraphController($scope, telemetryHandler) {
         var handle;
@@ -1608,7 +1607,7 @@ telemetry objects in view, as well as the width for each bar.
 
 We will also utilize this from our template:
 
-```html
+```diff
 + <div class="example-bargraph" ng-controller="BarGraphController">
     <div class="example-tick-labels">
 +       <div ng-repeat="value in [low, middle, high] track by $index"
@@ -1661,7 +1660,7 @@ Finally, we expose our controller from our bundle definition. Note that the
 depends declaration includes both `$scope` as well as the `telemetryHandler` 
 service we made use of.
 
-```js
+```diff
 define([
     'openmct',
     './src/controllers/BarGraphController'
@@ -1716,7 +1715,7 @@ First, let's add expose some more functionality from our controller. To make it
 simple, we'll expose the top and bottom for a bar graph for a given 
 telemetry-providing domain object, as percentages.
 
-```js
+```diff
 define(function () {
     function BarGraphController($scope, telemetryHandler) {
         var handle;
@@ -1768,7 +1767,7 @@ decide this.
 
 Next, we utilize this functionality from the template:
 
-```html
+```diff
 <div class="example-bargraph" ng-controller="BarGraphController">
     <div class="example-tick-labels">
         <div ng-repeat="value in [low, middle, high] track by $index"
@@ -1827,7 +1826,7 @@ when we return to our view later, those changes will be persisted.
 
 First, let's add a tool bar for changing these three values in Edit mode:
 
-```js
+```diff
 define([
     'openmct',
     './src/controllers/BarGraphController'
@@ -1901,7 +1900,7 @@ a view proxy to work from. We will add this to our controller, and additionally
 will start reading/writing those properties to the view's `configuration` 
 object.
 
-```js
+```diff
 define(function () {
     function BarGraphController($scope, telemetryHandler) {
         var handle;
@@ -2024,7 +2023,7 @@ For purposes of this tutorial, a simple node server is provided to stand
 in place of this existing telemetry system. It generates real-time data 
 and exposes it over a WebSocket connection.
 
-```js
+```diff
 /*global require,process,console*/
 
 var CONFIG = {
@@ -2206,7 +2205,7 @@ used by the server. It uses a custom format and, for purposes of example,
 contains three "subsystems" containing a mix of numeric and string-based 
 telemetry.
 
-```json
+```diff
 {
     "name": "Example Spacecraft",
     "identifier": "sc",
@@ -2433,7 +2432,7 @@ server. Our first step will be to add a service that will handle interactions
 with the server; this will not be used by Open MCT directly, but will be 
 used by subsequent components we add.
 
-```js
+```diff
 /*global define,WebSocket*/
 
 define(
@@ -2488,7 +2487,7 @@ subsystems. This means that we need to convert the data from the dictionary
 into domain object models, and expose these to Open MCT via a 
 `modelService`.
 
-```js
+```diff
 /*global define*/
 
 define(
@@ -2622,7 +2621,7 @@ This allows our telemetry dictionary to be expressed as domain object models
 fix this, we will need another script which will add these subsystems to the 
 root-level object we added in Step 1.
 
-```js
+```diff
 /*global define*/
 
 define(
@@ -2687,7 +2686,7 @@ Finally, we wire in these changes by modifying our plugin's `bundle.js` to
 provide metadata about how these pieces interact (both with each other, and 
 with the platform):
 
-```js
+```diff
 define([
     'openmct',
 +   './src/ExampleTelemetryServerAdapter',
@@ -2835,7 +2834,7 @@ will do so for the server's historical telemetry.
 Our first step will be to add a method to our server adapter which allows us to 
 send history requests to the server:
 
-```js
+```diff
 /*global define,WebSocket*/
 
 define(
@@ -2894,7 +2893,7 @@ identifier, the pending promise is resolved.
 This `history` method will be used by a `telemetryService` provider which we 
 will implement:
 
-```js
+```diff
 /*global define*/
 
 define(
@@ -2980,7 +2979,7 @@ Finally, note that we also have a `subscribe` method, to satisfy the interface o
 
 This script uses an `ExampleTelemetrySeries` class, which looks like:
 
-```js
+```diff
 /*global define*/
 
 define(
@@ -3012,7 +3011,7 @@ it with the interface expected by the platform (the methods shown.)
 
 Finally, we expose this `telemetryService` provider declaratively:
 
-```js
+```diff
 define([
     'openmct',
     './src/ExampleTelemetryServerAdapter',
@@ -3127,7 +3126,7 @@ Finally, we want to utilize the server's ability to subscribe to telemetry
 from Open MCT. To do this, first we want to expose some new methods for 
 this from our server adapter:
 
-```js
+```diff
 /*global define,WebSocket*/
 
 define(
@@ -3200,7 +3199,7 @@ with these subscriptions.
 
 We then need only to utilize these methods from our `telemetryService`:
 
-```js
+```diff
 /*global define*/
 
 define(
@@ -3306,4 +3305,4 @@ server can handle this.)
 Running Open MCT again, we can still plot our historical telemetry - but 
 now we also see that it updates in real-time as more data comes in from the 
 server.
- 
+ 

example/msl/bundle.js

@@ -37,79 +37,74 @@ define([
     legacyRegistry.register("example/msl", {
         "name" : "Mars Science Laboratory Data Adapter",
         "extensions" : {
-            "types": [
-                {
-                    "name":"Mars Science Laboratory",
-                    "key": "msl.curiosity",
-                    "cssclass": "icon-object"
-                },
-                {
-                    "name": "Instrument",
-                    "key": "msl.instrument",
-                    "cssclass": "icon-object",
-                    "model": {"composition": []}
-                },
-                {
-                    "name": "Measurement",
-                    "key": "msl.measurement",
-                    "cssclass": "icon-telemetry",
-                    "model": {"telemetry": {}},
-                    "telemetry": {
-                        "source": "rems.source",
-                        "domains": [
-                            {
-                                "name": "Time",
-                                "key": "utc",
-                                "format": "utc"
-                            }
-                        ]
-                    }
+        "types": [
+            {
+                "name":"Mars Science Laboratory",
+                "key": "msl.curiosity",
+                "cssclass": "icon-object"
+            },
+            {
+                "name": "Instrument",
+                "key": "msl.instrument",
+                "cssclass": "icon-object",
+                "model": {"composition": []}
+            },
+            {
+                "name": "Measurement",
+                "key": "msl.measurement",
+                "cssclass": "icon-telemetry",
+                "model": {"telemetry": {}},
+                "telemetry": {
+                    "source": "rems.source",
+                    "domains": [
+                        {
+                            "name": "Time",
+                            "key": "utc",
+                            "format": "utc"
+                        }
+                    ]
                 }
-            ],
-            "constants": [
-                {
-                    "key": "REMS_WS_URL",
-                    "value": "/proxyUrl?url=http://cab.inta-csic.es/rems/wp-content/plugins/marsweather-widget/api.php"
+            }
+        ],
+        "constants": [
+            {
+                "key": "REMS_WS_URL",
+                "value": "/proxyUrl?url=http://cab.inta-csic.es/rems/wp-content/plugins/marsweather-widget/api.php"
+            }
+        ],
+        "roots": [
+            {
+                "id": "msl:curiosity",
+                "priority" : "preferred",
+                "model": {
+                    "type": "msl.curiosity",
+                    "name": "Mars Science Laboratory",
+                    "composition": ["msl_tlm:rems"]
                 }
-            ],
-            "roots": [
-                {
-                    "id": "msl:curiosity"
-                }
-            ],
-            "models": [
-                {
-                    "id": "msl:curiosity",
-                    "priority": "preferred",
-                    "model": {
-                        "type": "msl.curiosity",
-                        "name": "Mars Science Laboratory",
-                        "composition": ["msl_tlm:rems"]
-                    }
-                }
-            ],
-            "services": [
-                {
-                    "key":"rems.adapter",
-                    "implementation": RemsTelemetryServerAdapter,
-                    "depends": ["$q", "$http", "$log", "REMS_WS_URL"]
-                }
-            ],
-            "components": [
-                {
-                    "provides": "modelService",
-                    "type": "provider",
-                    "implementation": RemsTelemetryModelProvider,
-                    "depends": ["rems.adapter"]
-                },
-                {
-                    "provides": "telemetryService",
-                    "type": "provider",
-                    "implementation": RemsTelemetryProvider,
-                    "depends": ["rems.adapter", "$q"]
-                }
-            ]
-        }
+            }
+        ],
+        "services": [
+            {
+                "key":"rems.adapter",
+                "implementation": RemsTelemetryServerAdapter,
+                "depends": ["$q", "$http", "$log", "REMS_WS_URL"]
+            }
+        ],
+        "components": [
+            {
+                "provides": "modelService",
+                "type": "provider",
+                "implementation": RemsTelemetryModelProvider,
+                "depends": ["rems.adapter"]
+            },
+            {
+                "provides": "telemetryService",
+                "type": "provider",
+                "implementation": RemsTelemetryProvider,
+                "depends": ["rems.adapter", "$q"]
+            }
+        ]
+    }
     });
 });
 

example/scratchpad/bundle.js

@@ -33,11 +33,6 @@ define([
     legacyRegistry.register("example/scratchpad", {
         "extensions": {
             "roots": [
-                {
-                    "id": "scratch:root"
-                }
-            ],
-            "models": [
                 {
                     "id": "scratch:root",
                     "model": {

example/taxonomy/bundle.js

@@ -35,11 +35,6 @@ define([
         "description": "Example illustrating the addition of a static top-level hierarchy",
         "extensions": {
             "roots": [
-                {
-                    "id": "exampleTaxonomy"
-                }
-            ],
-            "models": [
                 {
                     "id": "exampleTaxonomy",
                     "model": {

index.html

@@ -32,13 +32,12 @@
             [
                 'example/imagery',
                 'example/eventGenerator',
-                'example/generator'
+                'example/generator',
+                'platform/features/my-items',
+                'platform/persistence/local'
             ].forEach(
                 openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
             );
-            openmct.install(openmct.plugins.myItems);
-            openmct.install(openmct.plugins.localStorage);
-            openmct.install(openmct.plugins.espresso);
             openmct.start();
         });
     </script>

karma.conf.js

@@ -76,7 +76,7 @@ module.exports = function(config) {
         // Specify browsers to run tests in.
         // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
         browsers: [
-            'Chrome'
+            'PhantomJS'
         ],
 
         // Code coverage reporting.

package.json

@@ -25,12 +25,13 @@
     "jsdoc": "^3.3.2",
     "jshint": "^2.7.0",
     "karma": "^0.13.3",
-    "karma-chrome-launcher": "^0.1.12",
+    "karma-chrome-launcher": "^0.1.8",
     "karma-cli": "0.0.4",
     "karma-coverage": "^0.5.3",
     "karma-html-reporter": "^0.2.7",
     "karma-jasmine": "^0.1.5",
     "karma-junit-reporter": "^0.3.8",
+    "karma-phantomjs-launcher": "^1.0.0",
     "karma-requirejs": "^0.2.2",
     "lodash": "^3.10.1",
     "markdown-toc": "^0.11.7",
@@ -39,6 +40,7 @@
     "mkdirp": "^0.5.1",
     "moment": "^2.11.1",
     "node-bourbon": "^4.2.3",
+    "phantomjs-prebuilt": "2.1.11 || >2.1.12 <3.0.0",
     "requirejs": "2.1.x",
     "split": "^1.0.0"
   },

platform/commonUI/dialog/bundle.js

@@ -53,8 +53,7 @@ define([
                     "depends": [
                         "overlayService",
                         "$q",
-                        "$log",
-                        "$document"
+                        "$log"
                     ]
                 },
                 {

platform/commonUI/dialog/src/DialogService.js

@@ -35,15 +35,11 @@ define(
          * @memberof platform/commonUI/dialog
          * @constructor
          */
-        function DialogService(overlayService, $q, $log, $document) {
+        function DialogService(overlayService, $q, $log) {
             this.overlayService = overlayService;
             this.$q = $q;
             this.$log = $log;
             this.activeOverlay = undefined;
-
-            this.findBody = function () {
-                return $document.find('body');
-            };
         }
 
         /**
@@ -64,8 +60,7 @@ define(
             // input is asynchronous.
             var deferred = this.$q.defer(),
                 self = this,
-                overlay,
-                handleEscKeydown;
+                overlay;
 
             // Confirm function; this will be passed in to the
             // overlay-dialog template and associated with a
@@ -81,22 +76,13 @@ define(
             // Cancel or X button click
             function cancel() {
                 deferred.reject();
-                self.findBody().off('keydown', handleEscKeydown);
                 self.dismissOverlay(overlay);
             }
 
-            handleEscKeydown = function (event) {
-                if (event.keyCode === 27) {
-                    cancel();
-                }
-            };
-
             // Add confirm/cancel callbacks
             model.confirm = confirm;
             model.cancel = cancel;
 
-            this.findBody().on('keydown', handleEscKeydown);
-
             if (this.canShowDialog(model)) {
                 // Add the overlay using the OverlayService, which
                 // will handle actual insertion into the DOM

platform/commonUI/dialog/test/DialogServiceSpec.js

@@ -33,8 +33,6 @@ define(
                 mockLog,
                 mockOverlay,
                 mockDeferred,
-                mockDocument,
-                mockBody,
                 dialogService;
 
             beforeEach(function () {
@@ -58,13 +56,6 @@ define(
                     "deferred",
                     ["resolve", "reject"]
                 );
-                mockDocument = jasmine.createSpyObj(
-                  "$document",
-                  ["find"]
-                );
-                mockBody = jasmine.createSpyObj('body', ['on', 'off']);
-                mockDocument.find.andReturn(mockBody);
-
                 mockDeferred.promise = "mock promise";
 
                 mockQ.defer.andReturn(mockDeferred);
@@ -73,8 +64,7 @@ define(
                 dialogService = new DialogService(
                     mockOverlayService,
                     mockQ,
-                    mockLog,
-                    mockDocument
+                    mockLog
                 );
             });
 
@@ -140,36 +130,6 @@ define(
                 );
             });
 
-            it("adds a keydown event listener to the body", function () {
-                dialogService.getUserInput({}, {});
-                expect(mockDocument.find).toHaveBeenCalledWith("body");
-                expect(mockBody.on).toHaveBeenCalledWith("keydown", jasmine.any(Function));
-            });
-
-            it("destroys the event listener when the dialog is cancelled", function () {
-                dialogService.getUserInput({}, {});
-                mockOverlayService.createOverlay.mostRecentCall.args[1].cancel();
-                expect(mockBody.off).toHaveBeenCalledWith("keydown", jasmine.any(Function));
-            });
-
-            it("cancels the dialog when an escape keydown event is triggered", function () {
-                dialogService.getUserInput({}, {});
-                mockBody.on.mostRecentCall.args[1]({
-                    keyCode: 27
-                });
-                expect(mockDeferred.reject).toHaveBeenCalled();
-                expect(mockDeferred.resolve).not.toHaveBeenCalled();
-            });
-
-            it("ignores non escape keydown events", function () {
-                dialogService.getUserInput({}, {});
-                mockBody.on.mostRecentCall.args[1]({
-                    keyCode: 13
-                });
-                expect(mockDeferred.reject).not.toHaveBeenCalled();
-                expect(mockDeferred.resolve).not.toHaveBeenCalled();
-            });
-
             describe("the blocking message dialog", function () {
                 var dialogModel = {};
                 var dialogHandle;

platform/commonUI/general/res/sass/overlay/_overlay.scss

@@ -55,7 +55,9 @@
         height: 70%;
         width: 50%;
         min-height: 300px;
+        max-height: 800px;
         min-width: 600px;
+        max-width: 1000px;
         z-index: 101;
         > .contents {
             $m: $overlayMargin;
@@ -139,4 +141,4 @@
     $h: 225px;
     min-height: $h;
     height: $h;
-}
+}

platform/features/plot/README.md

@@ -1,37 +0,0 @@
-# Plot README
-
-## Chart 
-
-The `mct-chart` directive is used to support drawing of simple charts. It is 
-present to support the Plot view, and its functionality is limited to the 
-functionality that is relevant for that view.
-
-This directive is used at the element level and takes one attribute, `draw` 
-which is an Angular expression which will should evaluate to a drawing object. 
-This drawing object should contain the following properties:
-
-* `dimensions`: The size, in logical coordinates, of the chart area. A 
-two-element array or numbers. 
-* `origin`: The position, in logical coordinates, of the lower-left corner of 
-the chart area. A two-element array or numbers. 
-* `lines`: An array of lines (e.g. as a plot line) to draw, where each line is 
-expressed as an object containing: 
-    * `buffer`: A Float32Array containing points in the line, in logical 
-    coordinates, in sequential x,y pairs. 
-    * `color`: The color of the line, as a four-element RGBA array, where 
-    each element is a number in the range of 0.0-1.0. 
-    * `points`: The number of points in the line. 
-* `boxes`: An array of rectangles to draw in the chart area. Each is an object 
-containing: 
-    * `start`: The first corner of the rectangle, as a two-element array of 
-    numbers, in logical coordinates. 
-    * `end`: The opposite corner of the rectangle, as a two-element array of 
-    numbers, in logical coordinates. color : The color of the line, as a 
-    four-element RGBA array, where each element is a number in the range of 
-    0.0-1.0. 
-
-While `mct-chart` is intended to support plots specifically, it does perform 
-some useful management of canvas objects (e.g. choosing between WebGL and Canvas 
-2D APIs for drawing based on browser support) so its usage is recommended when 
-its supported drawing primitives are sufficient for other charting tasks. 
- 

platform/features/timeline/bundle.js

@@ -38,7 +38,6 @@ define([
     "./src/directives/MCTSwimlaneDrop",
     "./src/directives/MCTSwimlaneDrag",
     "./src/services/ObjectLoader",
-    "./src/chart/MCTTimelineChart",
     "text!./res/templates/values.html",
     "text!./res/templates/timeline.html",
     "text!./res/templates/activity-gantt.html",
@@ -68,7 +67,6 @@ define([
     MCTSwimlaneDrop,
     MCTSwimlaneDrag,
     ObjectLoader,
-    MCTTimelineChart,
     valuesTemplate,
     timelineTemplate,
     activityGanttTemplate,
@@ -558,14 +556,6 @@ define([
                     "depends": [
                         "dndService"
                     ]
-                },
-                {
-                    "key": "mctTimelineChart",
-                    "implementation": MCTTimelineChart,
-                    "depends": [
-                        "$interval",
-                        "$log"
-                    ]
                 }
             ],
             "services": [

platform/features/timeline/res/templates/resource-graphs.html

@@ -22,7 +22,7 @@
 <span ng-controller="TimelineGraphController as graphController">
     <div class="t-graph l-graph" ng-repeat="graph in parameters.graphs">
         <div class="l-graph-area l-canvas-holder">
-            <mct-timeline-chart draw="graph.drawingObject"></mct-timeline-chart>
+            <mct-chart draw="graph.drawingObject"></mct-chart>
         </div>
         <div class="t-graph-labels l-graph-labels">
             <mct-include key="'timeline-resource-graph-labels'"
@@ -31,4 +31,4 @@
             </mct-include>
         </div>
     </div>
-</span>
+</span>

platform/features/timeline/src/chart/Canvas2DChart.js

@@ -1,117 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, 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.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    [],
-    function () {
-
-        /**
-         * Create a new chart which uses Canvas's 2D API for rendering.
-         *
-         * @memberof platform/features/plot
-         * @constructor
-         * @implements {platform/features/plot.Chart}
-         * @param {CanvasElement} canvas the canvas object to render upon
-         * @throws {Error} an error is thrown if Canvas's 2D API is unavailable.
-         */
-        function Canvas2DChart(canvas) {
-            this.canvas = canvas;
-            this.c2d = canvas.getContext('2d');
-            this.width = canvas.width;
-            this.height = canvas.height;
-            this.dimensions = [this.width, this.height];
-            this.origin = [0, 0];
-
-            if (!this.c2d) {
-                throw new Error("Canvas 2d API unavailable.");
-            }
-        }
-
-        // Convert from logical to physical x coordinates
-        Canvas2DChart.prototype.x = function (v) {
-            return ((v - this.origin[0]) / this.dimensions[0]) * this.width;
-        };
-
-        // Convert from logical to physical y coordinates
-        Canvas2DChart.prototype.y = function (v) {
-            return this.height -
-                ((v - this.origin[1]) / this.dimensions[1]) * this.height;
-        };
-
-        // Set the color to be used for drawing operations
-        Canvas2DChart.prototype.setColor = function (color) {
-            var mappedColor = color.map(function (c, i) {
-                return i < 3 ? Math.floor(c * 255) : (c);
-            }).join(',');
-            this.c2d.strokeStyle = "rgba(" + mappedColor + ")";
-            this.c2d.fillStyle = "rgba(" + mappedColor + ")";
-        };
-
-
-        Canvas2DChart.prototype.clear = function () {
-            var canvas = this.canvas;
-            this.width = canvas.width;
-            this.height = canvas.height;
-            this.c2d.clearRect(0, 0, this.width, this.height);
-        };
-
-        Canvas2DChart.prototype.setDimensions = function (newDimensions, newOrigin) {
-            this.dimensions = newDimensions;
-            this.origin = newOrigin;
-        };
-
-        Canvas2DChart.prototype.drawLine = function (buf, color, points) {
-            var i;
-
-            this.setColor(color);
-
-            // Configure context to draw two-pixel-thick lines
-            this.c2d.lineWidth = 2;
-
-            // Start a new path...
-            if (buf.length > 1) {
-                this.c2d.beginPath();
-                this.c2d.moveTo(this.x(buf[0]), this.y(buf[1]));
-            }
-
-            // ...and add points to it...
-            for (i = 2; i < points * 2; i = i + 2) {
-                this.c2d.lineTo(this.x(buf[i]), this.y(buf[i + 1]));
-            }
-
-            // ...before finally drawing it.
-            this.c2d.stroke();
-        };
-
-        Canvas2DChart.prototype.drawSquare = function (min, max, color) {
-            var x1 = this.x(min[0]),
-                y1 = this.y(min[1]),
-                w = this.x(max[0]) - x1,
-                h = this.y(max[1]) - y1;
-
-            this.setColor(color);
-            this.c2d.fillRect(x1, y1, w, h);
-        };
-
-        return Canvas2DChart;
-    }
-);

platform/features/timeline/src/chart/GLChart.js

@@ -1,160 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, 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.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * Module defining GLPlot. Created by vwoeltje on 11/12/14.
- */
-define(
-    [],
-    function () {
-
-        // WebGL shader sources (for drawing plain colors)
-        var FRAGMENT_SHADER = [
-                "precision mediump float;",
-                "uniform vec4 uColor;",
-                "void main(void) {",
-                "gl_FragColor = uColor;",
-                "}"
-            ].join('\n'),
-            VERTEX_SHADER = [
-                "attribute vec2 aVertexPosition;",
-                "uniform vec2 uDimensions;",
-                "uniform vec2 uOrigin;",
-                "void main(void) {",
-                "gl_Position = vec4(2.0 * ((aVertexPosition - uOrigin) / uDimensions) - vec2(1,1), 0, 1);",
-                "}"
-            ].join('\n');
-
-        /**
-         * Create a new chart which uses WebGL for rendering.
-         *
-         * @memberof platform/features/plot
-         * @constructor
-         * @implements {platform/features/plot.Chart}
-         * @param {CanvasElement} canvas the canvas object to render upon
-         * @throws {Error} an error is thrown if WebGL is unavailable.
-         */
-        function GLChart(canvas) {
-            var gl = canvas.getContext("webgl", { preserveDrawingBuffer: true }) ||
-                    canvas.getContext("experimental-webgl", { preserveDrawingBuffer: true }),
-                vertexShader,
-                fragmentShader,
-                program,
-                aVertexPosition,
-                uColor,
-                uDimensions,
-                uOrigin;
-
-            // Ensure a context was actually available before proceeding
-            if (!gl) {
-                throw new Error("WebGL unavailable.");
-            }
-
-            // Initialize shaders
-            vertexShader = gl.createShader(gl.VERTEX_SHADER);
-            gl.shaderSource(vertexShader, VERTEX_SHADER);
-            gl.compileShader(vertexShader);
-            fragmentShader = gl.createShader(gl.FRAGMENT_SHADER);
-            gl.shaderSource(fragmentShader, FRAGMENT_SHADER);
-            gl.compileShader(fragmentShader);
-
-            // Assemble vertex/fragment shaders into programs
-            program = gl.createProgram();
-            gl.attachShader(program, vertexShader);
-            gl.attachShader(program, fragmentShader);
-            gl.linkProgram(program);
-            gl.useProgram(program);
-
-            // Get locations for attribs/uniforms from the
-            // shader programs (to pass values into shaders at draw-time)
-            aVertexPosition = gl.getAttribLocation(program, "aVertexPosition");
-            uColor = gl.getUniformLocation(program, "uColor");
-            uDimensions = gl.getUniformLocation(program, "uDimensions");
-            uOrigin = gl.getUniformLocation(program, "uOrigin");
-            gl.enableVertexAttribArray(aVertexPosition);
-
-            // Create a buffer to holds points which will be drawn
-            this.buffer = gl.createBuffer();
-
-            // Use a line width of 2.0 for legibility
-            gl.lineWidth(2.0);
-
-            // Enable blending, for smoothness
-            gl.enable(gl.BLEND);
-            gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
-
-            this.gl = gl;
-            this.aVertexPosition = aVertexPosition;
-            this.uColor = uColor;
-            this.uDimensions = uDimensions;
-            this.uOrigin = uOrigin;
-        }
-
-        // Utility function to handle drawing of a buffer;
-        // drawType will determine whether this is a box, line, etc.
-        GLChart.prototype.doDraw = function (drawType, buf, color, points) {
-            var gl = this.gl;
-            gl.bindBuffer(gl.ARRAY_BUFFER, this.buffer);
-            gl.bufferData(gl.ARRAY_BUFFER, buf, gl.DYNAMIC_DRAW);
-            gl.vertexAttribPointer(this.aVertexPosition, 2, gl.FLOAT, false, 0, 0);
-            gl.uniform4fv(this.uColor, color);
-            gl.drawArrays(drawType, 0, points);
-        };
-
-        GLChart.prototype.clear = function () {
-            var gl = this.gl;
-
-            // Set the viewport size; note that we use the width/height
-            // that our WebGL context reports, which may be lower
-            // resolution than the canvas we requested.
-            gl.viewport(
-                0,
-                0,
-                gl.drawingBufferWidth,
-                gl.drawingBufferHeight
-            );
-            gl.clear(gl.COLOR_BUFFER_BIT + gl.DEPTH_BUFFER_BIT);
-        };
-
-
-        GLChart.prototype.setDimensions = function (dimensions, origin) {
-            var gl = this.gl;
-            if (dimensions && dimensions.length > 0 &&
-                origin && origin.length > 0) {
-                gl.uniform2fv(this.uDimensions, dimensions);
-                gl.uniform2fv(this.uOrigin, origin);
-            }
-        };
-
-        GLChart.prototype.drawLine = function (buf, color, points) {
-            this.doDraw(this.gl.LINE_STRIP, buf, color, points);
-        };
-
-        GLChart.prototype.drawSquare = function (min, max, color) {
-            this.doDraw(this.gl.TRIANGLE_FAN, new Float32Array(
-                min.concat([min[0], max[1]]).concat(max).concat([max[0], min[1]])
-            ), color, 4);
-        };
-
-        return GLChart;
-    }
-);

platform/features/timeline/src/chart/MCTTimelineChart.js

@@ -1,250 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, 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.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * Module defining MCTTimelineChart. Created by vwoeltje on 11/12/14.
- */
-define(
-    ["./GLChart", "./Canvas2DChart"],
-    function (GLChart, Canvas2DChart) {
-
-        var TEMPLATE = "<canvas style='position: absolute; background: none; width: 100%; height: 100%;'></canvas>";
-
-        /**
-         * The mct-timeline-chart directive provides a canvas element which can be
-         * drawn upon, to support Plot view and similar visualizations.
-         *
-         * This directive takes one attribute, "draw", which is an Angular
-         * expression which will be two-way bound to a drawing object. This
-         * drawing object should contain:
-         *
-         * * `dimensions`: An object describing the logical bounds of the
-         *   drawable area, containing two fields:
-         *   * `origin`: The position, in logical coordinates, of the
-         *     lower-left corner of the chart area. A two-element array.
-         *   * `dimensions`: A two-element array containing the width
-         *     and height of the chart area, in logical coordinates.
-         * * `lines`: An array of lines to be drawn, where each line is
-         *   expressed as an object containing:
-         *   * `buffer`: A Float32Array containing points in the line,
-         *     in logical coordinate, in sequential x/y pairs.
-         *   * `color`: The color of the line, as a four-element RGBA
-         *     array, where each element is in the range of 0.0-1.0
-         *   * `points`: The number of points in the line.
-         * * `boxes`: An array of rectangles to draw in the chart area
-         *   (used for marquee zoom). Each is an object containing:
-         *   * `start`: The first corner of the rectangle (as a two-element
-         *      array, logical coordinates)
-         *   * `end`: The opposite corner of the rectangle (again, as a
-         *      two-element array)
-         *   * `color`: The color of the box, as a four-element RGBA
-         *     array, where each element is in the range of 0.0-1.0
-         *
-         * @memberof platform/features/plot
-         * @constructor
-         */
-        function MCTTimelineChart($interval, $log) {
-            // Get an underlying chart implementation
-            function getChart(Charts, canvas) {
-                // Try the first available option...
-                var Chart = Charts[0];
-
-                // This function recursively try-catches all options;
-                // if these all fail, issue a warning.
-                if (!Chart) {
-                    $log.warn("Cannot initialize mct-timeline-chart.");
-                    return undefined;
-                }
-
-                // Try first option; if it fails, try remaining options
-                try {
-                    return new Chart(canvas);
-                } catch (e) {
-                    $log.warn([
-                        "Could not instantiate chart",
-                        Chart.name,
-                        ";",
-                        e.message
-                    ].join(" "));
-
-                    return getChart(Charts.slice(1), canvas);
-                }
-            }
-
-            function linkChart(scope, element) {
-                var canvas = element.find("canvas")[0],
-                    activeInterval,
-                    chart;
-
-                // Handle drawing, based on contents of the "draw" object
-                // in scope
-                function doDraw(draw) {
-                    // Ensure canvas context has same resolution
-                    // as canvas element
-                    canvas.width = canvas.offsetWidth;
-                    canvas.height = canvas.offsetHeight;
-
-                    // Clear previous contents
-                    chart.clear();
-
-                    // Nothing to draw if no draw object defined
-                    if (!draw) {
-                        return;
-                    }
-
-                    // Set logical boundaries for the chart
-                    chart.setDimensions(
-                        draw.dimensions || [1, 1],
-                        draw.origin || [0, 0]
-                    );
-
-                    // Draw line segments
-                    (draw.lines || []).forEach(function (line) {
-                        chart.drawLine(
-                            line.buffer,
-                            line.color,
-                            line.points
-                        );
-                    });
-
-                    // Draw boxes (e.g. marquee zoom rect)
-                    (draw.boxes || []).forEach(function (box) {
-                        chart.drawSquare(
-                            box.start,
-                            box.end,
-                            box.color
-                        );
-                    });
-
-                }
-
-                // Issue a drawing call, if-and-only-if canvas size
-                // has changed. This will be called on a timer, since
-                // there is no event to depend on.
-                function drawIfResized() {
-                    if (canvas.width !== canvas.offsetWidth ||
-                            canvas.height !== canvas.offsetHeight) {
-                        doDraw(scope.draw);
-                        scope.$apply();
-                    }
-                }
-
-                // Stop watching for changes to size (scope destroyed)
-                function releaseInterval() {
-                    if (activeInterval) {
-                        $interval.cancel(activeInterval);
-                    }
-                }
-
-                // Switch from WebGL to plain 2D if context is lost
-                function fallbackFromWebGL() {
-                    element.html(TEMPLATE);
-                    canvas = element.find("canvas")[0];
-                    chart = getChart([Canvas2DChart], canvas);
-                    if (chart) {
-                        doDraw(scope.draw);
-                    }
-                }
-
-                // Try to initialize a chart.
-                chart = getChart([GLChart, Canvas2DChart], canvas);
-
-                // If that failed, there's nothing more we can do here.
-                // (A warning will already have been issued)
-                if (!chart) {
-                    return;
-                }
-
-                // WebGL is a bit of a special case; it may work, then fail
-                // later for various reasons, so we need to listen for this
-                // and fall back to plain canvas drawing when it occurs.
-                canvas.addEventListener("webglcontextlost", fallbackFromWebGL);
-
-                // Check for resize, on a timer
-                activeInterval = $interval(drawIfResized, 1000, 0, false);
-
-                // Watch "draw" for external changes to the set of
-                // things to be drawn.
-                scope.$watchCollection("draw", doDraw);
-
-                // Stop checking for resize when scope is destroyed
-                scope.$on("$destroy", releaseInterval);
-            }
-
-            return {
-                // Apply directive only to elements
-                restrict: "E",
-
-                // Template to use (a canvas element)
-                template: TEMPLATE,
-
-                // Link function; set up scope
-                link: linkChart,
-
-                // Initial, isolate scope for the directive
-                scope: { draw: "=" }
-            };
-        }
-
-        /**
-         * @interface platform/features/plot.Chart
-         * @private
-         */
-
-        /**
-         * Clear the chart.
-         * @method platform/features/plot.Chart#clear
-         */
-        /**
-         * Set the logical boundaries of the chart.
-         * @param {number[]} dimensions the horizontal and
-         *        vertical dimensions of the chart
-         * @param {number[]} origin the horizontal/vertical
-         *        origin of the chart
-         * @memberof platform/features/plot.Chart#setDimensions
-         */
-        /**
-         * Draw the supplied buffer as a line strip (a sequence
-         * of line segments), in the chosen color.
-         * @param {Float32Array} buf the line strip to draw,
-         *        in alternating x/y positions
-         * @param {number[]} color the color to use when drawing
-         *        the line, as an RGBA color where each element
-         *        is in the range of 0.0-1.0
-         * @param {number} points the number of points to draw
-         * @memberof platform/features/plot.Chart#drawLine
-         */
-        /**
-         * Draw a rectangle extending from one corner to another,
-         * in the chosen color.
-         * @param {number[]} min the first corner of the rectangle
-         * @param {number[]} max the opposite corner
-         * @param {number[]} color the color to use when drawing
-         *        the rectangle, as an RGBA color where each element
-         *        is in the range of 0.0-1.0
-         * @memberof platform/features/plot.Chart#drawSquare
-         */
-
-        return MCTTimelineChart;
-    }
-);
-

platform/features/timeline/src/controllers/graph/TimelineGraph.js

@@ -167,7 +167,7 @@ define(
                  */
                 setBounds: function (offset, duration) {
                     // We don't update in-place, because we need the change
-                    // to trigger a watch in mct-timeline-chart.
+                    // to trigger a watch in mct-chart.
                     drawingObject.origin = [offset, drawingObject.origin[1]];
                     drawingObject.dimensions = [duration, drawingObject.dimensions[1]];
                 },

platform/features/timeline/src/controllers/graph/TimelineGraphRenderer.js

@@ -26,7 +26,7 @@ define(
 
         /**
          * Responsible for preparing data for display by
-         * `mct-timeline-chart` in a timeline's resource graph.
+         * `mct-chart` in a timeline's resource graph.
          * @constructor
          */
         function TimelineGraphRenderer() {
@@ -54,7 +54,7 @@ define(
                  * Convert an HTML color (in #-prefixed 6-digit hexadecimal)
                  * to an array of floating point values in a range of 0.0-1.0.
                  * An alpha element is included to facilitate display in an
-                 * `mct-timeline-chart` (which uses WebGL.)
+                 * `mct-chart` (which uses WebGL.)
                  * @param {string} the color
                  * @returns {number[]} the same color, in floating-point format
                  */

platform/features/timeline/test/chart/Canvas2DChartSpec.js

@@ -1,95 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, 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.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * MergeModelsSpec. Created by vwoeltje on 11/6/14.
- */
-define(
-    ["../../src/chart/Canvas2DChart"],
-    function (Canvas2DChart) {
-
-        describe("A canvas 2d chart", function () {
-            var mockCanvas,
-                mock2d,
-                chart;
-
-            beforeEach(function () {
-                mockCanvas = jasmine.createSpyObj("canvas", ["getContext"]);
-                mock2d = jasmine.createSpyObj(
-                    "2d",
-                    [
-                        "clearRect",
-                        "beginPath",
-                        "moveTo",
-                        "lineTo",
-                        "stroke",
-                        "fillRect"
-                    ]
-                );
-                mockCanvas.getContext.andReturn(mock2d);
-
-                chart = new Canvas2DChart(mockCanvas);
-            });
-
-            // Note that tests below are less specific than they
-            // could be, esp. w.r.t. arguments to drawing calls;
-            // this is a fallback option so is a lower test priority.
-
-            it("allows the canvas to be cleared", function () {
-                chart.clear();
-                expect(mock2d.clearRect).toHaveBeenCalled();
-            });
-
-            it("does not construct if 2D is unavailable", function () {
-                mockCanvas.getContext.andReturn(undefined);
-                expect(function () {
-                    return new Canvas2DChart(mockCanvas);
-                }).toThrow();
-            });
-
-            it("allows dimensions to be set", function () {
-                // No return value, just verify API is present
-                chart.setDimensions([120, 120], [0, 10]);
-            });
-
-            it("allows lines to be drawn", function () {
-                var testBuffer = [0, 1, 3, 8],
-                    testColor = [0.25, 0.33, 0.66, 1.0],
-                    testPoints = 2;
-                chart.drawLine(testBuffer, testColor, testPoints);
-                expect(mock2d.beginPath).toHaveBeenCalled();
-                expect(mock2d.lineTo.calls.length).toEqual(1);
-                expect(mock2d.stroke).toHaveBeenCalled();
-            });
-
-            it("allows squares to be drawn", function () {
-                var testMin = [0, 1],
-                    testMax = [10, 10],
-                    testColor = [0.25, 0.33, 0.66, 1.0];
-
-                chart.drawSquare(testMin, testMax, testColor);
-                expect(mock2d.fillRect).toHaveBeenCalled();
-            });
-
-        });
-    }
-);

platform/features/timeline/test/chart/GLChartSpec.js

@@ -1,143 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, 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.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * MergeModelsSpec. Created by vwoeltje on 11/6/14.
- */
-define(
-    ["../../src/chart/GLChart"],
-    function (GLChart) {
-
-        describe("A WebGL chart", function () {
-            var mockCanvas,
-                mockGL,
-                glChart;
-
-            beforeEach(function () {
-                mockCanvas = jasmine.createSpyObj("canvas", ["getContext"]);
-                mockGL = jasmine.createSpyObj(
-                    "gl",
-                    [
-                        "createShader",
-                        "compileShader",
-                        "shaderSource",
-                        "attachShader",
-                        "createProgram",
-                        "linkProgram",
-                        "useProgram",
-                        "enableVertexAttribArray",
-                        "getAttribLocation",
-                        "getUniformLocation",
-                        "createBuffer",
-                        "lineWidth",
-                        "enable",
-                        "blendFunc",
-                        "viewport",
-                        "clear",
-                        "uniform2fv",
-                        "uniform4fv",
-                        "bufferData",
-                        "bindBuffer",
-                        "vertexAttribPointer",
-                        "drawArrays"
-                    ]
-                );
-                mockGL.ARRAY_BUFFER = "ARRAY_BUFFER";
-                mockGL.DYNAMIC_DRAW = "DYNAMIC_DRAW";
-                mockGL.TRIANGLE_FAN = "TRIANGLE_FAN";
-                mockGL.LINE_STRIP = "LINE_STRIP";
-
-                // Echo back names for uniform locations, so we can
-                // test which of these are set for certain operations.
-                mockGL.getUniformLocation.andCallFake(function (a, name) {
-                    return name;
-                });
-
-                mockCanvas.getContext.andReturn(mockGL);
-
-                glChart = new GLChart(mockCanvas);
-            });
-
-            it("allows the canvas to be cleared", function () {
-                glChart.clear();
-                expect(mockGL.clear).toHaveBeenCalled();
-            });
-
-            it("does not construct if WebGL is unavailable", function () {
-                mockCanvas.getContext.andReturn(undefined);
-                expect(function () {
-                    return new GLChart(mockCanvas);
-                }).toThrow();
-            });
-
-            it("allows dimensions to be set", function () {
-                glChart.setDimensions([120, 120], [0, 10]);
-                expect(mockGL.uniform2fv)
-                    .toHaveBeenCalledWith("uDimensions", [120, 120]);
-                expect(mockGL.uniform2fv)
-                    .toHaveBeenCalledWith("uOrigin", [0, 10]);
-            });
-
-            it("allows lines to be drawn", function () {
-                var testBuffer = [0, 1, 3, 8],
-                    testColor = [0.25, 0.33, 0.66, 1.0],
-                    testPoints = 2;
-                glChart.drawLine(testBuffer, testColor, testPoints);
-                expect(mockGL.bufferData).toHaveBeenCalledWith(
-                    mockGL.ARRAY_BUFFER,
-                    testBuffer,
-                    mockGL.DYNAMIC_DRAW
-                );
-                expect(mockGL.uniform4fv)
-                    .toHaveBeenCalledWith("uColor", testColor);
-                expect(mockGL.drawArrays)
-                    .toHaveBeenCalledWith("LINE_STRIP", 0, testPoints);
-            });
-
-            it("allows squares to be drawn", function () {
-                var testMin = [0, 1],
-                    testMax = [10, 10],
-                    testColor = [0.25, 0.33, 0.66, 1.0];
-
-                glChart.drawSquare(testMin, testMax, testColor);
-
-                expect(mockGL.uniform4fv)
-                    .toHaveBeenCalledWith("uColor", testColor);
-                expect(mockGL.drawArrays)
-                    .toHaveBeenCalledWith("TRIANGLE_FAN", 0, 4);
-            });
-
-            it("uses buffer sizes reported by WebGL", function () {
-                // Make sure that GLChart uses the GL buffer size, which may
-                // differ from what canvas requested. WTD-852
-                mockCanvas.width = 300;
-                mockCanvas.height = 150;
-                mockGL.drawingBufferWidth = 200;
-                mockGL.drawingBufferHeight = 175;
-
-                glChart.clear();
-
-                expect(mockGL.viewport).toHaveBeenCalledWith(0, 0, 200, 175);
-            });
-        });
-    }
-);

platform/features/timeline/test/chart/MCTTimelineChartSpec.js

@@ -1,216 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, 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.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * MCTTimelineChart. Created by vwoeltje on 11/6/14.
- */
-define(
-    ["../../src/chart/MCTTimelineChart"],
-    function (MCTTimelineChart) {
-
-        describe("The mct-timeline-chart directive", function () {
-            var mockInterval,
-                mockLog,
-                mockScope,
-                mockElement,
-                mockCanvas,
-                mockGL,
-                mockC2d,
-                mockPromise,
-                mctChart;
-
-            beforeEach(function () {
-                mockInterval =
-                    jasmine.createSpy("$interval");
-                mockLog =
-                    jasmine.createSpyObj("$log", ["warn", "info", "debug"]);
-                mockScope = jasmine.createSpyObj(
-                    "$scope",
-                    ["$watchCollection", "$on", "$apply"]
-                );
-                mockElement =
-                    jasmine.createSpyObj("element", ["find", "html"]);
-                mockInterval.cancel = jasmine.createSpy("cancelInterval");
-                mockPromise = jasmine.createSpyObj("promise", ["then"]);
-
-
-                // mct-timeline-chart uses GLChart, so it needs WebGL API
-                mockCanvas =
-                    jasmine.createSpyObj("canvas", ["getContext", "addEventListener"]);
-                mockGL = jasmine.createSpyObj(
-                    "gl",
-                    [
-                        "createShader",
-                        "compileShader",
-                        "shaderSource",
-                        "attachShader",
-                        "createProgram",
-                        "linkProgram",
-                        "useProgram",
-                        "enableVertexAttribArray",
-                        "getAttribLocation",
-                        "getUniformLocation",
-                        "createBuffer",
-                        "lineWidth",
-                        "enable",
-                        "blendFunc",
-                        "viewport",
-                        "clear",
-                        "uniform2fv",
-                        "uniform4fv",
-                        "bufferData",
-                        "bindBuffer",
-                        "vertexAttribPointer",
-                        "drawArrays"
-                    ]
-                );
-                mockC2d = jasmine.createSpyObj('c2d', ['clearRect']);
-                mockGL.ARRAY_BUFFER = "ARRAY_BUFFER";
-                mockGL.DYNAMIC_DRAW = "DYNAMIC_DRAW";
-                mockGL.TRIANGLE_FAN = "TRIANGLE_FAN";
-                mockGL.LINE_STRIP = "LINE_STRIP";
-
-                // Echo back names for uniform locations, so we can
-                // test which of these are set for certain operations.
-                mockGL.getUniformLocation.andCallFake(function (a, name) {
-                    return name;
-                });
-
-                mockElement.find.andReturn([mockCanvas]);
-                mockCanvas.getContext.andCallFake(function (type) {
-                    return { webgl: mockGL, '2d': mockC2d }[type];
-                });
-                mockInterval.andReturn(mockPromise);
-
-                mctChart = new MCTTimelineChart(mockInterval, mockLog);
-            });
-
-            it("is applicable at the element level", function () {
-                expect(mctChart.restrict).toEqual("E");
-            });
-
-            it("places a 'draw' attribute in-scope", function () {
-                // Should ask Angular for the draw attribute
-                expect(mctChart.scope.draw).toEqual("=");
-            });
-
-            it("watches for changes in the drawn object", function () {
-                mctChart.link(mockScope, mockElement);
-                expect(mockScope.$watchCollection)
-                    .toHaveBeenCalledWith("draw", jasmine.any(Function));
-            });
-
-            it("issues one draw call per line", function () {
-                mctChart.link(mockScope, mockElement);
-                mockScope.$watchCollection.mostRecentCall.args[1]({
-                    lines: [{}, {}, {}]
-                });
-                expect(mockGL.drawArrays.calls.length).toEqual(3);
-            });
-
-            it("issues one draw call per box", function () {
-                mctChart.link(mockScope, mockElement);
-                mockScope.$watchCollection.mostRecentCall.args[1]({
-                    boxes: [
-                        { start: [0, 0], end: [1, 1] },
-                        { start: [0, 0], end: [1, 1] },
-                        { start: [0, 0], end: [1, 1] },
-                        { start: [0, 0], end: [1, 1] }
-                    ]
-                });
-                expect(mockGL.drawArrays.calls.length).toEqual(4);
-            });
-
-            it("does not fail if no draw object is in scope", function () {
-                mctChart.link(mockScope, mockElement);
-                expect(mockScope.$watchCollection.mostRecentCall.args[1])
-                    .not.toThrow();
-            });
-
-            it("draws on canvas resize", function () {
-                mctChart.link(mockScope, mockElement);
-
-                // Should track canvas size in an interval
-                expect(mockInterval).toHaveBeenCalledWith(
-                    jasmine.any(Function),
-                    jasmine.any(Number),
-                    0,
-                    false
-                );
-
-                // Verify pre-condition
-                expect(mockGL.clear).not.toHaveBeenCalled();
-
-                mockCanvas.width = 100;
-                mockCanvas.offsetWidth = 150;
-                mockCanvas.height = 200;
-                mockCanvas.offsetHeight = 200;
-                mockInterval.mostRecentCall.args[0]();
-
-                // Use clear as an indication that drawing has occurred
-                expect(mockGL.clear).toHaveBeenCalled();
-            });
-
-            it("warns if no WebGL context is available", function () {
-                mockCanvas.getContext.andReturn(undefined);
-                mctChart.link(mockScope, mockElement);
-                expect(mockLog.warn).toHaveBeenCalled();
-            });
-
-            it("falls back to Canvas 2d API if WebGL context is lost", function () {
-                mctChart.link(mockScope, mockElement);
-                expect(mockCanvas.addEventListener)
-                    .toHaveBeenCalledWith("webglcontextlost", jasmine.any(Function));
-                expect(mockCanvas.getContext).not.toHaveBeenCalledWith('2d');
-                mockCanvas.addEventListener.mostRecentCall.args[1]();
-                expect(mockCanvas.getContext).toHaveBeenCalledWith('2d');
-            });
-
-            it("logs nothing in nominal situations (WebGL available)", function () {
-                // Complement the previous test
-                mctChart.link(mockScope, mockElement);
-                expect(mockLog.warn).not.toHaveBeenCalled();
-            });
-
-            // Avoid resource leaks
-            it("stops polling for size changes on destroy", function () {
-                mctChart.link(mockScope, mockElement);
-
-                // Should be listening for a destroy event
-                expect(mockScope.$on).toHaveBeenCalledWith(
-                    "$destroy",
-                    jasmine.any(Function)
-                );
-
-                // Precondition - interval still active
-                expect(mockInterval.cancel).not.toHaveBeenCalled();
-
-                // Broadcast a $destroy
-                mockScope.$on.mostRecentCall.args[1]();
-
-                // Should have stopped the interval
-                expect(mockInterval.cancel).toHaveBeenCalledWith(mockPromise);
-            });
-
-        });
-    }
-);

platform/telemetry/src/TelemetryHandle.js

@@ -122,12 +122,9 @@ define(
              */
             self.getDatum = function (telemetryObject, index) {
                 function makeNewDatum(series) {
-                    if (series) {
-                        if (series.getDatum) {
-                            return series.getDatum(index);
-                        }
-                        return subscription.makeDatum(telemetryObject, series, index);
-                    }
+                    return series ?
+                        subscription.makeDatum(telemetryObject, series, index) :
+                        undefined;
                 }
 
                 return typeof index !== 'number' ?

src/api/objects/LegacyObjectAPIInterceptor.js

@@ -21,12 +21,13 @@
  *****************************************************************************/
 
 define([
-    './object-utils'
+    './object-utils',
+    './objectEventEmitter'
 ], function (
-    utils
+    utils,
+    objectEventEmitter
 ) {
-    function ObjectServiceProvider(eventEmitter, objectService, instantiate, topic) {
-        this.eventEmitter = eventEmitter;
+    function ObjectServiceProvider(objectService, instantiate, topic) {
         this.objectService = objectService;
         this.instantiate = instantiate;
 
@@ -60,12 +61,12 @@ define([
             var newStyleObject = utils.toNewFormat(legacyObject.getModel(), legacyObject.getId());
 
             //Don't trigger self
-            this.eventEmitter.off('mutation', handleMutation);
-            this.eventEmitter.emit(newStyleObject.identifier.key + ":*", newStyleObject);
-            this.eventEmitter.on('mutation', handleMutation);
+            objectEventEmitter.off('mutation', handleMutation);
+            objectEventEmitter.emit(newStyleObject.identifier.key + ":*", newStyleObject);
+            objectEventEmitter.on('mutation', handleMutation);
         }.bind(this);
 
-        this.eventEmitter.on('mutation', handleMutation);
+        objectEventEmitter.on('mutation', handleMutation);
         removeGeneralTopicListener = this.generalTopic.listen(handleLegacyMutation);
     };
 
@@ -95,8 +96,6 @@ define([
     // Injects new object API as a decorator so that it hijacks all requests.
     // Object providers implemented on new API should just work, old API should just work, many things may break.
     function LegacyObjectAPIInterceptor(openmct, ROOTS, instantiate, topic, objectService) {
-        var eventEmitter = openmct.objects.eventEmitter;
-
         this.getObjects = function (keys) {
             var results = {},
                 promises = keys.map(function (keyString) {
@@ -115,12 +114,7 @@ define([
         };
 
         openmct.objects.supersecretSetFallbackProvider(
-            new ObjectServiceProvider(
-                eventEmitter,
-                objectService,
-                instantiate,
-                topic
-            )
+            new ObjectServiceProvider(objectService, instantiate, topic)
         );
 
         ROOTS.forEach(function (r) {

src/api/objects/MutableObject.js

@@ -21,9 +21,11 @@
  *****************************************************************************/
 
 define([
-    'lodash'
+    'lodash',
+    './objectEventEmitter'
 ], function (
-    _
+    _,
+    objectEventEmitter
 ) {
     var ANY_OBJECT_EVENT = "mutation";
 
@@ -34,8 +36,7 @@ define([
      * @param object
      * @interface MutableObject
      */
-    function MutableObject(eventEmitter, object) {
-        this.eventEmitter = eventEmitter;
+    function MutableObject(object) {
         this.object = object;
         this.unlisteners = [];
     }
@@ -60,11 +61,8 @@ define([
      */
     MutableObject.prototype.on = function (path, callback) {
         var fullPath = qualifiedEventName(this.object, path);
-        var eventOff =
-            this.eventEmitter.off.bind(this.eventEmitter, fullPath, callback);
-
-        this.eventEmitter.on(fullPath, callback);
-        this.unlisteners.push(eventOff);
+        objectEventEmitter.on(fullPath, callback);
+        this.unlisteners.push(objectEventEmitter.off.bind(objectEventEmitter, fullPath, callback));
     };
 
     /**
@@ -80,12 +78,12 @@ define([
         _.set(this.object, 'modified', Date.now());
 
         //Emit event specific to property
-        this.eventEmitter.emit(qualifiedEventName(this.object, path), value);
+        objectEventEmitter.emit(qualifiedEventName(this.object, path), value);
         //Emit wildcare event
-        this.eventEmitter.emit(qualifiedEventName(this.object, '*'), this.object);
+        objectEventEmitter.emit(qualifiedEventName(this.object, '*'), this.object);
 
         //Emit a general "any object" event
-        this.eventEmitter.emit(ANY_OBJECT_EVENT, this.object);
+        objectEventEmitter.emit(ANY_OBJECT_EVENT, this.object);
     };
 
     return MutableObject;

src/api/objects/ObjectAPI.js

@@ -25,15 +25,13 @@ define([
     './object-utils',
     './MutableObject',
     './RootRegistry',
-    './RootObjectProvider',
-    'EventEmitter'
+    './RootObjectProvider'
 ], function (
     _,
     utils,
     MutableObject,
     RootRegistry,
-    RootObjectProvider,
-    EventEmitter
+    RootObjectProvider
 ) {
 
 
@@ -44,7 +42,6 @@ define([
      */
 
     function ObjectAPI() {
-        this.eventEmitter = new EventEmitter();
         this.providers = {};
         this.rootRegistry = new RootRegistry();
         this.rootProvider = new RootObjectProvider(this.rootRegistry);
@@ -178,9 +175,7 @@ define([
      * @memberof module:openmct.ObjectAPI#
      */
     ObjectAPI.prototype.mutate = function (domainObject, path, value) {
-        var mutableObject =
-            new MutableObject(this.eventEmitter, domainObject);
-        return mutableObject.set(path, value);
+        return new MutableObject(domainObject).set(path, value);
     };
 
     /**
@@ -193,8 +188,7 @@ define([
      * @memberof module:openmct.ObjectAPI#
      */
     ObjectAPI.prototype.observe = function (domainObject, path, callback) {
-        var mutableObject =
-            new MutableObject(this.eventEmitter, domainObject);
+        var mutableObject = new MutableObject(domainObject);
         mutableObject.on(path, callback);
         return mutableObject.stopListening.bind(mutableObject);
     };

src/api/telemetry/LegacyTelemetryProvider.js

@@ -45,9 +45,6 @@ define([
     };
 
     function createDatum(domainObject, metadata, legacySeries, i) {
-        if (legacySeries.getDatum) {
-            return legacySeries.getDatum(i);
-        }
         var datum = {};
 
         metadata.domains.reduce(function (d, domain) {

src/api/types/TypeRegistry.js

@@ -51,7 +51,7 @@ define(['./Type'], function (Type) {
      * @method addType
      * @memberof module:openmct.TypeRegistry#
      */
-    TypeRegistry.prototype.register = function (typeKey, typeDef) {
+    TypeRegistry.prototype.addType = function (typeKey, typeDef) {
         this.types[typeKey] = new Type(typeDef);
     };
 

src/defaultRegistry.js

@@ -109,6 +109,7 @@ define([
         'platform/commonUI/general',
         'platform/commonUI/inspect',
         'platform/commonUI/mobile',
+        'platform/commonUI/themes/espresso',
         'platform/commonUI/notification',
         'platform/containment',
         'platform/execution',

src/plugins/plugins.js

@@ -21,67 +21,13 @@
  *****************************************************************************/
 
 define([
-    'lodash'
-], function (_) {
-    var bundleMap = {
-        couchDB: 'platform/persistence/couch',
-        elasticsearch: 'platform/persistence/elastic',
-        espresso: 'platform/commonUI/themes/espresso',
-        localStorage: 'platform/persistence/local',
-        myItems: 'platform/features/my-items',
-        snow: 'platform/commonUI/themes/snow',
-        utcTimeSystem: 'platform/features/conductor/utcTimeSystem'
+], function () {
+    return {
+        localStorage: function (openmct) {
+            openmct.legacyRegistry.enable('platform/persistence/local');
+        },
+        myItems: function (openmct) {
+            openmct.legacyRegistry.enable('platform/features/my-items');
+        }
     };
-
-    var plugins = _.mapValues(bundleMap, function (bundleName, pluginName) {
-        return function (openmct) {
-            openmct.legacyRegistry.enable(bundleName);
-        };
-    });
-
-    plugins.CouchDB = function (url) {
-        return function (openmct) {
-            if (url) {
-                var bundleName = "config/couch";
-                openmct.legacyRegistry.register(bundleName, {
-                    "extensions": {
-                        "constants": [
-                            {
-                                "key": "COUCHDB_PATH",
-                                "value": url,
-                                "priority": "mandatory"
-                            }
-                        ]
-                    }
-                });
-                openmct.legacyRegistry.enable(bundleName);
-            }
-
-            openmct.legacyRegistry.enable(bundleMap.couchDB);
-        };
-    };
-
-    plugins.Elasticsearch = function (url) {
-        return function (openmct) {
-            if (url) {
-                var bundleName = "config/elastic";
-                openmct.legacyRegistry.register(bundleName, {
-                    "extensions": {
-                        "constants": [
-                            {
-                                "key": "ELASTIC_ROOT",
-                                "value": url,
-                                "priority": "mandatory"
-                            }
-                        ]
-                    }
-                });
-                openmct.legacyRegistry.enable(bundleName);
-            }
-
-            openmct.legacyRegistry.enable(bundleMap.elasticsearch);
-        };
-    };
-
-    return plugins;
 });