Merge remote-tracking branch 'origin/timeline-follow-1688' into timeline-follow-1688-styling

[Timeline] Follow up on front-end updates
Fixes #1688 Squashed commit of the following: commit 817c7f31289b3e7631c3332d2192a68f21f50f9e Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 21 12:47:48 2017 -0700 [Timeline] Initialize lastWidth ...to avoid clamping values before a width has actually been observed. commit 5f7324c1cdb0cbef6385fbccac31b0404d216f95 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 21 12:21:11 2017 -0700 [Timeline] Clamp right edge of zoom ...to avoid getting stuck in a weird scrolling state for large timer values. commit 076aca112392e65835e7a01ac8e28780d24bfff1 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 21 12:02:23 2017 -0700 [Timeline] Don't set scroll.x to negative values ...avoids mispositioning timer-following line, https://github.com/nasa/openmct/issues/1688#issuecomment-330373625 commit ac9bdb919df69fac65b297487131e2c41204ebeb Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 21 11:32:49 2017 -0700 [Timers] Loosen test expectation Resolves build failure https://circleci.com/gh/nasa/openmct/4181 by reducing test specificity for indicator display name.
2017-09-21 12:50:03 -07:00 · 2017-09-21 12:48:33 -07:00 · 2017-09-20 12:11:41 -07:00 · 2017-09-20 10:59:00 -07:00 · 2017-09-20 10:36:56 -07:00 · 2017-09-20 10:09:19 -07:00
1068 changed files with 12174 additions and 23432 deletions
--- a/.jshintrc
+++ b/.jshintrc
@@ -21,6 +21,5 @@
    "shadow": "outer",
    "strict": "implied",
    "undef": true,
-    "unused": "vars",
-    "latedef": "nofunc"
+    "unused": "vars"
 }
--- a/API.md
+++ b/API.md
@@ -1,57 +1,3 @@
-<!-- START doctoc generated TOC please keep comment here to allow auto update -->
-<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-**Table of Contents** 
-
- [Building Applications With Open MCT](#building-applications-with-open-mct)
-  - [Scope and purpose of this document](#scope-and-purpose-of-this-document)
-  - [Building From Source](#building-from-source)
-  - [Starting an Open MCT application](#starting-an-open-mct-application)
-  - [Plugins](#plugins)
-    - [Defining and Installing a New Plugin](#defining-and-installing-a-new-plugin)
-  - [Domain Objects and Identifiers](#domain-objects-and-identifiers)
-    - [Object Attributes](#object-attributes)
-    - [Domain Object Types](#domain-object-types)
-  - [Root Objects](#root-objects)
-  - [Object Providers](#object-providers)
-  - [Composition Providers](#composition-providers)
-    - [Adding Composition Providers](#adding-composition-providers)
-    - [Default Composition Provider](#default-composition-provider)
-  - [Telemetry API](#telemetry-api)
-    - [Integrating Telemetry Sources](#integrating-telemetry-sources)
-      - [Telemetry Metadata](#telemetry-metadata)
-        - [Values](#values)
-          - [Value Hints](#value-hints)
-        - [The Time Conductor and Telemetry](#the-time-conductor-and-telemetry)
-      - [Telemetry Providers](#telemetry-providers)
-      - [Telemetry Requests and Responses.](#telemetry-requests-and-responses)
-      - [Request Strategies **draft**](#request-strategies-draft)
-        - [`latest` request strategy](#latest-request-strategy)
-        - [`minmax` request strategy](#minmax-request-strategy)
-      - [Telemetry Formats **draft**](#telemetry-formats-draft)
-        - [Registering Formats](#registering-formats)
-      - [Telemetry Data](#telemetry-data)
-        - [Telemetry Datums](#telemetry-datums)
-      - [Limit Evaluators **draft**](#limit-evaluators-draft)
-    - [Telemetry Consumer APIs **draft**](#telemetry-consumer-apis-draft)
-  - [Time API](#time-api)
-    - [Time Systems and Bounds](#time-systems-and-bounds)
-      - [Defining and Registering Time Systems](#defining-and-registering-time-systems)
-      - [Getting and Setting the Active Time System](#getting-and-setting-the-active-time-system)
-    - [Time Bounds](#time-bounds)
-    - [Clocks](#clocks)
-      - [Defining and registering clocks](#defining-and-registering-clocks)
-      - [Getting and setting active clock](#getting-and-setting-active-clock)
-      - [Stopping an active clock](#stopping-an-active-clock)
-      - [Clock Offsets](#clock-offsets)
-    - [Time Events](#time-events)
-      - [List of Time Events](#list-of-time-events)
-    - [The Time Conductor](#the-time-conductor)
-      - [Time Conductor Configuration](#time-conductor-configuration)
-      - [Example conductor configuration](#example-conductor-configuration)
-  - [Included Plugins](#included-plugins)
-
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
-
 # Building Applications With Open MCT

 ## Scope and purpose of this document
@@ -208,7 +154,7 @@ registry.

 eg.
 ```javascript
-openmct.types.addType('example.my-type', {
+openmct.types.addType('my-type', {
    name: "My Type",
    description: "This is a type that I added!",
    creatable: true
@@ -216,9 +162,8 @@ openmct.types.addType('example.my-type', {
 ```

 The `addType` function accepts two arguments:
-* A `string` key identifying the type. This key is used when specifying a type
-for an object.  We recommend prefixing your types with a namespace to avoid
-conflicts with other plugins.
+* A `string` key identifying the type. This key is used when specifying a type 
+for an object.
 * An object type specification. An object type definition supports the following 
 attributes      
    * `name`: a `string` naming this object type
@@ -249,7 +194,7 @@ To do so, use the `addRoot` method of the object API.
 eg.
 ```javascript
 openmct.objects.addRoot({
-        namespace: "example.namespace",
+        namespace: "my-namespace",
        key: "my-key"
    });
 ```
@@ -290,12 +235,13 @@ It is expected that the `get` function will return a
 [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) 
 that resolves with the object being requested.

-In future, object providers will support other methods to enable other operations with persistence stores, such as creating, updating, and deleting objects.
+In future, object providers will support other methods to enable other operations 
+with persistence stores, such as creating, updating, and deleting objects.

 ## Composition Providers

-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
+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.
@@ -309,7 +255,7 @@ Composition Provider:
 ```javascript
 openmct.composition.addProvider({
    appliesTo: function (domainObject) {
-        return domainObject.type === 'example.my-type';
+        return domainObject.type === 'my-type';
    },
    load: function (domainObject) {
        return Promise.resolve(myDomainObjects);
@@ -327,9 +273,8 @@ These identifiers will be used to fetch Domain Objects from an [Object Provider]

 ### 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.:
+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.:

 ```javascript
 var domainObject = {
@@ -350,17 +295,13 @@ var domainObject = {

 ## Telemetry API

-The Open MCT telemetry API provides two main sets of interfaces-- one for
-integrating telemetry data into Open MCT, and another for developing Open MCT
-visualization plugins utilizing the telemetry API.  
+The Open MCT telemetry API provides two main sets of interfaces-- one for integrating telemetry data into Open MCT, and another for developing Open MCT visualization plugins utilizing telemetry API.  

-The APIs for visualization plugins are still a work in progress and docs may
-change at any time.  However, the APIs for integrating telemetry metadata into
-Open MCT are stable and documentation is included below.
+The APIs for visualization plugins are still a work in progress and docs may change at any time.  However, the APIs for integrating telemetry metadata into Open MCT are stable and documentation is included below.

 ### Integrating Telemetry Sources

-There are two main tasks for integrating telemetry sources-- describing telemetry objects with relevant metadata, and then providing telemetry data for those objects.  You'll use an [Object Provider](#object-providers) to provide objects with the necessary [Telemetry Metadata](#telemetry-metadata), and then register a [Telemetry Provider](#telemetry-providers) to retrieve telemetry data for those objects.  Alternatively, you can register a telemetry metadata provider to provide the necessary telemetry metadata.
+There are two main tasks for integrating telemetry sources-- describing telemetry objects with relevant metadata, and then providing telemetry data for those objects.  You'll use an [Object Provider](#object-providers) to provide objects with the necessary [Telemetry Metadata](#telemetry-metadata), and then register a [Telemetry Provider](#telemetry-providers) to retrieve telemetry data for those objects.

 For a step-by-step guide to building a telemetry adapter, please see the 
 [Open MCT Tutorials](https://github.com/nasa/openmct-tutorial).
@@ -414,7 +355,7 @@ attribute      | type   | flags    | notes
 ---            |  ---   |  ---     | ---
 `key`          | string | required | unique identifier for this field.  
 `hints`        | object | required | Hints allow views to intelligently select relevant attributes for display, and are required for most views to function.  See section on "Value Hints" below.
-`name`         | string | optional | a human readable label for this field.  If omitted, defaults to `key`.
+`name`         | string | optional | a human readible label for this field.  If omitted, defaults to `key`.
 `source`       | string | optional | identifies the property of a datum where this value is stored.  If omitted, defaults to `key`.
 `format`       | string | optional | a specific format identifier, mapping to a formatter.  If omitted, uses a default formatter.  For enumerations, use `enum`.  For timestamps, use `utc` if you are using utc dates, otherwise use a key mapping to your custom date format.  
 `units`        | string | optional | the units of this value, e.g. `km`, `seconds`, `parsecs`
@@ -442,18 +383,14 @@ In order for the time conductor to work, there will always be an active "time sy

 #### Telemetry Providers

-Telemetry providers are responsible for providing historical and real-time telemetry data for telemetry objects.  Each telemetry provider determines which objects it can provide telemetry for, and then must implement methods to provide telemetry for those objects.
+Telemetry providers are responsible for providing historical and real time telemetry data for telemetry objects.  Each telemetry provider determines which objects it can provide telemetry for, and then must implement methods to provide telemetry for those objects.

 A telemetry provider is a javascript object with up to four methods:

 * `supportsSubscribe(domainObject, callback, options)` optional.  Must be implemented to provide realtime telemetry.  Should return `true` if the provider supports subscriptions for the given domain object (and request options).
 * `subscribe(domainObject, callback, options)` required if `supportsSubscribe` is implemented.  Establish a subscription for realtime data for the given domain object.  Should invoke `callback` with a single telemetry datum every time data is received.  Must return an unsubscribe function.  Multiple views can subscribe to the same telemetry object, so it should always return a new unsubscribe function.
 * `supportsRequest(domainObject, options)` optional.  Must be implemented to provide historical telemetry.  Should return `true` if the provider supports historical requests for the given domain object.
-* `request(domainObject, options)` required if `supportsRequest` is implemented.  Must return a promise for an array of telemetry datums that fulfills the request.  The `options` argument will include a `start`, `end`, and `domain` attribute representing the query bounds.  See [Telemetry Requests and Responses](#telemetry-requests-and-responses) for more info on how to respond to requests.
-* `supportsMetadata(domainObject)` optional.  Implement and return `true` for objects that you want to provide dynamic metadata for.
-* `getMetadata(domainObject)` required if `supportsMetadata` is implemented.  Must return a valid telemetry metadata definition that includes at least one valueMetadata definition.
-* `supportsLimits(domainObject)` optional.  Implement and return `true` for domain objects that you want to provide a limit evaluator for.
-* `getLimitEvaluator(domainObject)` required if `supportsLimits` is implemented.  Must return a valid LimitEvaluator for a given domain object.
+* `request(domainObject, options)` required if `supportsRequest` is implemented.  Must return a promise for an array of telemetry datums that fulfills the request.  The `options` argument will include a `start`, `end`, and `domain` attribute representing the query bounds.  For more request properties, see Request Properties below.

 Telemetry providers are registered by calling `openmct.telemetry.addProvider(provider)`, e.g.

@@ -461,15 +398,14 @@ Telemetry providers are registered by calling `openmct.telemetry.addProvider(pro
 openmct.telemetry.addProvider({
    supportsRequest: function (domainObject, options) { /*...*/ },
    request: function (domainObject, options) { /*...*/ },
+    supportsSubscribe: function (domainObject, callback, options) { /*...*/ },
+    subscribe: function (domainObject, callback, options) { /*...*/ }
 })
 ```

-Note: it is not required to implement all of the methods on every provider.  Depending on the complexity of your implementation, it may be helpful to instantiate and register your realtime, historical, and metadata providers separately.
-
-#### Telemetry Requests and Responses.
+#### Telemetry Requests

 Telemetry requests support time bounded queries. A call to a _Telemetry Provider_'s `request` function will include an `options` argument. These are simply javascript objects with attributes for the request parameters. An example of a telemetry request object with a start and end time is included below:
-
 ```javascript
 {
    start: 1487981997240,
@@ -478,53 +414,7 @@ Telemetry requests support time bounded queries. A call to a _Telemetry Provider
 }
 ```

-In this case, the `domain` is the currently selected time-system, and the start and end dates are valid dates in that time system.
-
-A telemetry provider's `request` method should return a promise for an array of telemetry datums.  These datums must be sorted by `domain` in ascending order.
-
-#### Request Strategies **draft**
-
-To improve performance views may request a certain strategy for data reduction.  These are intended to improve visualization performance by reducing the amount of data needed to be sent to the client.  These strategies will be indicated by additional parameters in the request options.  You may choose to handle them or ignore them.  
-
-Note: these strategies are currently being tested in core plugins and may change based on developer feedback.
-
-##### `latest` request strategy
-
-This request is a "depth based" strategy.  When a view is only capable of
-displaying a single value (or perhaps the last ten values), then it can
-use the `latest` request strategy with a `size` parameter that specifies
-the number of results it desires.  The `size` parameter is a hint; views
-must not assume the response will have the exact number of results requested.
-
-example:
-```javascript
-{
-    start: 1487981997240,
-    end: 1487982897240,
-    domain: 'utc',
-    strategy: 'latest',
-    size: 1
-}
-```
-
-This strategy says "I want the lastest data point in this time range".  A provider which recognizes this request should return only one value-- the latest-- in the requested time range.  Depending on your back-end implementation, performing these queries in bulk can be a large performance increase.  These are generally issued by views that are only capable of displaying a single value and only need to show the latest value.
-
-##### `minmax` request strategy
-
-example:
-```javascript
-{
-    start: 1487981997240,
-    end: 1487982897240,
-    domain: 'utc',
-    strategy: 'minmax',
-    size: 720
-}
-```
-
-MinMax queries are issued by plots, and may be issued by other types as well.  The aim is to reduce the amount of data returned but still faithfully represent the full extent of the data.  In order to do this, the view calculates the maximum data resolution it can display (i.e. the number of horizontal pixels in a plot) and sends that as the `size`.  The response should include at least one minimum and one maximum value per point of resolution.
-
-#### Telemetry Formats **draft**
+#### Telemetry Formats

 Telemetry format objects define how to interpret and display telemetry data. 
 They have a simple structure:
@@ -594,17 +484,6 @@ The key-value pairs of this object are described by the telemetry metadata of
 a domain object, as discussed in the [Telemetry Metadata](#telemetry-metadata)
 section.

-#### Limit Evaluators **draft**
-
-Limit evaluators allow a telemetry integrator to define how limits should be 
-applied to telemetry from a given domain object.  For an example of a limit 
-evaluator, take a look at `examples/generator/SinewaveLimitProvider.js`.
-
-### Telemetry Consumer APIs **draft**
-
-The APIs for requesting telemetry from Open MCT -- e.g. for use in custom views -- are currently in draft state and are being revised.  If you'd like to experiement with them before they are finalized, please contact the team via the contact-us link on our website.
-
-
 ## Time API

 Open MCT provides API for managing the temporal state of the application.
@@ -712,7 +591,7 @@ openmct.time.bounds({start: now - ONE_HOUR, now);
 To respond to bounds change events, listen for the [`'bounds'`](#time-events)
 event.

-### Clocks
+## Clocks

 The Time API can be set to follow a clock source which will cause the bounds
 to be updated automatically whenever the clock source "ticks". A clock is simply
@@ -731,7 +610,7 @@ be defined to tick on some remote timing source.
 The values provided by clocks are simple `number`s, which are interpreted in the
 context of the active [Time System](#defining-and-registering-time-systems).

-#### Defining and registering clocks
+### Defining and registering clocks

 A clock is an object that defines certain required metadata and functions:

@@ -845,7 +724,7 @@ __Note:__ Setting the clock offsets will trigger an immediate bounds change, as
 new bounds will be calculated based on the `currentValue()` of the active clock. 
 Clock offsets are only relevant when a clock source is active.

-### Time Events
+## Time Events

 The Time API is a standard event emitter; you can register callbacks for events using the `on` method and remove callbacks for events with the `off` method.

@@ -887,7 +766,7 @@ The events emitted by the Time API are:
  * `clockOffsets`: The new [clock offsets](#clock-offsets).


-### The Time Conductor
+## The Time Conductor

 The Time Conductor provides a user interface for managing time bounds in Open 
 MCT. It allows a user to select from configured time systems and clocks, and to set bounds and clock offsets.
@@ -1000,21 +879,6 @@ openmct.install(openmct.plugins.CouchDB('http://localhost:9200'))
 * `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.URLIndicatorPlugin` adds an indicator which shows the
-availability of a URL with the following options: 
-  - `url` : URL to indicate the status of
-  - `cssClass`: Icon to show in the status bar, defaults to `icon-database`, [list of all icons](https://nasa.github.io/openmct/style-guide/#/browse/styleguide:home?view=items)
-  - `interval`: Interval between checking the connection, defaults to `10000`
-  - `label` Name showing up as text in the status bar, defaults to url
-```javascript
-openmct.install(openmct.plugins.URLIndicatorPlugin({
-  url: 'http://google.com',
-  cssClass: 'check',
-  interval: 10000,
-  label: 'Google'
- })
-);
-```
 * `openmct.plugins.LocalStorage` provides persistence of user-created
  objects in browser-local storage. This is particularly useful in
  development environments.
--- a/README.md
+++ b/README.md
@@ -88,7 +88,7 @@ and [`gulp`](http://gulpjs.com/).

 To build Open MCT for deployment:

-`npm run prepare`
+`npm run prepublish`

 This will compile and minify JavaScript sources, as well as copy over assets.
 The contents of the `dist` folder will contain a runnable Open MCT
--- a/bower.json
+++ b/bower.json
@@ -17,7 +17,7 @@
    "screenfull": "^3.0.0",
    "node-uuid": "^1.4.7",
    "comma-separated-values": "^3.6.4",
-    "file-saver": "1.3.3",
+    "FileSaver.js": "^0.0.2",
    "zepto": "^1.1.6",
    "eventemitter3": "^1.2.0",
    "lodash": "3.10.1",
--- a/circle.yml
+++ b/circle.yml
@@ -1,17 +1,15 @@
-machine:
-  node:
-    version: 8.11.0
-
-dependencies:
-  pre:
-    - npm install -g npm@latest
-
 deployment:
  production:
    branch: master
    commands:
        - npm install canvas nomnoml
        - ./build-docs.sh
+        - git fetch --unshallow
+        - git push git@heroku.com:openmctweb-demo.git $CIRCLE_SHA1:refs/heads/master
+  openmct-demo:
+    branch: live_demo
+    heroku:
+      appname: openmct-demo
  openmctweb-staging-deux:
    branch: mobile
    heroku:
--- a/docs/src/guide/index.md
+++ b/docs/src/guide/index.md
@@ -2283,7 +2283,7 @@ To install build dependencies (only needs to be run once):

 To build:

-`npm run prepare`
+`npm run prepublish`

 This will compile and minify JavaScript sources, as well as copy over assets.
 The contents of the `dist` folder will contain a runnable Open MCT
--- a/docs/src/guide/security.md
+++ b/docs/src/guide/security.md
@@ -1,121 +0,0 @@
-# Security Guide
-
-Open MCT is a rich client with plugin support that executes as a single page
-web application in a browser environment. Security concerns and
-vulnerabilities associated with the web as a platform should be considered
-before deploying Open MCT (or any other web application) for mission or
-production usage.
-
-This document describes several important points to consider when developing
-for or deploying Open MCT securely. Other resources such as
-[Open Web Application Security Project (OWASP)](https://www.owasp.org)
-provide a deeper and more general overview of security for web applications.
-
-
-## Security Model
-
-Open MCT has been architected assuming the following deployment pattern:
-
-* A tagged, tested Open MCT version will be used.
-* Externally authored plugins will be installed.
-* A server will provide persistent storage, telemetry, and other shared data.
-* Authorization, authentication, and auditing will be handled by a server.
-
-
-## Security Procedures
-
-The Open MCT team secures our code base using a combination of code review,
-dependency review, and periodic security reviews. Static analysis performed 
-during automated verification additionally safeguards against common 
-coding errors which may result in vulnerabilities.
-
-
-### Code Review
-
-All contributions are reviewed by internal team members. External
-contributors receive increased scrutiny for security and quality,
-and must sign a licensing agreement.
-
-### Dependency Review
-
-Before integrating third-party dependencies, they are reviewed for security
-and quality, with consideration given to authors and users of these
-dependencies, as well as review of open source code.
-
-### Periodic Security Reviews
-
-Open MCT's code, design, and architecture are periodically reviewed
-(approximately annually) for common security issues, such as the
-[OWASP Top Ten](https://www.owasp.org/index.php/Category:OWASP_Top_Ten_Project).
-
-
-## Security Concerns
-
-Certain security concerns deserve special attention when deploying Open MCT,
-or when authoring plugins.
-
-### Identity Spoofing
-
-Open MCT issues calls to web services with the privileges of a logged in user.
-Compromised sources (either for Open MCT itself or a plugin) could
-therefore allow malicious code to execute with those privileges.
-
-To avoid this:
-
-* Serve Open MCT and other scripts over SSL (https rather than http)
-  to prevent man-in-the-middle attacks.
-* Exercise precautions such as security reviews for any plugins or
-  applications built for or with Open MCT to reject malicious changes.
-
-### Information Disclosure
-
-If Open MCT is used to handle or display sensitive data, any components
-(such as adapter plugins) must take care to avoid leaking or disclosing
-this information. For example, avoid sending sensitive data to third-party
-servers or insecure APIs.
-
-### Data Tampering
-
-The web application architecture leaves open the possibility that direct
-calls will be made to back-end services, circumventing Open MCT entirely.
-As such, Open MCT assumes that server components will perform any necessary
-data validation during calls issues to the server.
-
-Additionally, plugins which serialize and write data to the server must
-escape that data to avoid database injection attacks, and similar.
-
-### Repudiation
-
-Open MCT assumes that servers log any relevant interactions and associates
-these with a user identity; the specific user actions taken within the
-application are assumed not to be of concern for auditing.
-
-In the absence of server-side logging, users may disclaim (maliciously,
-mistakenly, or otherwise) actions taken within the system without any
-way to prove otherwise.
-
-If keeping client-level interactions is important, this will need to be
-implemented via a plugin.
-
-### Denial-of-service
-
-Open MCT assumes that server-side components will be insulated against
-denial-of-service attacks. Services should only permit resource-intensive
-tasks to be initiated by known or trusted users.
-
-### Elevation of Privilege
-
-Corollary to the assumption that servers guide against identity spoofing,
-Open MCT assumes that services do not allow a user to act with
-inappropriately escalated privileges. Open MCT cannot protect against
-such escalation; in the clearest case, a malicious actor could interact
-with web services directly to exploit such a vulnerability.
-
-## Additional Reading
-
-The following resources have been used as a basis for identifying potential
-security threats to Open MCT deployments in preparation of this document:
-
-* [STRIDE model](https://www.owasp.org/index.php/Threat_Risk_Modeling#STRIDE)
-* [Attack Surface Analysis Cheat Sheet](https://www.owasp.org/index.php/Attack_Surface_Analysis_Cheat_Sheet)
-* [XSS Prevention Cheat Sheet](https://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet)
--- a/example/generator/GeneratorMetadataProvider.js
+++ b/example/generator/GeneratorMetadataProvider.js
@@ -1,108 +0,0 @@
-define([
-    'lodash'
-], function (
-    _
-) {
-
-    var METADATA_BY_TYPE = {
-        'generator': {
-            values: [
-                {
-                    key: "name",
-                    name: "Name"
-                },
-                {
-                    key: "utc",
-                    name: "Time",
-                    format: "utc",
-                    hints: {
-                        domain: 1
-                    }
-                },
-                {
-                    key: "yesterday",
-                    name: "Yesterday",
-                    format: "utc",
-                    hints: {
-                        domain: 2
-                    }
-                },
-                {
-                    key: "sin",
-                    name: "Sine",
-                    hints: {
-                        range: 1
-                    }
-                },
-                {
-                    key: "cos",
-                    name: "Cosine",
-                    hints: {
-                        range: 2
-                    }
-                }
-            ]
-        },
-        'example.state-generator': {
-            values: [
-                {
-                    key: "name",
-                    name: "Name"
-                },
-                {
-                    key: "utc",
-                    name: "Time",
-                    format: "utc",
-                    hints: {
-                        domain: 1
-                    }
-                },
-                {
-                    key: "state",
-                    source: "value",
-                    name: "State",
-                    format: "enum",
-                    enumerations: [
-                        {
-                            value: 0,
-                            string: "OFF"
-                        },
-                        {
-                            value: 1,
-                            string: "ON"
-                        }
-                    ],
-                    hints: {
-                        range: 1
-                    }
-                },
-                {
-                    key: "value",
-                    name: "Value",
-                    hints: {
-                        range: 2
-                    }
-                }
-            ]
-        }
-    }
-
-    function GeneratorMetadataProvider() {
-
-    }
-
-    GeneratorMetadataProvider.prototype.supportsMetadata = function (domainObject) {
-        return METADATA_BY_TYPE.hasOwnProperty(domainObject.type);
-    };
-
-    GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) {
-        return _.extend(
-                {},
-                domainObject.telemetry,
-                METADATA_BY_TYPE[domainObject.type]
-            );
-    };
-
-    return GeneratorMetadataProvider;
-
-});
--- a/example/generator/GeneratorProvider.js
+++ b/example/generator/GeneratorProvider.js
@@ -30,8 +30,7 @@ define([
        amplitude: 1,
        period: 10,
        offset: 0,
-        dataRateInHz: 1,
-        phase: 0
+        dataRateInHz: 1
    };

    function GeneratorProvider() {
@@ -51,27 +50,24 @@ define([
            'amplitude',
            'period',
            'offset',
-            'dataRateInHz',
-            'phase',
+            'dataRateInHz'
        ];

-        request = request || {};
-
        var workerRequest = {};

        props.forEach(function (prop) {
            if (domainObject.telemetry && domainObject.telemetry.hasOwnProperty(prop)) {
                workerRequest[prop] = domainObject.telemetry[prop];
            }
-            if (request && request.hasOwnProperty(prop)) {
+            if (request.hasOwnProperty(prop)) {
                workerRequest[prop] = request[prop];
            }
-            if (!workerRequest.hasOwnProperty(prop)) {
+            if (!workerRequest[prop]) {
                workerRequest[prop] = REQUEST_DEFAULTS[prop];
            }
            workerRequest[prop] = Number(workerRequest[prop]);
        });
-        workerRequest.name = domainObject.name;
+
        return workerRequest;
    };

@@ -82,8 +78,8 @@ define([
        return this.workerInterface.request(workerRequest);
    };

-    GeneratorProvider.prototype.subscribe = function (domainObject, callback) {
-        var workerRequest = this.makeWorkerRequest(domainObject, {});
+    GeneratorProvider.prototype.subscribe = function (domainObject, callback, request) {
+        var workerRequest = this.makeWorkerRequest(domainObject, request);
        return this.workerInterface.subscribe(workerRequest, callback);
    };

--- a/example/generator/SinewaveLimitCapability.js
+++ b/example/generator/SinewaveLimitCapability.js
@@ -0,0 +1,87 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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.
+ *****************************************************************************/
+/*global define*/
+
+define(
+    [],
+    function () {
+        "use strict";
+
+        var RED = 0.9,
+            YELLOW = 0.5,
+            LIMITS = {
+                rh: {
+                    cssClass: "s-limit-upr s-limit-red",
+                    low: RED,
+                    high: Number.POSITIVE_INFINITY,
+                    name: "Red High"
+                },
+                rl: {
+                    cssClass: "s-limit-lwr s-limit-red",
+                    high: -RED,
+                    low: Number.NEGATIVE_INFINITY,
+                    name: "Red Low"
+                },
+                yh: {
+                    cssClass: "s-limit-upr s-limit-yellow",
+                    low: YELLOW,
+                    high: RED,
+                    name: "Yellow High"
+                },
+                yl: {
+                    cssClass: "s-limit-lwr s-limit-yellow",
+                    low: -RED,
+                    high: -YELLOW,
+                    name: "Yellow Low"
+                }
+            };
+
+        function SinewaveLimitCapability(domainObject) {
+            return {
+                limits: function (range) {
+                    return LIMITS;
+                },
+                evaluate: function (datum, range) {
+                    range = range || 'sin';
+                    if (datum[range] > RED) {
+                        return LIMITS.rh;
+                    }
+                    if (datum[range] < -RED) {
+                        return LIMITS.rl;
+                    }
+                    if (datum[range] > YELLOW) {
+                        return LIMITS.yh;
+                    }
+                    if (datum[range] < -YELLOW) {
+                        return LIMITS.yl;
+                    }
+                }
+            };
+        }
+
+        SinewaveLimitCapability.appliesTo = function (model) {
+            return model.type === 'generator';
+        };
+
+        return SinewaveLimitCapability;
+    }
+);
--- a/example/generator/SinewaveLimitProvider.js
+++ b/example/generator/SinewaveLimitProvider.js
@@ -1,88 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, 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.
- *****************************************************************************/
-/*global define*/
-
-define([
-
-], function (
-
-) {
-
-    var RED = 0.9,
-        YELLOW = 0.5,
-        LIMITS = {
-            rh: {
-                cssClass: "s-limit-upr s-limit-red",
-                low: RED,
-                high: Number.POSITIVE_INFINITY,
-                name: "Red High"
-            },
-            rl: {
-                cssClass: "s-limit-lwr s-limit-red",
-                high: -RED,
-                low: Number.NEGATIVE_INFINITY,
-                name: "Red Low"
-            },
-            yh: {
-                cssClass: "s-limit-upr s-limit-yellow",
-                low: YELLOW,
-                high: RED,
-                name: "Yellow High"
-            },
-            yl: {
-                cssClass: "s-limit-lwr s-limit-yellow",
-                low: -RED,
-                high: -YELLOW,
-                name: "Yellow Low"
-            }
-        };
-
-    function SinewaveLimitProvider() {
-
-    }
-
-    SinewaveLimitProvider.prototype.supportsLimits = function (domainObject) {
-        return domainObject.type === 'generator';
-    };
-
-    SinewaveLimitProvider.prototype.getLimitEvaluator = function (domainObject) {
-        return {
-            evaluate: function (datum, valueMetadata) {
-                var range = valueMetadata ? valueMetadata.key : 'sin'
-                if (datum[range] > RED) {
-                    return LIMITS.rh;
-                }
-                if (datum[range] < -RED) {
-                    return LIMITS.rl;
-                }
-                if (datum[range] > YELLOW) {
-                    return LIMITS.yh;
-                }
-                if (datum[range] < -YELLOW) {
-                    return LIMITS.yl;
-                }
-            }
-        };
-    };
-
-    return SinewaveLimitProvider;
-});
--- a/example/generator/StateGeneratorProvider.js
+++ b/example/generator/StateGeneratorProvider.js
@@ -1,82 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, 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 (
-
-) {
-
-    function StateGeneratorProvider() {
-
-    }
-
-    function pointForTimestamp(timestamp, duration, name) {
-        return {
-            name: name,
-            utc: Math.floor(timestamp / duration) * duration,
-            value: Math.floor(timestamp / duration) % 2
-        };
-    }
-
-    StateGeneratorProvider.prototype.supportsSubscribe = function (domainObject) {
-        return domainObject.type === 'example.state-generator';
-    };
-
-    StateGeneratorProvider.prototype.subscribe = function (domainObject, callback) {
-        var duration = domainObject.telemetry.duration * 1000;
-
-        var interval = setInterval(function () {
-            var now = Date.now();
-            var datum = pointForTimestamp(now, duration, domainObject.name);
-            datum.value += "";
-            callback(datum);
-        }, duration);
-
-        return function () {
-            clearInterval(interval);
-        };
-    };
-
-
-    StateGeneratorProvider.prototype.supportsRequest = function (domainObject, options) {
-        return domainObject.type === 'example.state-generator';
-    };
-
-    StateGeneratorProvider.prototype.request = function (domainObject, options) {
-        var start = options.start;
-        var end = options.end;
-        var duration = domainObject.telemetry.duration * 1000;
-        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 += 5000;
-        }
-        return Promise.resolve(data);
-    };
-
-    return StateGeneratorProvider;
-
-});
--- a/example/generator/WorkerInterface.js
+++ b/example/generator/WorkerInterface.js
@@ -44,7 +44,9 @@ define([
        message = message.data;
        var callback = this.callbacks[message.id];
        if (callback) {
-            callback(message);
+            if (callback(message)) {
+                delete this.callbacks[message.id];
+            }
        }
    };

@@ -70,7 +72,6 @@ define([
            deferred.resolve = resolve;
            deferred.reject = reject;
        });
-        var messageId;

        function callback(message) {
            if (message.error) {
@@ -78,27 +79,33 @@ define([
            } else {
                deferred.resolve(message.data);
            }
-            delete this.callbacks[messageId];
+            return true;
        }

-        messageId = this.dispatch('request', request, callback.bind(this));
+        this.dispatch('request', request, callback);

        return promise;
    };

    WorkerInterface.prototype.subscribe = function (request, cb) {
-        function callback(message) {
+        var isCancelled = false;
+
+        var callback = function (message) {
+            if (isCancelled) {
+                return true;
+            }
            cb(message.data);
        };

-        var messageId = this.dispatch('subscribe', request, callback);
+        var messageId = this.dispatch('subscribe', request, callback)

        return function () {
+            isCancelled = true;
            this.dispatch('unsubscribe', {
                id: messageId
            });
-            delete this.callbacks[messageId];
        }.bind(this);
+
    };


--- a/example/generator/generatorWorker.js
+++ b/example/generator/generatorWorker.js
@@ -62,11 +62,10 @@
                self.postMessage({
                    id: message.id,
                    data: {
-                        name: data.name,
                        utc: nextStep,
                        yesterday: nextStep - 60*60*24*1000,
-                        sin: sin(nextStep, data.period, data.amplitude, data.offset, data.phase),
-                        cos: cos(nextStep, data.period, data.amplitude, data.offset, data.phase)
+                        sin: sin(nextStep, data.period, data.amplitude, data.offset),
+                        cos: cos(nextStep, data.period, data.amplitude, data.offset)
                    }
                });
                nextStep += step;
@@ -83,22 +82,21 @@
    }

    function onRequest(message) {
-        var request = message.data;
-        if (request.end == undefined) {
-            request.end = Date.now();
+        var data = message.data;
+        if (data.end == undefined) {
+            data.end = Date.now();
        }
-        if (request.start == undefined){
-            request.start = request.end - FIFTEEN_MINUTES;
+        if (data.start == undefined){
+            data.start = data.end - FIFTEEN_MINUTES;
        }

        var now = Date.now();
-        var start = request.start;
-        var end = request.end > now ? now : request.end;
-        var amplitude = request.amplitude;
-        var period = request.period;
-        var offset = request.offset;
-        var dataRateInHz = request.dataRateInHz;
-        var phase = request.phase;
+        var start = data.start;
+        var end = data.end > now ? now : data.end;
+        var amplitude = data.amplitude;
+        var period = data.period;
+        var offset = data.offset;
+        var dataRateInHz = data.dataRateInHz;

        var step = 1000 / dataRateInHz;
        var nextStep = start - (start % step) + step;
@@ -107,11 +105,10 @@

        for (; nextStep < end && data.length < 5000; nextStep += step) {
            data.push({
-                name: request.name,
                utc: nextStep,
                yesterday: nextStep - 60*60*24*1000,
-                sin: sin(nextStep, period, amplitude, offset, phase),
-                cos: cos(nextStep, period, amplitude, offset, phase)
+                sin: sin(nextStep, period, amplitude, offset),
+                cos: cos(nextStep, period, amplitude, offset)
            });
        }
        self.postMessage({
@@ -120,14 +117,14 @@
        });
    }

-    function cos(timestamp, period, amplitude, offset, phase) {
+    function cos(timestamp, period, amplitude, offset) {
        return amplitude *
-            Math.cos(phase + (timestamp / period / 1000 * Math.PI * 2)) + offset;
+            Math.cos(timestamp / period / 1000 * Math.PI * 2) + offset;
    }

-    function sin(timestamp, period, amplitude, offset, phase) {
+    function sin(timestamp, period, amplitude, offset) {
        return amplitude *
-            Math.sin(phase + (timestamp / period / 1000 * Math.PI * 2)) + offset;
+            Math.sin(timestamp / period / 1000 * Math.PI * 2) + offset;
    }

    function sendError(error, message) {
--- a/example/generator/plugin.js
+++ b/example/generator/plugin.js
@@ -23,46 +23,29 @@

 define([
    "./GeneratorProvider",
-    "./SinewaveLimitProvider",
-    "./StateGeneratorProvider",
-    "./GeneratorMetadataProvider"
+    "./SinewaveLimitCapability"
 ], function (
    GeneratorProvider,
-    SinewaveLimitProvider,
-    StateGeneratorProvider,
-    GeneratorMetadataProvider
+    SinewaveLimitCapability
 ) {

-    return function(openmct){
-
-        openmct.types.addType("example.state-generator", {
-            name: "State Generator",
-            description: "For development use.  Generates test enumerated telemetry by cycling through a given set of states",
-            cssClass: "icon-telemetry",
-            creatable: true,
-            form: [
-                {
-                    name: "State Duration (seconds)",
-                    control: "textfield",
-                    cssClass: "l-input-sm l-numeric",
-                    key: "duration",
-                    required: true,
-                    property: [
-                        "telemetry",
-                        "duration"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
-                }
-            ],
-            initialize: function (object) {
-                object.telemetry = {
-                    duration: 5
-                }
+    var legacyExtensions = {
+        "capabilities": [
+            {
+                "key": "limit",
+                "implementation": SinewaveLimitCapability
            }
+        ]
+    };
+
+    return function(openmct){
+        //Register legacy extensions for things not yet supported by the new API
+        Object.keys(legacyExtensions).forEach(function (type){
+            var extensionsOfType = legacyExtensions[type];
+            extensionsOfType.forEach(function (extension) {
+                openmct.legacyExtension(type, extension)
+            })
        });
-
-        openmct.telemetry.addProvider(new StateGeneratorProvider());
-
        openmct.types.addType("generator", {
            name: "Sine Wave Generator",
            description: "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
@@ -71,58 +54,51 @@ define([
            form: [
                {
                    name: "Period",
-                    control: "numberfield",
+                    control: "textfield",
                    cssClass: "l-input-sm l-numeric",
                    key: "period",
                    required: true,
                    property: [
                        "telemetry",
                        "period"
-                    ]
+                    ],
+                    pattern: "^\\d*(\\.\\d*)?$"
                },
                {
                    name: "Amplitude",
-                    control: "numberfield",
+                    control: "textfield",
                    cssClass: "l-input-sm l-numeric",
                    key: "amplitude",
                    required: true,
                    property: [
                        "telemetry",
                        "amplitude"
-                    ]
+                    ],
+                    pattern: "^\\d*(\\.\\d*)?$"
                },
                {
                    name: "Offset",
-                    control: "numberfield",
+                    control: "textfield",
                    cssClass: "l-input-sm l-numeric",
                    key: "offset",
                    required: true,
                    property: [
                        "telemetry",
                        "offset"
-                    ]
+                    ],
+                    pattern: "^\\d*(\\.\\d*)?$"
                },
                {
                    name: "Data Rate (hz)",
-                    control: "numberfield",
+                    control: "textfield",
                    cssClass: "l-input-sm l-numeric",
                    key: "dataRateInHz",
                    required: true,
                    property: [
                        "telemetry",
                        "dataRateInHz"
-                    ]
-                },
-                {
-                    name: "Phase (radians)",
-                    control: "numberfield",
-                    cssClass: "l-input-sm l-numeric",
-                    key: "phase",
-                    required: true,
-                    property: [
-                        "telemetry",
-                        "phase"
-                    ]
+                    ],
+                    pattern: "^\\d*(\\.\\d*)?$"
                }
            ],
            initialize: function (object) {
@@ -131,14 +107,42 @@ define([
                    amplitude: 1,
                    offset: 0,
                    dataRateInHz: 1,
-                    phase: 0
+                    values: [
+                        {
+                            key: "utc",
+                            name: "Time",
+                            format: "utc",
+                            hints: {
+                                domain: 1
+                            }
+                        },
+                        {
+                            key: "yesterday",
+                            name: "Yesterday",
+                            format: "utc",
+                            hints: {
+                                domain: 2
+                            }
+                        },
+                        {
+                            key: "sin",
+                            name: "Sine",
+                            hints: {
+                                range: 1
+                            }
+                        },
+                        {
+                            key: "cos",
+                            name: "Cosine",
+                            hints: {
+                                range: 2
+                            }
+                        }
+                    ]
                };
            }
        });
-
        openmct.telemetry.addProvider(new GeneratorProvider());
-        openmct.telemetry.addProvider(new GeneratorMetadataProvider());
-        openmct.telemetry.addProvider(new SinewaveLimitProvider());
    };

 });
--- a/example/imagery/plugin.js
+++ b/example/imagery/plugin.js
@@ -48,9 +48,8 @@ define([
                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18748.jpg"
            ];

-        function pointForTimestamp(timestamp, name) {
+        function pointForTimestamp(timestamp) {
            return {
-                name: name,
                utc: Math.floor(timestamp / 5000) * 5000,
                url: IMAGE_SAMPLES[Math.floor(timestamp / 5000) % IMAGE_SAMPLES.length]
            };
@@ -62,7 +61,7 @@ define([
            },
            subscribe: function (domainObject, callback) {
                var interval = setInterval(function () {
-                    callback(pointForTimestamp(Date.now(), domainObject.name));
+                    callback(pointForTimestamp(Date.now()));
                }, 5000);

                return function (interval) {
@@ -80,8 +79,8 @@ define([
                var start = options.start;
                var end = options.end;
                var data = [];
-                while (start <= end && data.length < 5000) {
-                    data.push(pointForTimestamp(start, domainObject.name));
+                while (start < end && data.length < 5000) {
+                    data.push(pointForTimestamp(start));
                    start += 5000;
                }
                return Promise.resolve(data);
@@ -94,7 +93,7 @@ define([
                    options.strategy === 'latest';
            },
            request: function (domainObject, options) {
-                return Promise.resolve([pointForTimestamp(Date.now(), domainObject.name)]);
+                return Promise.resolve([pointForTimestamp(Date.now())]);
            }
        };

@@ -110,10 +109,6 @@ define([
                initialize: function (object) {
                    object.telemetry = {
                        values: [
-                            {
-                                name: 'Name',
-                                key: 'name'
-                            },
                            {
                                name: 'Time',
                                key: 'utc',
--- a/example/plotOptions/bundle.js
+++ b/example/plotOptions/bundle.js
@@ -0,0 +1,146 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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.
+ *****************************************************************************/
+/*global define*/
+
+define([
+    'legacyRegistry',
+    '../../platform/commonUI/browse/src/InspectorRegion',
+    '../../platform/commonUI/regions/src/Region'
+], function (
+    legacyRegistry,
+    InspectorRegion,
+    Region
+) {
+    "use strict";
+
+    /**
+     * Add a 'plot options' region part to the inspector region for the
+     * Telemetry Plot type only. {@link InspectorRegion} is a default region
+     * implementation that is added automatically to all types. In order to
+     * customize what appears in the inspector region, you can start from a
+     * blank slate by using Region, or customize the default inspector
+     * region by using {@link InspectorRegion}.
+     */
+    var plotInspector = new InspectorRegion(),
+     /**
+      * Two region parts are defined here. One that appears only in browse
+      * mode, and one that appears only in edit mode. For not they both point
+      * to the same representation, but a different key could be used here to
+      * include a customized representation for edit mode.
+      */
+        plotOptionsBrowseRegion = new Region({
+            name: "plot-options",
+            title: "Plot Options",
+            modes: ['browse'],
+            content: {
+                key: "plot-options-browse"
+            }
+        }),
+        plotOptionsEditRegion = new Region({
+            name: "plot-options",
+            title: "Plot Options",
+            modes: ['edit'],
+            content: {
+                key: "plot-options-browse"
+            }
+        });
+
+    /**
+     * Both parts are added, and policies of type 'region' will determine
+     * which is shown based on domain object state. A default policy is
+     * provided which will check the 'modes' attribute of the region part
+     * definition.
+     */
+    plotInspector.addRegion(plotOptionsBrowseRegion);
+    plotInspector.addRegion(plotOptionsEditRegion);
+
+    legacyRegistry.register("example/plotType", {
+        "name": "Plot Type",
+        "description": "Example illustrating registration of a new object type",
+        "extensions": {
+            "types": [
+                {
+                    "key": "plot",
+                    "name": "Example Telemetry Plot",
+                    "cssClass": "icon-telemetry-panel",
+                    "description": "For development use. A plot for displaying telemetry.",
+                    "priority": 10,
+                    "delegates": [
+                        "telemetry"
+                    ],
+                    "features": "creation",
+                    "contains": [
+                        {
+                            "has": "telemetry"
+                        }
+                    ],
+                    "model": {
+                        "composition": []
+                    },
+                    "inspector": plotInspector,
+                    "telemetry": {
+                        "source": "generator",
+                        "domains": [
+                            {
+                                "key": "time",
+                                "name": "Time"
+                            },
+                            {
+                                "key": "yesterday",
+                                "name": "Yesterday"
+                            },
+                            {
+                                "key": "delta",
+                                "name": "Delta",
+                                "format": "example.delta"
+                            }
+                        ],
+                        "ranges": [
+                            {
+                                "key": "sin",
+                                "name": "Sine"
+                            },
+                            {
+                                "key": "cos",
+                                "name": "Cosine"
+                            }
+                        ]
+                    },
+                    "properties": [
+                        {
+                            "name": "Period",
+                            "control": "textfield",
+                            "cssClass": "l-input-sm l-numeric",
+                            "key": "period",
+                            "required": true,
+                            "property": [
+                                "telemetry",
+                                "period"
+                            ],
+                            "pattern": "^\\d*(\\.\\d*)?$"
+                        }
+                    ]
+                }
+            ]
+        }
+    });
+});
--- a/example/styleguide/res/sass/_style-guide-base.scss
+++ b/example/styleguide/res/sass/_style-guide-base.scss
@@ -58,7 +58,11 @@
        position: relative;
    }

-    .w-mct-example > div { margin-bottom: $interiorMarginLg; }
+    .w-mct-example {
+        div {
+            margin-bottom: $interiorMarginLg;
+        }
+    }

    code,
    pre {
@@ -101,11 +105,11 @@
        padding-top: 1em;

        .cols {
-            display: flex;
-            flex-direction: row;
+            @include display(flex);
+            @include flex-direction(row);

            .col {
-                flex: 1 1 auto;
+                @include flex(1 1 auto);
                &:not(:last-child) {
                    $v: $interiorMargin * 4;
                    border-right: 1px solid $colorInteriorBorder;
@@ -199,7 +203,7 @@
                border-radius: 15%;
                position: absolute;
                left: 50%;
-                transform: translateX(-50%);
+                @include transform(translateX(-50%));
            }
        }
    }
--- a/example/styleguide/res/templates/glyphs.html
+++ b/example/styleguide/res/templates/glyphs.html
@@ -127,8 +127,7 @@
 { 'meaning': 'Timer object', 'cssClass': 'icon-timer', 'cssContent': 'e1127', 'htmlEntity': '&amp;#xe1127' },
 { 'meaning': 'Data Topic', 'cssClass': 'icon-topic', 'cssContent': 'e1128', 'htmlEntity': '&amp;#xe1128' },
 { 'meaning': 'Fixed Position object', 'cssClass': 'icon-box-with-dashed-lines', 'cssContent': 'e1129', 'htmlEntity': '&amp;#xe1129' },
-{ 'meaning': 'Summary Widget', 'cssClass': 'icon-summary-widget', 'cssContent': 'e1130', 'htmlEntity': '&amp;#xe1130' },
-{ 'meaning': 'Notebook object', 'cssClass': 'icon-notebook', 'cssContent': 'e1131', 'htmlEntity': '&amp;#xe1131' }
+{ 'meaning': 'Summary Widget', 'cssClass': 'icon-summary-widget', 'cssContent': 'e1130', 'htmlEntity': '&amp;#xe1130' }
 ];
 "></div>

--- a/example/styleguide/res/templates/menus.html
+++ b/example/styleguide/res/templates/menus.html
@@ -121,7 +121,7 @@
        <h2>Palettes</h2>
        <div class="cols cols1-1">
            <div class="col">
-                <p>Use a palette to provide color choices. Similar to context menus and dropdowns, palettes should be dismissed when a choice is made within them, or if the user clicks outside one. Selected palette choices should utilize the <code>selected</code> CSS class to visualize indicate that state.</p>
+                <p>Use a palette to provide color choices. Similar to context menus and dropdowns, palettes should be dismissed when a choice is made within them, or if the user clicks outside one.</p>
                <p>Note that while this example uses static markup for illustrative purposes, don't do this - use a front-end framework with repeaters to build the color choices.</p>
            </div>
            <mct-example><div style="height: 220px" title="Ignore me, I'm just here to provide space for this example.">
@@ -129,9 +129,9 @@
 <div class="s-button s-menu-button menu-element t-color-palette icon-paint-bucket" ng-controller="ClickAwayController as toggle">
    <span class="l-click-area" ng-click="toggle.toggle()"></span>
    <span class="color-swatch" style="background: rgb(255, 0, 0);"></span>
-    <div class="menu l-palette l-color-palette" ng-show="toggle.isActive()">
+    <div class="menu l-color-palette" ng-show="toggle.isActive()">
        <div class="l-palette-row l-option-row">
-            <div class="l-palette-item s-palette-item no-selection"></div>
+            <div class="l-palette-item s-palette-item " ng-click="ngModel[field] = 'transparent'"></div>
            <span class="l-palette-item-label">None</span>
        </div>
        <div class="l-palette-row">
@@ -147,7 +147,7 @@
            <div class="l-palette-item s-palette-item" style="background: rgb(255, 255, 255);"></div>
        </div>
        <div class="l-palette-row">
-            <div class="l-palette-item s-palette-item selected" style="background: rgb(255, 0, 0);"></div>
+            <div class="l-palette-item s-palette-item" style="background: rgb(136, 32, 32);"></div>
            <div class="l-palette-item s-palette-item" style="background: rgb(224, 64, 64);"></div>
            <div class="l-palette-item s-palette-item" style="background: rgb(240, 160, 72);"></div>
            <div class="l-palette-item s-palette-item" style="background: rgb(255, 248, 96);"></div>
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -22,8 +22,6 @@

 /*global require,__dirname*/

-require("v8-compile-cache");
-
 var gulp = require('gulp'),
    sourcemaps = require('gulp-sourcemaps'),
    path = require('path'),
@@ -48,22 +46,9 @@ var gulp = require('gulp'),
            name: 'bower_components/almond/almond.js',
            include: paths.main.replace('.js', ''),
            wrap: {
-                start: (function () {
-                    var buildVariables = {
-                        version: project.version,
-                        timestamp: moment.utc(Date.now()).format(),
-                        revision: fs.existsSync('.git') ? git.long() : 'Unknown',
-                        branch: fs.existsSync('.git') ? git.branch() : 'Unknown'
-                    };
-                    return fs.readFileSync("src/start.frag", 'utf-8')
-                        .replace(/@@(\w+)/g, function (match, key) {
-                            return buildVariables[key];
-                        });;
-                }()),
+                startFile: "src/start.frag",
                endFile: "src/end.frag"
            },
-            optimize: 'uglify2',
-            uglify2: { output: { comments: /@preserve/ } },
            mainConfigFile: paths.main,
            wrapShim: true
        },
@@ -73,6 +58,14 @@ var gulp = require('gulp'),
        },
        sass: {
            sourceComments: true
+        },
+        replace: {
+            variables: {
+                version: project.version,
+                timestamp: moment.utc(Date.now()).format(),
+                revision: fs.existsSync('.git') ? git.long() : 'Unknown',
+                branch: fs.existsSync('.git') ? git.branch() : 'Unknown'
+            }
        }
    };

@@ -83,11 +76,16 @@ if (process.env.NODE_ENV === 'development') {

 gulp.task('scripts', function () {
    var requirejsOptimize = require('gulp-requirejs-optimize');
+    var replace = require('gulp-replace-task');
+    var header = require('gulp-header');
+    var comment = fs.readFileSync('src/about.frag');

    return gulp.src(paths.main)
        .pipe(sourcemaps.init())
        .pipe(requirejsOptimize(options.requirejsOptimize))
        .pipe(sourcemaps.write('.'))
+        .pipe(replace(options.replace))
+        .pipe(header(comment, options.replace.variables))
        .pipe(gulp.dest(paths.dist));
 });

@@ -179,4 +177,4 @@ gulp.task('install', [ 'assets', 'scripts' ]);

 gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]);

-gulp.task('build', [ 'verify', 'install' ]);
+gulp.task('build', [ 'verify', 'install' ]);
--- a/index.html
+++ b/index.html
@@ -21,69 +21,65 @@
 -->
 <!doctype html>
 <html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no">
-        <meta name="apple-mobile-web-app-capable" content="yes">
-        <title></title>
-        <script src="bower_components/requirejs/require.js"> </script>
-        <script>
-            var THIRTY_MINUTES = 30 * 60 * 1000;
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <title></title>
+    <script src="bower_components/requirejs/require.js">
+    </script>
+    <script>
+        var THIRTY_MINUTES = 30 * 60 * 1000;

-            require(['openmct'], function (openmct) {
-                [
-                    'example/eventGenerator',
-                    'example/styleguide'
-                ].forEach(
-                    openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
-                );
-                openmct.install(openmct.plugins.MyItems());
-                openmct.install(openmct.plugins.LocalStorage());
-                openmct.install(openmct.plugins.Espresso());
-                openmct.install(openmct.plugins.Generator());
-                openmct.install(openmct.plugins.ExampleImagery());
-                openmct.install(openmct.plugins.UTCTimeSystem());
-                openmct.install(openmct.plugins.ImportExport());
-                openmct.install(openmct.plugins.AutoflowView({
-                    type: "telemetry.panel"
-                }));
-                openmct.install(openmct.plugins.Conductor({
-                    menuOptions: [
-                        {
-                            name: "Fixed",
-                            timeSystem: 'utc',
-                            bounds: {
-                                start: Date.now() - THIRTY_MINUTES,
-                                end: Date.now()
-                            }
-                        },
-                        {
-                            name: "Realtime",
-                            timeSystem: 'utc',
-                            clock: 'local',
-                            clockOffsets: {
-                                start: -25 * 60 * 1000,
-                                end: 5 * 60 * 1000
-                            }
+        require(['openmct'], function (openmct) {
+            [
+                'example/eventGenerator',
+                'example/styleguide'
+            ].forEach(
+                openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
+            );
+            openmct.install(openmct.plugins.MyItems());
+            openmct.install(openmct.plugins.LocalStorage());
+            openmct.install(openmct.plugins.Espresso());
+            openmct.install(openmct.plugins.Generator());
+            openmct.install(openmct.plugins.ExampleImagery());
+            openmct.install(openmct.plugins.UTCTimeSystem());
+            openmct.install(openmct.plugins.ImportExport());
+            openmct.install(openmct.plugins.Conductor({
+                menuOptions: [
+                    {
+                        name: "Fixed",
+                        timeSystem: 'utc',
+                        bounds: {
+                            start: Date.now() - 30 * 60 * 1000,
+                            end: Date.now()
                        }
-                    ]
-                }));
-                openmct.install(openmct.plugins.SummaryWidget());
-                openmct.time.clock('local', {start: -THIRTY_MINUTES, end: 0});
-                openmct.time.timeSystem('utc');
-                openmct.start();
-            });
-        </script>
-        <link rel="stylesheet" href="platform/commonUI/general/res/css/startup-base.css">
-        <link rel="stylesheet" href="platform/commonUI/general/res/css/openmct.css">
-        <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-32x32.png" sizes="32x32">
-        <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-96x96.png" sizes="96x96">
-        <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-16x16.png" sizes="16x16">
-        <link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico">
-    </head>
-    <body>
-        <div class="l-splash-holder s-splash-holder">
-            <div class="l-splash s-splash"></div>
-        </div>
-    </body>
+                    },
+                    {
+                        name: "Realtime",
+                        timeSystem: 'utc',
+                        clock: 'local',
+                        clockOffsets: {
+                            start: -25 * 60 * 1000,
+                            end: 5 * 60 * 1000
+                        }
+                    }
+                ]
+            }));
+            openmct.time.clock('local', {start: -THIRTY_MINUTES, end: 0});
+            openmct.time.timeSystem('utc');
+            openmct.start();
+        });
+    </script>
+    <link rel="stylesheet" href="platform/commonUI/general/res/css/startup-base.css">
+    <link rel="stylesheet" href="platform/commonUI/general/res/css/openmct.css">
+    <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico">
+</head>
+<body class="user-environ">
+    <div class="l-splash-holder s-splash-holder">
+        <div class="l-splash s-splash"></div>
+    </div>
+</body>
 </html>
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -36,14 +36,14 @@ module.exports = function(config) {
        files: [
            {pattern: 'bower_components/**/*.js', included: false},
            {pattern: 'node_modules/d3-*/**/*.js', included: false},
-            {pattern: 'node_modules/vue/**/*.js', included: false},
-            {pattern: 'src/**/*', included: false},
+            {pattern: 'src/**/*.js', included: false},
            {pattern: 'example/**/*.html', included: false},
            {pattern: 'example/**/*.js', included: false},
            {pattern: 'example/**/*.json', included: false},
            {pattern: 'platform/**/*.js', included: false},
            {pattern: 'warp/**/*.js', included: false},
            {pattern: 'platform/**/*.html', included: false},
+            {pattern: 'src/**/*.html', included: false},
            'test-main.js'
        ],

@@ -88,8 +88,7 @@ module.exports = function(config) {
                "dist/reports/coverage",
            check: {
                global: {
-                    lines: 80,
-                    excludes: ['src/plugins/plot/**/*.js']
+                    lines: 80
                }
            }
        },
--- a/openmct.js
+++ b/openmct.js
@@ -19,7 +19,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-/*global requirejs,BUILD_CONSTANTS*/
+/*global requirejs*/

 requirejs.config({
    "paths": {
@@ -33,14 +33,13 @@ requirejs.config({
        "moment": "bower_components/moment/moment",
        "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format",
        "moment-timezone": "bower_components/moment-timezone/builds/moment-timezone-with-data",
-        "saveAs": "bower_components/file-saver/FileSaver.min",
+        "saveAs": "bower_components/FileSaver.js/FileSaver.min",
        "screenfull": "bower_components/screenfull/dist/screenfull.min",
        "text": "bower_components/text/text",
        "uuid": "bower_components/node-uuid/uuid",
-        "vue": "node_modules/vue/dist/vue.min",
        "zepto": "bower_components/zepto/zepto.min",
        "lodash": "bower_components/lodash/lodash",
-        "d3-selection": "node_modules/d3-selection/dist/d3-selection.min",
+        "d3-selection": "node_modules/d3-selection/build/d3-selection.min",
        "d3-scale": "node_modules/d3-scale/build/d3-scale.min",
        "d3-axis": "node_modules/d3-axis/build/d3-axis.min",
        "d3-array": "node_modules/d3-array/build/d3-array.min",
@@ -67,9 +66,6 @@ requirejs.config({
        "moment-duration-format": {
            "deps": ["moment"]
        },
-        "saveAs": {
-            "exports": "saveAs"
-        },
        "screenfull": {
            "exports": "screenfull"
        },
@@ -95,17 +91,11 @@ requirejs.config({
 define([
    './platform/framework/src/Main',
    './src/defaultRegistry',
-    './src/MCT',
-    './src/plugins/buildInfo/plugin'
-], function (Main, defaultRegistry, MCT, buildInfo) {
+    './src/MCT'
+], function (Main, defaultRegistry, MCT) {
    var openmct = new MCT();

    openmct.legacyRegistry = defaultRegistry;
-    openmct.install(openmct.plugins.Plot());
-
-    if (typeof BUILD_CONSTANTS !== 'undefined') {
-        openmct.install(buildInfo(BUILD_CONSTANTS));
-    }

    openmct.on('start', function () {
        return new Main().run(defaultRegistry);
--- a/package.json
+++ b/package.json
@@ -1,34 +1,35 @@
 {
  "name": "openmct",
-  "version": "0.14.0-SNAPSHOT",
+  "version": "0.12.1-SNAPSHOT",
  "description": "The Open MCT core platform",
  "dependencies": {
-    "d3-array": "1.2.x",
-    "d3-axis": "1.0.x",
-    "d3-collection": "1.0.x",
-    "d3-color": "1.0.x",
-    "d3-format": "1.2.x",
-    "d3-interpolate": "1.1.x",
-    "d3-scale": "1.0.x",
-    "d3-selection": "1.3.x",
-    "d3-time": "1.0.x",
-    "d3-time-format": "2.1.x",
+    "d3-array": "^1.0.2",
+    "d3-axis": "^1.0.4",
+    "d3-collection": "^1.0.2",
+    "d3-color": "^1.0.2",
+    "d3-format": "^1.0.2",
+    "d3-interpolate": "^1.1.3",
+    "d3-scale": "^1.0.4",
+    "d3-selection": "^1.0.3",
+    "d3-time": "^1.0.4",
+    "d3-time-format": "^2.0.3",
    "express": "^4.13.1",
    "minimist": "^1.1.1",
-    "request": "^2.69.0",
-    "vue": "^2.5.6"
+    "request": "^2.69.0"
  },
  "devDependencies": {
    "bower": "^1.7.7",
    "git-rev-sync": "^1.4.0",
    "glob": ">= 3.0.0",
    "gulp": "^3.9.1",
+    "gulp-header": "^1.8.8",
    "gulp-jscs": "^3.0.2",
    "gulp-jshint": "^2.0.0",
    "gulp-jshint-html-reporter": "^0.1.3",
    "gulp-rename": "^1.2.2",
+    "gulp-replace-task": "^0.11.0",
    "gulp-requirejs-optimize": "^0.3.1",
-    "gulp-sass": "^3.1.0",
+    "gulp-sass": "^2.2.0",
    "gulp-sourcemaps": "^1.6.0",
    "jasmine-core": "^2.3.0",
    "jscs-html-reporter": "^0.1.0",
@@ -50,8 +51,7 @@
    "moment": "^2.11.1",
    "node-bourbon": "^4.2.3",
    "requirejs": "2.1.x",
-    "split": "^1.0.0",
-    "v8-compile-cache": "^1.1.0"
+    "split": "^1.0.0"
  },
  "scripts": {
    "start": "node app.js",
@@ -61,7 +61,7 @@
    "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
    "otherdoc": "node docs/gendocs.js --in docs/src --out dist/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",
    "docs": "npm run jsdoc ; npm run otherdoc",
-    "prepare": "node ./node_modules/bower/bin/bower install && node ./node_modules/gulp/bin/gulp.js install"
+    "prepublish": "node ./node_modules/bower/bin/bower install && node ./node_modules/gulp/bin/gulp.js install"
  },
  "repository": {
    "type": "git",
--- a/platform/commonUI/about/bundle.js
+++ b/platform/commonUI/about/bundle.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/res/templates/about-dialog.html
+++ b/platform/commonUI/about/res/templates/about-dialog.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

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

--- a/platform/commonUI/about/res/templates/app-logo.html
+++ b/platform/commonUI/about/res/templates/app-logo.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/license-apache.html
+++ b/platform/commonUI/about/res/templates/license-apache.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/license-mit.html
+++ b/platform/commonUI/about/res/templates/license-mit.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/licenses-export-md.html
+++ b/platform/commonUI/about/res/templates/licenses-export-md.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/licenses.html
+++ b/platform/commonUI/about/res/templates/licenses.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/overlay-about.html
+++ b/platform/commonUI/about/res/templates/overlay-about.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/src/AboutController.js
+++ b/platform/commonUI/about/src/AboutController.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/src/LicenseController.js
+++ b/platform/commonUI/about/src/LicenseController.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/src/LogoController.js
+++ b/platform/commonUI/about/src/LogoController.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/test/AboutControllerSpec.js
+++ b/platform/commonUI/about/test/AboutControllerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/test/LicenseControllerSpec.js
+++ b/platform/commonUI/about/test/LicenseControllerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/test/LogoControllerSpec.js
+++ b/platform/commonUI/about/test/LogoControllerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/bundle.js
+++ b/platform/commonUI/browse/bundle.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -26,7 +26,6 @@ define([
    "./src/InspectorPaneController",
    "./src/BrowseObjectController",
    "./src/MenuArrowController",
-    "./src/ObjectHeaderController",
    "./src/navigation/NavigationService",
    "./src/navigation/NavigateAction",
    "./src/navigation/OrphanNavigationHandler",
@@ -37,7 +36,6 @@ define([
    "text!./res/templates/browse-object.html",
    "text!./res/templates/items/grid-item.html",
    "text!./res/templates/browse/object-header.html",
-    "text!./res/templates/browse/object-header-frame.html",
    "text!./res/templates/menu-arrow.html",
    "text!./res/templates/back-arrow.html",
    "text!./res/templates/items/items.html",
@@ -50,7 +48,6 @@ define([
    InspectorPaneController,
    BrowseObjectController,
    MenuArrowController,
-    ObjectHeaderController,
    NavigationService,
    NavigateAction,
    OrphanNavigationHandler,
@@ -61,7 +58,6 @@ define([
    browseObjectTemplate,
    gridItemTemplate,
    objectHeaderTemplate,
-    objectHeaderFrameTemplate,
    menuArrowTemplate,
    backArrowTemplate,
    itemsTemplate,
@@ -113,8 +109,7 @@ define([
                        "agentService",
                        "$window",
                        "$location",
-                        "$attrs",
-                        "navigationService"
+                        "$attrs"
                    ]
                },
                {
@@ -145,13 +140,6 @@ define([
                        "$location",
                        "$attrs"
                    ]
-                },
-                {
-                    "key": "ObjectHeaderController",
-                    "implementation": ObjectHeaderController,
-                    "depends": [
-                        "$scope"
-                    ]
                }
            ],
            "representations": [
@@ -185,13 +173,6 @@ define([
                        "type"
                    ]
                },
-                {
-                    "key": "object-header-frame",
-                    "template": objectHeaderFrameTemplate,
-                    "uses": [
-                        "type"
-                    ]
-                },
                {
                    "key": "menu-arrow",
                    "template": menuArrowTemplate,
--- a/platform/commonUI/browse/res/templates/back-arrow.html
+++ b/platform/commonUI/browse/res/templates/back-arrow.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/browse-object.html
+++ b/platform/commonUI/browse/res/templates/browse-object.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -57,12 +57,7 @@
            </div>
            <mct-representation key="representation.selected.key"
                                mct-object="representation.selected.key && domainObject"
-                                class="abs flex-elem grows object-holder-main scroll"
-                                mct-selectable="{
-                                    item: domainObject.useCapability('adapter'),
-                                    oldItem: domainObject
-                                }"
-                                mct-init-select>
+                                class="abs flex-elem grows object-holder-main scroll">
            </mct-representation>
        </div>
    </div>
--- a/platform/commonUI/browse/res/templates/browse.html
+++ b/platform/commonUI/browse/res/templates/browse.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/browse/inspector-region.html
+++ b/platform/commonUI/browse/res/templates/browse/inspector-region.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -19,21 +19,12 @@
 this source code distribution or the Licensing information page available
 at runtime from the About dialog for additional information.
 -->
-<div ng-controller="InspectorController as controller">
+<div ng-controller="InspectorController">
+    <div ng-repeat="region in regions">
        <mct-representation
-                key="'object-properties'"
-                mct-object="controller.selectedItem()"
+                key="region.content.key"
+                mct-object="domainObject"
                ng-model="ngModel">
        </mct-representation>
-
-        <div ng-if="!controller.hasProviderView()">
-            <mct-representation
-                    key="inspectorKey"
-                    mct-object="controller.selectedItem()"
-                    ng-model="ngModel">
-            </mct-representation>
-        </div>
-
-        <div class='inspector-provider-view'>
-        </div>
+    </div>
 </div>
--- a/platform/commonUI/browse/res/templates/browse/object-header-frame.html
+++ b/platform/commonUI/browse/res/templates/browse/object-header-frame.html
@@ -1,31 +0,0 @@
-<!--
- Open MCT, Copyright (c) 2014-2018, 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.
-->
-<span class='type-icon flex-elem {{type.getCssClass()}}'></span>
-<span class="l-elem-wrapper l-flex-row flex-elem grows" ng-controller="ObjectHeaderController as controller">
-    <span ng-if="parameters.mode" class='action flex-elem'>{{parameters.mode}}</span>
-    <span class='title-label flex-elem holder flex-can-shrink s-input-inline'>{{model.name}}</span>
-    <span class='t-object-alert t-alert-unsynced flex-elem holder' title='This object is not currently displaying real-time data'></span>
-    <mct-representation
-        key="'menu-arrow'"
-        mct-object='domainObject'
-        class="flex-elem context-available-w"></mct-representation>
-</span>
--- a/platform/commonUI/browse/res/templates/browse/object-header.html
+++ b/platform/commonUI/browse/res/templates/browse/object-header.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -20,13 +20,9 @@
 at runtime from the About dialog for additional information.
 -->
 <span class='type-icon flex-elem {{type.getCssClass()}}'></span>
-<span class="l-elem-wrapper l-flex-row flex-elem grows" ng-controller="ObjectHeaderController as controller">
+<span class="l-elem-wrapper l-flex-row flex-elem grows">
    <span ng-if="parameters.mode" class='action flex-elem'>{{parameters.mode}}</span>
-    <span ng-attr-contenteditable="{{ controller.editable ? true : undefined }}"
-		class='title-label flex-elem holder flex-can-shrink s-input-inline'
-		ng-click="controller.edit()"
-		ng-blur="controller.updateName($event)"
-		ng-keypress="controller.updateName($event)">{{model.name}}</span>
+    <span class='title-label flex-elem holder flex-can-shrink'>{{model.name}}</span>
    <span class='t-object-alert t-alert-unsynced flex-elem holder' title='This object is not currently displaying real-time data'></span>
    <mct-representation
        key="'menu-arrow'"
--- a/platform/commonUI/browse/res/templates/browse/object-properties.html
+++ b/platform/commonUI/browse/res/templates/browse/object-properties.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -38,7 +38,8 @@
                  ng-class="{ last:($index + 1) === contextualParents.length }">
                <mct-representation key="'label'"
                                    mct-object="parent"
-                                    ng-click="parent.getCapability('action').perform('navigate')"
+                                    ng-model="ngModel"
+                                    ng-click="ngModel.selectedObject = parent"
                                    class="location-item">
                </mct-representation>
            </span>
@@ -50,7 +51,8 @@
                  ng-class="{ last:($index + 1) === primaryParents.length }">
                <mct-representation key="'label'"
                                    mct-object="parent"
-                                    ng-click="parent.getCapability('action').perform('navigate')"
+                                    ng-model="ngModel"
+                                    ng-click="ngModel.selectedObject = parent"
                                    class="location-item">
                </mct-representation>
            </span>
--- a/platform/commonUI/browse/res/templates/items/grid-item.html
+++ b/platform/commonUI/browse/res/templates/items/grid-item.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/items/items.html
+++ b/platform/commonUI/browse/res/templates/items/items.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/menu-arrow.html
+++ b/platform/commonUI/browse/res/templates/menu-arrow.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/src/BrowseController.js
+++ b/platform/commonUI/browse/src/BrowseController.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/BrowseObjectController.js
+++ b/platform/commonUI/browse/src/BrowseObjectController.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/InspectorRegion.js
+++ b/platform/commonUI/browse/src/InspectorRegion.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/MenuArrowController.js
+++ b/platform/commonUI/browse/src/MenuArrowController.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/ObjectHeaderController.js
+++ b/platform/commonUI/browse/src/ObjectHeaderController.js
@@ -1,92 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, 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 () {
-
-        /**
-         * Controller to provide the ability to inline edit an object name.
-         *
-         * @constructor
-         * @memberof platform/commonUI/browse
-         */
-        function ObjectHeaderController($scope) {
-            this.$scope = $scope;
-            this.domainObject = $scope.domainObject;
-            this.editable = this.allowEdit();
-        }
-
-        /**
-         * Updates the object name on blur and enter keypress events.
-         *
-         * @param event the mouse event
-         */
-        ObjectHeaderController.prototype.updateName = function (event) {
-            if (!event || !event.currentTarget) {
-                return;
-            }
-
-            if (event.type === 'blur') {
-                this.updateModel(event);
-            } else if (event.which === 13) {
-                this.updateModel(event);
-                event.currentTarget.blur();
-                window.getSelection().removeAllRanges();
-            }
-        };
-
-        /**
-         * Updates the model.
-         *
-         * @param event the mouse event
-         * @param private
-         */
-        ObjectHeaderController.prototype.updateModel = function (event) {
-            var name = event.currentTarget.textContent.replace(/\n/g, ' ');
-
-            if (name.length === 0) {
-                name = "Unnamed " + this.domainObject.getCapability("type").typeDef.name;
-                event.currentTarget.textContent = name;
-            }
-
-            if (name !== this.domainObject.getModel().name) {
-                this.domainObject.getCapability('mutation').mutate(function (model) {
-                    model.name = name;
-                });
-            }
-        };
-
-        /**
-         * Checks if the domain object is editable.
-         *
-         * @private
-         * @return true if object is editable
-         */
-        ObjectHeaderController.prototype.allowEdit = function () {
-            var type = this.domainObject && this.domainObject.getCapability('type');
-            return !!(type && type.hasFeature('creation'));
-        };
-
-        return ObjectHeaderController;
-    }
-);
--- a/platform/commonUI/browse/src/PaneController.js
+++ b/platform/commonUI/browse/src/PaneController.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -24,14 +24,14 @@
 define(
    [],
    function () {
-        var navigationListenerAdded = false;
+
        /**
         * Controller to provide the ability to show/hide the tree in
         * Browse mode.
         * @constructor
         * @memberof platform/commonUI/browse
         */
-        function PaneController($scope, agentService, $window, $location, $attrs, navigationService) {
+        function PaneController($scope, agentService, $window, $location, $attrs) {
            var self = this;
            this.agentService = agentService;
            var hideParameterPresent = $location.search().hasOwnProperty($attrs.hideParameter);
@@ -61,11 +61,6 @@ define(
                    self.state = false;
                }
            };
-
-            if (navigationService && navigationService.addListener && !navigationListenerAdded) {
-                navigationService.addListener(this.callback);
-                navigationListenerAdded = true;
-            }
        }

        /**
--- a/platform/commonUI/browse/src/navigation/NavigateAction.js
+++ b/platform/commonUI/browse/src/navigation/NavigateAction.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/navigation/NavigationService.js
+++ b/platform/commonUI/browse/src/navigation/NavigationService.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/navigation/OrphanNavigationHandler.js
+++ b/platform/commonUI/browse/src/navigation/OrphanNavigationHandler.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/windowing/FullscreenAction.js
+++ b/platform/commonUI/browse/src/windowing/FullscreenAction.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/windowing/NewTabAction.js
+++ b/platform/commonUI/browse/src/windowing/NewTabAction.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/windowing/WindowTitler.js
+++ b/platform/commonUI/browse/src/windowing/WindowTitler.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/BrowseControllerSpec.js
+++ b/platform/commonUI/browse/test/BrowseControllerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/BrowseObjectControllerSpec.js
+++ b/platform/commonUI/browse/test/BrowseObjectControllerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/InspectorRegionSpec.js
+++ b/platform/commonUI/browse/test/InspectorRegionSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/MenuArrowControllerSpec.js
+++ b/platform/commonUI/browse/test/MenuArrowControllerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/ObjectHeaderControllerSpec.js
+++ b/platform/commonUI/browse/test/ObjectHeaderControllerSpec.js
@@ -1,137 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, 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(
-    ["../src/ObjectHeaderController"],
-    function (ObjectHeaderController) {
-
-        describe("The object header controller", function () {
-            var mockScope,
-                mockDomainObject,
-                mockCapabilities,
-                mockMutationCapability,
-                mockTypeCapability,
-                mockEvent,
-                mockCurrentTarget,
-                model,
-                controller;
-
-            beforeEach(function () {
-                mockMutationCapability = jasmine.createSpyObj("mutation", ["mutate"]);
-                mockTypeCapability = jasmine.createSpyObj("type", ["typeDef", "hasFeature"]);
-                mockTypeCapability.typeDef = { name: ""};
-                mockTypeCapability.hasFeature.andCallFake(function (feature) {
-                    return feature === 'creation';
-                });
-
-                mockCapabilities = {
-                    mutation: mockMutationCapability,
-                    type: mockTypeCapability
-                };
-
-                model = {
-                    name: "Test name"
-                };
-                mockDomainObject = jasmine.createSpyObj("domainObject", ["getCapability", "getModel"]);
-                mockDomainObject.getModel.andReturn(model);
-                mockDomainObject.getCapability.andCallFake(function (key) {
-                    return mockCapabilities[key];
-                });
-
-                mockScope = {
-                    domainObject: mockDomainObject
-                };
-
-                mockCurrentTarget = jasmine.createSpyObj("currentTarget", ["blur", "textContent"]);
-                mockCurrentTarget.blur.andReturn(mockCurrentTarget);
-
-                mockEvent = {
-                    which: {},
-                    type: {},
-                    currentTarget: mockCurrentTarget
-                };
-
-                controller = new ObjectHeaderController(mockScope);
-            });
-
-            it("updates the model with new name on blur", function () {
-                mockEvent.type = "blur";
-                mockCurrentTarget.textContent = "New name";
-                controller.updateName(mockEvent);
-
-                expect(mockMutationCapability.mutate).toHaveBeenCalled();
-            });
-
-            it("updates the model with a default for blank names", function () {
-                mockEvent.type = "blur";
-                mockCurrentTarget.textContent = "";
-                controller.updateName(mockEvent);
-
-                expect(mockCurrentTarget.textContent.length).not.toEqual(0);
-                expect(mockMutationCapability.mutate).toHaveBeenCalled();
-            });
-
-            it("does not update the model if the same name", function () {
-                mockEvent.type = "blur";
-                mockCurrentTarget.textContent = mockDomainObject.getModel().name;
-                controller.updateName(mockEvent);
-
-                expect(mockMutationCapability.mutate).not.toHaveBeenCalled();
-            });
-
-            it("updates the model on enter keypress event only", function () {
-                mockCurrentTarget.textContent = "New name";
-                controller.updateName(mockEvent);
-
-                expect(mockMutationCapability.mutate).not.toHaveBeenCalled();
-
-                mockEvent.which = 13;
-                controller.updateName(mockEvent);
-
-                expect(mockMutationCapability.mutate).toHaveBeenCalledWith(jasmine.any(Function));
-
-                mockMutationCapability.mutate.mostRecentCall.args[0](model);
-
-                expect(mockDomainObject.getModel().name).toBe("New name");
-            });
-
-            it("blurs the field on enter key press", function () {
-                mockCurrentTarget.textContent = "New name";
-                mockEvent.which = 13;
-                controller.updateName(mockEvent);
-
-                expect(mockEvent.currentTarget.blur).toHaveBeenCalled();
-            });
-
-            it("allows editting name when object is creatable", function () {
-                expect(controller.allowEdit()).toBe(true);
-            });
-
-            it("disallows editting name when object is non-creatable", function () {
-                mockTypeCapability.hasFeature.andReturn(false);
-
-                expect(controller.allowEdit()).toBe(false);
-
-            });
-        });
-    }
-);
--- a/platform/commonUI/browse/test/PaneControllerSpec.js
+++ b/platform/commonUI/browse/test/PaneControllerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/navigation/NavigateActionSpec.js
+++ b/platform/commonUI/browse/test/navigation/NavigateActionSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/navigation/NavigationServiceSpec.js
+++ b/platform/commonUI/browse/test/navigation/NavigationServiceSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/navigation/OrphanNavigationHandlerSpec.js
+++ b/platform/commonUI/browse/test/navigation/OrphanNavigationHandlerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
-* Open MCT, Copyright (c) 2014-2018, United States Government
+* Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js
+++ b/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/windowing/NewTabActionSpec.js
+++ b/platform/commonUI/browse/test/windowing/NewTabActionSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js
+++ b/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/dialog/bundle.js
+++ b/platform/commonUI/dialog/bundle.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/dialog/res/templates/dialog.html
+++ b/platform/commonUI/dialog/res/templates/dialog.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -20,7 +20,7 @@
 at runtime from the About dialog for additional information.
 -->
 <div class="abs top-bar">
-    <div class="dialog-title">{{ngModel.title}}</div>
+    <div class="title">{{ngModel.title}}</div>
    <div class="hint">All fields marked <span class="req icon-asterisk"></span> are required.</div>
 </div>
 <div class='abs editor'>
--- a/platform/commonUI/dialog/res/templates/message.html
+++ b/platform/commonUI/dialog/res/templates/message.html
@@ -1,10 +1,11 @@
 <div class="l-message"
     ng-class="'message-severity-' + ngModel.severity">
-    <div class="w-message-contents">
+    <div class="ui-symbol type-icon message-type"></div>
+    <div class="message-contents">
        <div class="top-bar">
            <div class="title">{{ngModel.title}}</div>
+            <div class="hint" ng-hide="ngModel.hint === undefined">{{ngModel.hint}}</div>
        </div>
-        <div class="hint" ng-hide="ngModel.hint === undefined">{{ngModel.hint}}</div>
        <div class="message-body">
            <div class="message-action">
                {{ngModel.actionText}}
@@ -24,6 +25,8 @@
               ng-click="ngModel.primaryOption.callback()">
                {{ngModel.primaryOption.label}}
            </a>
+
        </div>
+
    </div>
 </div>
--- a/platform/commonUI/dialog/res/templates/overlay-blocking-message.html
+++ b/platform/commonUI/dialog/res/templates/overlay-blocking-message.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/dialog/res/templates/overlay-dialog.html
+++ b/platform/commonUI/dialog/res/templates/overlay-dialog.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/dialog/res/templates/overlay-message-list.html
+++ b/platform/commonUI/dialog/res/templates/overlay-message-list.html
@@ -1,17 +1,17 @@
-<mct-container key="overlay">
-    <div class="t-message-list">
-        <div class="top-bar">
-            <div class="dialog-title">{{ngModel.dialog.title}}</div>
+<mct-container key="overlay" class="t-message-list">
+    <div class="message-contents">
+        <div class="abs top-bar">
+            <div class="title">{{ngModel.dialog.title}}</div>
            <div class="hint">Displaying {{ngModel.dialog.messages.length}} message<span ng-show="ngModel.dialog.messages.length > 1 ||
                                                                                                  ngModel.dialog.messages.length == 0">s</span>
            </div>
        </div>
-        <div class="w-messages">
+        <div class="abs message-body">
            <mct-include
-                ng-repeat="msg in ngModel.dialog.messages | orderBy: '-'"
-                key="'message'" ng-model="msg.model"></mct-include>
+                    ng-repeat="msg in ngModel.dialog.messages | orderBy: '-'"
+                    key="'message'" ng-model="msg.model"></mct-include>
        </div>
-        <div class="bottom-bar">
+        <div class="abs bottom-bar">
            <a ng-repeat="dialogAction in ngModel.dialog.actions"
               class="s-button major"
               ng-click="dialogAction.action()">
--- a/platform/commonUI/dialog/res/templates/overlay-options.html
+++ b/platform/commonUI/dialog/res/templates/overlay-options.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -21,7 +21,7 @@
 -->
 <mct-container key="overlay">
    <div class="abs top-bar">
-        <div class="dialog-title">{{ngModel.dialog.title}}</div>
+        <div class="title">{{ngModel.dialog.title}}</div>
        <div class="hint">{{ngModel.dialog.hint}}</div>
    </div>
    <div class='abs editor'>
--- a/platform/commonUI/dialog/res/templates/overlay.html
+++ b/platform/commonUI/dialog/res/templates/overlay.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/dialog/src/DialogService.js
+++ b/platform/commonUI/dialog/src/DialogService.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/dialog/src/OverlayService.js
+++ b/platform/commonUI/dialog/src/OverlayService.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/dialog/test/DialogServiceSpec.js
+++ b/platform/commonUI/dialog/test/DialogServiceSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/dialog/test/OverlayServiceSpec.js
+++ b/platform/commonUI/dialog/test/OverlayServiceSpec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/bundle.js
+++ b/platform/commonUI/edit/bundle.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -121,8 +121,7 @@ define([
                    "key": "ElementsController",
                    "implementation": ElementsController,
                    "depends": [
-                        "$scope",
-                        "openmct"
+                        "$scope"
                    ]
                },
                {
@@ -300,6 +299,9 @@ define([
                {
                    "key": "edit-elements",
                    "template": elementsTemplate,
+                    "uses": [
+                        "composition"
+                    ],
                    "gestures": [
                        "drop"
                    ]
@@ -383,10 +385,7 @@ define([
                    ]
                },
                {
-                    "implementation": EditToolbarRepresenter,
-                    "depends": [
-                        "openmct"
-                    ]
+                    "implementation": EditToolbarRepresenter
                }
            ],
            "constants": [
--- a/platform/commonUI/edit/res/templates/create/create-button.html
+++ b/platform/commonUI/edit/res/templates/create/create-button.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -23,7 +23,7 @@
    <div class="s-menu-button major create-button" ng-click="createController.toggle()">
 		<span class="title-label">Create</span>
    </div>
-    <div class="menu super-menu l-create-menu" ng-show="createController.isActive()">
+    <div class="menu super-menu" ng-show="createController.isActive()">
        <mct-representation mct-object="domainObject" key="'create-menu'">
        </mct-representation>
    </div>
--- a/platform/commonUI/edit/res/templates/create/create-menu.html
+++ b/platform/commonUI/edit/res/templates/create/create-menu.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -19,8 +19,8 @@
 this source code distribution or the Licensing information page available
 at runtime from the About dialog for additional information.
 -->
-<div class="w-menu" ng-controller="CreateMenuController">
-    <div class="col menu-items">
+<div class="contents" ng-controller="CreateMenuController">
+    <div class="pane left menu-items">
        <ul>
            <li ng-repeat="createAction in createActions" ng-click="createAction.perform()">
                <a ng-mouseover="representation.activeMetadata = createAction.getMetadata()"
@@ -31,15 +31,13 @@
            </li>
        </ul>
    </div>
-    <div class="col menu-item-description">
+    <div class="pane right menu-item-description">
        <div class="desc-area icon {{ representation.activeMetadata.cssClass }}"></div>
-        <div class="w-title-desc">
-            <div class="desc-area title">
-                {{representation.activeMetadata.name}}
-            </div>
-            <div class="desc-area description">
-                {{representation.activeMetadata.description}}
-            </div>
+        <div class="desc-area title">
+            {{representation.activeMetadata.name}}
+        </div>
+        <div class="desc-area description">
+            {{representation.activeMetadata.description}}
        </div>
    </div>
 </div>
--- a/platform/commonUI/edit/res/templates/create/locator.html
+++ b/platform/commonUI/edit/res/templates/create/locator.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/edit/res/templates/edit-action-buttons.html
+++ b/platform/commonUI/edit/res/templates/edit-action-buttons.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/edit/res/templates/edit-object.html
+++ b/platform/commonUI/edit/res/templates/edit-object.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -61,12 +61,7 @@
            <mct-representation key="representation.selected.key"
                                mct-object="representation.selected.key && domainObject"
                                class="abs flex-elem grows object-holder-main scroll"
-                                toolbar="toolbar"
-                                mct-selectable="{
-                                    item: domainObject.useCapability('adapter'),
-                                    oldItem: domainObject
-                                }"
-                                mct-init-select>
+                                toolbar="toolbar">
            </mct-representation>
        </div><!--/ l-object-wrapper-inner -->
    </div>
--- a/platform/commonUI/edit/res/templates/elements.html
+++ b/platform/commonUI/edit/res/templates/elements.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@@ -25,17 +25,9 @@
                 ng-model="filterBy">
    </mct-include>
    <div class="flex-elem grows vscroll">
-        <ul class="tree" id="inspector-elements-tree"
-            ng-if="composition.length > 0">
+        <ul class="tree">
            <li ng-repeat="containedObject in composition | filter:searchElements">
                <span class="tree-item">
-                    <span class="grippy-sm"
-                          ng-if="composition.length > 1"
-                          data-id="{{ containedObject.id }}"
-                          mct-drag-down="dragDown($event)"
-                          mct-drag="drag($event)"
-                          mct-drag-up="dragUp($event)">
-                    </span>
                    <mct-representation
                            class="rep-object-label"
                            key="'label'"
@@ -44,6 +36,5 @@
                </span>
            </li>
        </ul>
-        <div ng-if="composition.length === 0">No contained elements</div>    
    </div>
 </div>
--- a/platform/commonUI/edit/res/templates/library.html
+++ b/platform/commonUI/edit/res/templates/library.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/edit/res/templates/topbar-edit.html
+++ b/platform/commonUI/edit/res/templates/topbar-edit.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2018, United States Government
+ Open MCT, Copyright (c) 2014-2017, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/edit/src/actions/CancelAction.js
+++ b/platform/commonUI/edit/src/actions/CancelAction.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/actions/EditAction.js
+++ b/platform/commonUI/edit/src/actions/EditAction.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/actions/EditAndComposeAction.js
+++ b/platform/commonUI/edit/src/actions/EditAndComposeAction.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/actions/PropertiesAction.js
+++ b/platform/commonUI/edit/src/actions/PropertiesAction.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Charles Hacskaylo	88cb206058	Merge remote-tracking branch 'origin/timeline-follow-1688' into timeline-follow-1688-styling	2017-09-21 12:50:03 -07:00
Victor Woeltjen	14592d1c3e	[Timeline] Follow up on front-end updates Fixes #1688 Squashed commit of the following: commit 817c7f31289b3e7631c3332d2192a68f21f50f9e Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 21 12:47:48 2017 -0700 [Timeline] Initialize lastWidth ...to avoid clamping values before a width has actually been observed. commit 5f7324c1cdb0cbef6385fbccac31b0404d216f95 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 21 12:21:11 2017 -0700 [Timeline] Clamp right edge of zoom ...to avoid getting stuck in a weird scrolling state for large timer values. commit 076aca112392e65835e7a01ac8e28780d24bfff1 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 21 12:02:23 2017 -0700 [Timeline] Don't set scroll.x to negative values ...avoids mispositioning timer-following line, https://github.com/nasa/openmct/issues/1688#issuecomment-330373625 commit ac9bdb919df69fac65b297487131e2c41204ebeb Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 21 11:32:49 2017 -0700 [Timers] Loosen test expectation Resolves build failure https://circleci.com/gh/nasa/openmct/4181 by reducing test specificity for indicator display name.	2017-09-21 12:48:33 -07:00
Victor Woeltjen	7f9fd5c705	[Timers] Frontend updates for time-of-interest Squashed commit of the following: commit `370b910d36` Author: Charles Hacskaylo <charlesh88@gmail.com> Date: Wed Sep 20 10:59:00 2017 -0700 [Frontend] Fix in FollowIndicator.js Fixes #1688 commit `883d1feb32` Author: Charles Hacskaylo <charlesh88@gmail.com> Date: Wed Sep 20 10:36:56 2017 -0700 [Frontend] Styling and content on Follow indicator Fixes #1688 commit `cff85fbbde` Author: Charles Hacskaylo <charlesh88@gmail.com> Date: Wed Sep 20 10:09:19 2017 -0700 [Frontend] Styling complete on Follow Line Fixes #1688 commit `563a86b69f` Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov> Date: Mon Sep 18 16:05:53 2017 -0700 [Front-end] WIP Markup and CSS for Follow Line Fixes #1688 Added line icon, style refinement; commit `fc49e5d023` Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov> Date: Mon Sep 18 15:07:35 2017 -0700 [Front-end] WIP Markup and CSS for Follow Line Fixes #1688 Moved TimelineTOIController up 2 levels of markup hierarchy to allow Follow Lines, one in each split pane; Follow LInes markup and CSS in progress; commit `8ec3c42291` Author: Charles Hacskaylo <charlesh88@gmail.com> Date: Wed Sep 13 16:46:14 2017 -0700 [Frontend] WIP Timeline Follow Line Fixes #1688 VERY WIP! Initial move of styles into classes;	2017-09-20 12:11:41 -07:00
Charles Hacskaylo	370b910d36	[Frontend] Fix in FollowIndicator.js Fixes #1688	2017-09-20 10:59:00 -07:00
Charles Hacskaylo	883d1feb32	[Frontend] Styling and content on Follow indicator Fixes #1688	2017-09-20 10:36:56 -07:00
Charles Hacskaylo	cff85fbbde	[Frontend] Styling complete on Follow Line Fixes #1688	2017-09-20 10:09:19 -07:00
Charles Hacskaylo	563a86b69f	[Front-end] WIP Markup and CSS for Follow Line Fixes #1688 Added line icon, style refinement;	2017-09-18 16:05:53 -07:00
Charles Hacskaylo	fc49e5d023	[Front-end] WIP Markup and CSS for Follow Line Fixes #1688 Moved TimelineTOIController up 2 levels of markup hierarchy to allow Follow Lines, one in each split pane; Follow LInes markup and CSS in progress;	2017-09-18 15:07:35 -07:00
Charles Hacskaylo	8ec3c42291	[Frontend] WIP Timeline Follow Line Fixes #1688 VERY WIP! Initial move of styles into classes;	2017-09-13 16:46:14 -07:00
Victor Woeltjen	1e1a2443d5	[Timers] Remove unused variable to pass lint checks	2017-09-11 11:24:52 -07:00
Victor Woeltjen	d65e1e604e	Squashed commit of the following: commit f1dc1ce152e186da0d10c8e77d920ac0a76c9bc2 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 14:35:38 2017 -0700 [Timers] Rewrite JSDoc for FollowTimerAction https://github.com/nasa/openmct/pull/1694/files#r137604769 commit 7ab0693cc983f8a04ac8ee9002f4d776b06a869a Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 14:27:53 2017 -0700 [Timer] Expect domain objects from FollowIndicator test commit ff89c0849d16ab451bfd2fddd9202cf36940f599 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 14:26:28 2017 -0700 [Timer] Add JSDoc for new method commit 2a0343352eca241dfc28a4aa0b3832e3e6928864 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 14:24:59 2017 -0700 [Timeline] Update TOI tests ...to account for refactoring out of tick handling. commit 01cbaafc72870fab4ada5894637ae5721214933d Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 14:17:25 2017 -0700 [Timeline] Update dependencies for TOI test commit 6bd5c378566362dce331e7c200dea87f0b08ecc6 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 14:15:21 2017 -0700 [Timers] Update timerService tests with dependencies commit b0793865c5131e17a58786ec356d67f2f2bba4c5 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 14:09:54 2017 -0700 [Timers] Declare vars to satisfy JSHint commit 9d2a63f7fe61dadf68255d795512ec55f532c533 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 14:07:12 2017 -0700 [Timeline] Handle stopped timer commit 30871270514730f3f2f12482075e5140bb97fa1f Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 13:59:08 2017 -0700 [Timer] Tweak refactored timer logic commit 53ad127ba7cf679377dc865301612a1d78399324 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 13:53:36 2017 -0700 [Timer] Convert times from timerService ...to reduce resposibilities for TOI controller. commit f8341133cf23df383b8f6e4815b88e0066ebd2bc Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 13:03:37 2017 -0700 [Timeline] Factor out timer knowledge commit aebd9e0ac223971b868b03343dbe4c61c6eb4849 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 12:34:58 2017 -0700 [Timeline] Consistently use this commit 48ac427a20c5c343aecdbd54b068d8691f7830b6 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 12:33:57 2017 -0700 [Timeline] Remove unused tick binding/call commit ea62f0a15ba4ab5de53213bbed14599eaf878d70 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 12:10:59 2017 -0700 [Timeline] Retrieve timestamp on demand commit f53bd04b5e343b22ea52b431785ade891577bb6a Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 12:07:55 2017 -0700 [Timeline] Update clocks on bounds events https://github.com/nasa/openmct/pull/1694/files#r137603081 commit 51d8e376ee46aafa13cd9a969c6f03885e10dafb Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 11:40:33 2017 -0700 [Timeline] Don't listen for non-existing tick events commit 5cc40c488cec5e7453c2fe1dea5e5a4fa3509ecd Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 11:39:21 2017 -0700 [Time] Revert Time API changes https://github.com/nasa/openmct/pull/1694/files#r137603081 commit c55c8bc627bf0a7f3cfd04b604b82d15ff469ab9 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 11:37:40 2017 -0700 [Timeline] Finish testing TOI controller commit af5cea5f2f172a309568d477dfdf11b8d45e74bb Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 11:06:47 2017 -0700 [Timeline] Test TOI controller commit ba64db68b132fa431e8ccdb533024bf2850f9712 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 10:06:41 2017 -0700 [Timers] Test timerService commit 247e663b326ec5b8145b832af9b26086204baea3 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 10:05:24 2017 -0700 [Timers] Remove unused timerService method commit 8d741ad5744e1b7deb669dbaa0f3d30e4eb5866e Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 09:59:32 2017 -0700 [Timers] Remove unused timerService dependency commit b59c8917bdef5ec3e54c8857d993d86547cfe177 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 09:58:10 2017 -0700 [Timers] Remove unused timerService event commit f15dd9827f835a814dc40a6201c90268a60ed64a Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 09:49:09 2017 -0700 [Timers] Test timer-following indicator commit 2501f11af8c0b2aed9ebf16ffd28c0003b2701c2 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 09:42:54 2017 -0700 [Timer] Complete test coverage for FollowTimerAction commit aa2be83fc15cd68ee6de4d9f8205dc2fcba8c35b Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Thu Sep 7 09:35:37 2017 -0700 [Timers] Begin testing Follow Timer action commit d9062e0b0ff351b141dcb646972053ec72292d53 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 16:45:18 2017 -0700 [Timeline] Remove unused variables commit 79ebe4dd2b2aefc1e83ea8142588ed0715b3c269 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 16:39:22 2017 -0700 [Timeline] JSDoc for TOI controller commit 330f6b465188555e8e59f4eaf8ce1875b5335846 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 16:30:58 2017 -0700 [Timeline] Use different icon to follow time bounds commit f0a3b628e6d1d843324085edd563b68997f5a215 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 16:30:46 2017 -0700 [Timeline] Simplify TOI following initialization commit e76f3d1d525e0d19845b4c5b457995e60c416ad0 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 16:27:07 2017 -0700 [Timeline] Add toggle to follow time bounds commit 8ec072c0a2a953c074e0c327430dd68f27894ffb Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 16:19:25 2017 -0700 [Timeline] Follow TC bounds based on boolean commit 206a26734dedc267af6d298a77658aa261ca4fea Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 15:37:12 2017 -0700 [Timeline] Tune bounds following commit 19563bdf53a036c7bf09c52924425a1902b243bb Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 15:19:19 2017 -0700 [Timeline] Remove unused method commit 293981ec55ad115d7bd90b92f5bd090df64bd7c2 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 15:18:59 2017 -0700 [Timeline] Only update timestamp on tick Leave bounds-following to the bounds event commit 9180e15971d2043f0999a16f0aa8794273bcfc74 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 14:43:01 2017 -0700 [Time] Document tick event commit c7b163dff0d94aaea86b76647501f21623b353e1 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 14:39:57 2017 -0700 [Timeline] Stop listening on destroy ...from the TOI controller. commit ca7def3cf98e1eaf6c3aeb16cf9fd79452c86bd0 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 14:32:40 2017 -0700 [Timeline] Remove surplus watches commit 367e7afa94ae1ed448e39f13be804c62e2bfcf00 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 14:30:14 2017 -0700 [Timeline] Very deltas are valid before panning commit 7ee94f316e90d046015266a2a9168e349ff73345 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 14:28:10 2017 -0700 [Timeline] Scroll with TOI only while in view commit 9d7bb431119b7bc6ddc86f0058718e4385478518 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 10:36:46 2017 -0700 [Timeline] Utilize zoomController.bounds commit f151b9e8adfd235c31e32bef5fddab835efa7c8f Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 10:35:57 2017 -0700 [Timeline] Add methods to set zoom bounds commit c3d0b9876ab79c18003838ed3315045c5fb2ddbb Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 10:32:08 2017 -0700 [Timelines] Observe bounds changes ...to synchronize zoom with Time Conductor, #1688 commit 58adafc46f231b0fd92827d10c377131166ff39c Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 09:37:07 2017 -0700 [Timers] JSDoc for TimerService commit a325a8d5085bf1a4c9aa3ab20771308d4789765a Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 09:12:50 2017 -0700 [Timeline] Re-tweak follow scroll calculations ...for visibility. commit 41e4bf153607b081aaf92253fa2b21300e2f0ea7 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 09:03:45 2017 -0700 [Timeline] Tweak follow scroll calculations ...for visibility. commit 08a5b9f14ab629a310dc27a3771ca454f1187327 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 08:59:45 2017 -0700 [Timeline] Replace debug output with scroll updates commit 26585ecd61341b4ee89abd8ee866e705a02bbc9a Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 08:59:07 2017 -0700 [Timeline] Move TOI to scrollable area commit 654eda027c3c67a3a0ff33136109ca27d14762ba Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 08:56:07 2017 -0700 [Timeline] Begin implementing TOI following commit 552f67a11ce439be58ab7ca7884c46241a25adee Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Sep 6 08:55:51 2017 -0700 [Timeline] At zoom-to-time method For use by time-of-interest controller, #1688 commit 37acbfd458740b2c3176875f83d37f0fdf57e727 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Aug 30 12:46:33 2017 -0700 [Timeline] Remove other excess $apply calls ...although this should make us nervy about those callbacks being invoked in different ways. commit 0e72847c9ba59f957efa2d412cb77c024afa9e63 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Aug 30 12:44:27 2017 -0700 [Timeline] Remove $apply from $watch callback ...to avoid an infinite digest loop. commit bade0fd9f60101d5b1b782cd28e608af493c9076 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Aug 30 12:42:18 2017 -0700 [Timeline] Begin adding TOI line to template commit f94034a3b4136f6b174155397084f8cdb22ce544 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Aug 30 12:11:25 2017 -0700 [Timers] Add missing semicolon, satisfy JSHint commit cb465b94011e7432cc7e4d9e815641f97dc61d7a Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Aug 30 12:08:45 2017 -0700 [Time] Verify that tick event is emitted commit 7c84a86a33ceb73ba6a06801374ea3f89793c450 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Aug 30 11:59:06 2017 -0700 [Time] Emit tick events from Time API https://github.com/nasa/openmct/pull/1694 commit d319a783fcd882c03eb7d9a81fec33898016384e Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Aug 30 11:56:28 2017 -0700 [Timeline] Sketch in TOI controller ...to position/follow time-of-interest, relative to the active timer. commit 2dbdb2627450039d69dbfd10eed2c100207e061a Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Tue Aug 29 12:57:47 2017 -0700 [Timers] Use timerService ...to coordinate between action and indicator commit f94a2358eaf0366bd4da2b44e69ccb62b153c5db Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Tue Aug 29 12:52:22 2017 -0700 [Timers] Use TimerService from Follow Timer action commit a720c2ec2cda4a300d26167f4717f0571bedcbfd Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Tue Aug 29 12:50:31 2017 -0700 [Timers] Expose TimerService through bundle commit e32bbc3e232d25f7c5dba98674781e4f263c4870 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Tue Aug 29 12:49:03 2017 -0700 [Timers] Sketch in timer service ...which will keep track of the active timer used to interpret SET for Timelines. commit a038c2b1d8fd34c2874fa8fc0421fa7ba53e11ab Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Tue Aug 29 12:41:05 2017 -0700 [Timers] Register indicator commit 0e93ae87a1cccc4f3a0636844625b64ccb77a7ae Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Tue Aug 29 12:39:21 2017 -0700 [Timers] Skeleton for time following indicator commit e806386891639740e9fe3d8641c2f60ab5a88eac Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Tue Aug 29 09:37:14 2017 -0700 [Timers] Register the Follow Timer action commit 008aa95932070459dcc6fa1d918a23dac8df7592 Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Tue Aug 29 09:35:08 2017 -0700 [Timers] Skeleton for Follow Timer action ...to synchronize the time conductor with a particular Timer. #1688	2017-09-07 15:22:38 -07:00