[Frontend] MIsc mods and fixes

Fixes #1590
Less brittle approach to 'niceValuesToShowWhenExpanded' array
that won't break when user config is wired up; mobile styling added
to hide nearest* columns in mobile (no hover) context; removed
hex color value display and use niceValuesToShowWhenExpanded
lookup in plot-options-browse.html; added CSS class 'comma-list';

.circleci/config.yml

@@ -1,36 +0,0 @@
-version: 2
-jobs:
-  build:
-    docker:
-        - image: circleci/node:8-browsers
-          environment:
-            CHROME_BIN: "/usr/bin/google-chrome"
-    steps:
-        - checkout
-        - run:
-            name: Update npm
-            command: 'sudo npm install -g npm@latest'
-        - restore_cache:
-            key: dependency-cache-{{ checksum "package.json" }}
-        - run:
-            name: Installing dependencies (npm install)
-            command: npm install
-        - save_cache:
-            key: dependency-cache-{{ checksum "package.json" }}
-            paths:
-              - node_modules
-        - run:
-            name: npm run test
-            command: npm run test
-        - run:
-            name: npm run lint
-            command: npm run lint
-        - store_artifacts:
-            path: dist
-            prefix: dist
-
-workflows:
-  version: 2
-  test:
-    jobs:
-      - build

.eslintrc.js

@@ -1,79 +0,0 @@
-module.exports = {
-    "env": {
-        "browser": true,
-        "es6": true,
-        "jasmine": true,
-        "amd": true
-    },
-    "extends": "eslint:recommended",
-    "parser": "babel-eslint",
-    "parserOptions": {
-        "allowImportExportEverywhere": true,
-        "ecmaVersion": 2015,
-        "ecmaFeatures": {
-            "impliedStrict": true
-        }
-    },
-    "rules": {
-        "no-bitwise": "error",
-        "curly": "error",
-        "eqeqeq": "error",
-        "guard-for-in": "error",
-        "no-extend-native": "error",
-        "no-inner-declarations": "off",
-        "no-use-before-define": ["error", "nofunc"],
-        "no-caller": "error",
-        "no-sequences": "error",
-        "no-irregular-whitespace": "error",
-        "no-new": "error",
-        "no-shadow": "error",
-        "no-undef": "error",
-        "no-unused-vars": [
-            "error",
-            {
-                "vars": "all",
-                "args": "none"
-            }
-        ],
-        "no-console": "off",
-        "no-trailing-spaces": "error",
-        "space-before-function-paren": [
-            "error",
-            {
-                "anonymous": "always",
-                "asyncArrow": "always",
-                "named": "never",
-            }
-        ],
-        "array-bracket-spacing": "error",
-        "space-in-parens": "error",
-        "space-before-blocks": "error",
-        "comma-dangle": "error",
-        "eol-last": "error",
-        "new-cap": [
-            "error",
-            {
-                "capIsNew": false,
-                "properties": false
-            }
-        ],
-        "dot-notation": "error",
-        "indent": ["error", 4]
-    },
-    "overrides": [
-        {
-            "files": ["*Spec.js"],
-            "rules": {
-                "no-unused-vars": [
-                    "warn",
-                    {
-                        "vars": "all",
-                        "args": "none",
-                        "varsIgnorePattern": "controller",
-
-                    }
-                ]
-            }
-        }
-    ]
-};

.gitignore

@@ -36,5 +36,3 @@ protractor/logs
 
 # npm-debug log
 npm-debug.log
-
-package-lock.json

.jscsrc

@@ -0,0 +1,5 @@
+{
+    "preset": "crockford",
+    "requireMultipleVarDecl": false,
+    "requireVarDeclFirst": false
+}

.jshintrc

@@ -0,0 +1,25 @@
+{
+    "bitwise": true,
+    "browser": true,
+    "curly": true,
+    "eqeqeq": true,
+    "forin": true,
+    "freeze": true,
+    "funcscope": false,
+    "futurehostile": true,
+    "latedef": true,
+    "noarg": true,
+    "nocomma": true,
+    "nonbsp": true,
+    "nonew": true,
+    "predef": [
+        "define",
+        "Promise",
+        "WeakMap",
+        "Map"
+    ],
+    "shadow": "outer",
+    "strict": "implied",
+    "undef": true,
+    "unused": "vars"
+}

API.md

@@ -1,61 +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)
-  - [Indicators](#indicators)
-    - [The URL Status Indicator](#the-url-status-indicator)
-    - [Creating a Simple Indicator](#creating-a-simple-indicator)
-    - [Custom Indicators](#custom-indicators)
-  - [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
@@ -212,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
@@ -220,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
@@ -253,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"
     });
 ```
@@ -294,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.
@@ -313,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);
@@ -331,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 = {
@@ -354,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).
@@ -418,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`
@@ -435,7 +372,6 @@ Known hints:
 
 * `domain`: Indicates that the value represents the "input" of a datum. Values with a `domain` hint will be used for the x-axis of a plot, and tables will render columns for these values first.
 * `range`: Indicates that the value is the "output" of a datum.  Values with a `range` hint will be used as the y-axis on a plot, and tables will render columns for these values after the `domain` values.
-* `image`: Indicates that the value may be interpreted as the URL to an image file, in which case appropriate views will be made available.
 
 ##### The Time Conductor and Telemetry 
 
@@ -446,18 +382,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.
 
@@ -465,15 +397,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,
@@ -482,53 +413,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:
@@ -598,17 +483,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.
@@ -630,7 +504,7 @@ MCT, it will be pre-configured to use the UTC time system, which is installed an
 
 The time bounds of an Open MCT application are defined as numbers, and a Time 
 System gives meaning and context to these numbers so that they can be correctly 
-interpreted. Time Systems are JavaScript objects that provide some information 
+interpreted. Time Systems are javscript objects that provide some information 
 about the current time reference frame. An example of defining and registering 
 a new time system is given below:
 
@@ -673,26 +547,31 @@ numbers in UTC terrestrial time.
 
 #### Getting and Setting the Active Time System
 
-Once registered, a time system can be activated by calling `timeSystem` with
-the timeSystem `key` or an instance of the time system.  If you are not using a
-[clock](#clocks), you must also specify valid [bounds](#time-bounds) for the
-timeSystem.
+Once registered, a time system can be activated using a key, or an instance of 
+the time system itself.
 
 ```javascript
-openmct.time.timeSystem('utc', bounds);
+openmct.time.timeSystem('utc');
 ```
 
-A time system can be immediately activated after registration: 
+A time system can be immediately activated upon registration: 
 
 ```javascript
+var utcTimeSystem = {
+    key: 'utc',
+    name: 'UTC Time',
+    cssClass = 'icon-clock',
+    timeFormat = 'utc',
+    durationFormat = 'duration',
+    isUTCBased = true
+};
 openmct.time.addTimeSystem(utcTimeSystem);
-openmct.time.timeSystem(utcTimeSystem, bounds);
+openmct.time.timeSystem(utcTimeSystem);
 ```
 
-Setting the active time system will trigger a [`'timeSystem'`](#time-events) 
-event.  If you supplied bounds, a [`'bounds'`](#time-events) event will be triggered afterwards with your newly supplied bounds.
+Setting the active time system will trigger a [time system event](#time-events). 
 
-#### Time Bounds
+### Time Bounds
 
 The TimeAPI provides a getter/setter for querying and setting time bounds. Time 
 bounds are simply an object with a `start` and an end `end` attribute.
@@ -713,10 +592,10 @@ let now = Date.now();
 openmct.time.bounds({start: now - ONE_HOUR, now);
 ```
 
-To respond to bounds change events, listen for the [`'bounds'`](#time-events)
-event.
+To respond to bounds change events, simply register a callback against the `bounds`
+event. For more information on the bounds event, please see the section on [Time Events](#time-events).
 
-### 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
@@ -735,7 +614,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:
 
@@ -794,16 +673,14 @@ An example clock implementation is provided in the form of the [LocalClock](http
 Once registered a clock can be activated by calling the `clock` function on the 
 Time API passing in the key or instance of a registered clock. Only one clock 
 may be active at once, so activating a clock will deactivate any currently 
-active clock. [`clockOffsets`](#clock-offsets) must be specified when changing a clock.
-
-Setting the clock triggers a [`'clock'`](#time-events) event, followed by a [`'clockOffsets'`](#time-events) event, and then a [`'bounds'`](#time-events) event as the offsets are applied to the clock's currentValue().
-
+active clock. Setting the clock will also trigger a ['clock' event](#time-events).
 
 ```
-openmct.time.clock(someClock, clockOffsets);
+openmct.time.clock(someClock);
 ```
 
-Upon being activated, the time API will listen for tick events on the clock by calling `clock.on`.
+Upon being activated, a clock's `on` function will be immediately called to subscribe
+to `tick` events.
 
 The currently active clock (if any) can be retrieved by calling the same 
 function without any arguments.
@@ -830,7 +707,7 @@ relative time spans. Offsets are defined as an object with two properties:
 * `start`: A `number` that must be < 0 and which is used to calculate the start 
 bounds on each clock tick. The start offset will be calculated relative to the 
 value provided by a clock's tick callback, or its `currentValue()` function.
-* `end`: A `number` that must be >= 0 and which is used to calculate the end 
+* `end`: A `number` that must be >=0 and which is used to calculate the end 
 bounds on each clock tick.
 
 The `clockOffsets` function can be used to get or set clock offsets. For example, 
@@ -849,11 +726,18 @@ __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.
+The time API supports the registration of listeners that will be invoked when the 
+application's temporal state changes. Events listeners can be registered using 
+the `on` function. They can be deregistered using the `off` function. The arguments
+accepted by the `on` and `off` functions are:
 
-For example:
+* `event`: A `string` naming the event to subscribe to. Event names correspond to
+the property of the Time API you're interested in. A [full list of time events](#list-of-time-events) 
+is provided later.
+
+As an example, the code to listen to bounds change events looks like:
 
 ``` javascript
 openmct.time.on('bounds', function callback (newBounds, tick) {
@@ -863,38 +747,40 @@ openmct.time.on('bounds', function callback (newBounds, tick) {
 
 #### List of Time Events
 
-The events emitted by the Time API are:
+The events supported by the Time API are:
 
-* `bounds`: emitted whenever the bounds change.  The callback will be invoked 
-  with two arguments:
-  * `bounds`: A [bounds](#getting-and-setting-bounds) bounds object
-    representing a new time period bound by the specified start and send times.
-  * `tick`: A `boolean` indicating whether or not this bounds change is due to
-    a "tick" from a [clock source](#clocks). This information can be useful 
-    when determining a strategy for fetching telemetry data in response to a 
-    bounds change event. For example, if the bounds change was automatic, and 
-    is due to a tick then it's unlikely that you would need to perform a 
-    historical data query. It should be sufficient to just show any new 
-    telemetry received via subscription since the last tick, and optionally to 
-    discard any older data that now falls outside of the currently set bounds. 
-    If `tick` is false,then the bounds change was not due to an automatic tick, 
-    and a query for historical data may be necessary, depending on your data 
-    caching strategy, and how significantly the start bound has changed.
-* `timeSystem`: emitted whenever the active time system changes.  The callback will be invoked with a single argument:
-  * `timeSystem`: The newly active [time system](#defining-and-registering-time-systems).
-* `clock`: emitted whenever the clock changes.  The callback will be invoked 
-  with a single argument:
-  * `clock`: The newly active [clock](#clocks), or `undefined` if an active 
-    clock has been deactivated.
-* `clockOffsets`: emitted whenever the active clock offsets change.  The 
-  callback will be invoked with a single argument:
-  * `clockOffsets`: The new [clock offsets](#clock-offsets).
+* `bounds`: Listen for changes to current bounds. The callback will be invoked 
+with two arguments:
+    * `bounds`: A [bounds](#getting-and-setting-bounds) bounds object representing 
+    a new time period bound by the specified start and send times.
+    * `tick`: A `boolean` indicating whether or not this bounds change is due to a 
+    "tick" from a [clock source](#clocks). This information can be useful when 
+    determining a strategy for fetching telemetry data in response to a bounds 
+    change event. For example, if the bounds change was automatic, and is due 
+    to a tick then it's unlikely that you would need to perform a historical 
+    data query. It should be sufficient to just show any new telemetry received 
+    via subscription since the last tick, and optionally to discard any older 
+    data that now falls outside of the currently set bounds. If `tick` is false,
+    then the bounds change was not due to an automatic tick, and a query for 
+    historical data may be necessary, depending on your data caching strategy, 
+    and how significantly the start bound has changed.
+* `timeSystem`: Listen for changes to the active [time system](#defining-and-registering-time-systems).
+The callback will be invoked with a single argument - the newly active time system.
+    * `timeSystem`: The newly active [time system](#defining-and-registering-time-systems) object.
+* `clock`: Listen for changes to the active clock. When invoked, the callback 
+will be provided with the new clock.
+    * `clock`: The newly active [clock](#clocks), or `undefined` if an active clock
+    has been deactivated.
+* `clockOffsets`: Listen for changes to active clock offsets. When invoked the 
+callback will be provided with the new clock offsets.
+    * `clockOffsets`: A [clock offsets](#clock-offsets) object.
 
 
-### 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.
+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.
 
 If activated, the time conductor must be provided with configuration options, 
 detailed below.
@@ -981,72 +867,6 @@ openmct.install(openmct.plugins.Conductor({
 }));
 ```
 
-## Indicators
-
-Indicators are small widgets that reside at the bottom of the screen and are visible from 
-every screen in Open MCT. They can be used to convey system state using an icon and text.
-Typically an indicator will display an icon (customizable with a CSS class) that will 
-reveal additional information when the mouse cursor is hovered over it.
-
-### The URL Status Indicator
-
-A common use case for indicators is to convey the state of some external system such as a 
-persistence backend or HTTP server. So long as this system is accessible via HTTP request, 
-Open MCT provides a general purpose indicator to show whether the server is available and 
-returing a 2xx status code. The URL Status Indicator is made available as a default plugin. See
-[Included Plugins](#included-plugins) below for details on how to install and configure the 
-URL Status Indicator.
-
-### Creating a Simple Indicator
-
-A simple indicator with an icon and some text can be created and added with minimal code. An indicator 
-of this type exposes functions for customizing the text, icon, and style of the indicator.
-
-eg.
-``` javascript
-var myIndicator = openmct.indicators.simpleIndicator();
-myIndicator.text("Hello World!");
-openmct.indicators.add(myIndicator);
-```
-
-This will create a new indicator and add it to the bottom of the screen in Open MCT.
-By default, the indicator will appear as an information icon. Hovering over the icon will
-reveal the text set via the call to `.text()`. The Indicator object returned by the API 
-call exposes a number of functions for customizing the content and appearance of the indicator:
-
-* `.text([text])`: Gets or sets the text shown when the user hovers over the indicator.
-Accepts an __optional__ `string` argument that, if provided, will be used to set the text. 
-Hovering over the indicator will expand it to its full size, revealing this text alongside 
-the icon. Returns the currently set text as a `string`.
-* `.description([description])`: Gets or sets the indicator's description. Accepts an 
-__optional__ `string` argument that, if provided, will be used to set the text. The description 
-allows for more detail to be provided in a tooltip when the user hovers over the indicator. 
-Returns the currently set text as a `string`.
-* `.iconClass([className])`: Gets or sets the CSS class used to define the icon. Accepts an __optional__ 
-`string` parameter to be used to set the class applied to the indicator. Any of 
-[the built-in glyphs](https://nasa.github.io/openmct/style-guide/#/browse/styleguide:home/glyphs?view=styleguide.glyphs) 
-may be used here, or a custom CSS class can be provided. Returns the currently defined CSS 
-class as a `string`.
-* `.statusClass([className])`: Gets or sets the CSS class used to determine status. Accepts an __optional __
-`string` parameter to be used to set a status class applied to the indicator. May be used to apply 
-different colors to indicate status.
-
-### Custom Indicators
-
-A completely custom indicator can be added by simple providing a DOM element to place alongside other indicators.
-
-``` javascript
-    var domNode = document.createElement('div');
-    domNode.innerText = new Date().toString();
-    setInterval(function () {
-        domNode.innerText = new Date().toString();
-    }, 1000);
-
-    openmct.indicators.add({
-        element: domNode
-    });
-```
-
 ## Included Plugins
 
 Open MCT is packaged along with a few general-purpose plugins:
@@ -1070,21 +890,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.URLIndicator` adds an indicator which shows the
-availability of a URL with the following options: 
-  - `url` : URL to indicate the status of
-  - `iconClass`: 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.URLIndicator({
-  url: 'http://localhost:8080',
-    iconClass: 'check',
-    interval: 10000,
-    label: 'Localhost'
- })
-);
-```
 * `openmct.plugins.LocalStorage` provides persistence of user-created
   objects in browser-local storage. This is particularly useful in
   development environments.

README.md

@@ -84,22 +84,42 @@ Documentation will be generated in `target/docs`.
 ## Deploying Open MCT
 
 Open MCT is built using [`npm`](http://npmjs.com/)
+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
 instance (e.g. by starting an HTTP server in that directory), including:
 
-* `openmct.js` - Open MCT source code.
-* `openmct.css` - Basic styles to load to prevent a FOUC.
-* `index.html`, an example to run Open MCT in the basic configuration.
+* A `main.js` file containing Open MCT source code.
+* Various assets in the `example` and `platform` directories.
+* An `index.html` that runs Open MCT in its default configuration.
+
+Additional `gulp` tasks are defined in [the gulpfile](gulpfile.js).
+
+## Bundles
+
+A bundle is a group of software components (including source code, declared
+as AMD modules, as well as resources such as images and HTML templates)
+that is intended to be added or removed as a single unit. A plug-in for
+Open MCT will be expressed as a bundle; platform components are also
+expressed as bundles.
+
+A bundle is also just a directory which contains a file `bundle.json`,
+which declares its contents.
+
+The file `bundles.json` (note the plural), at the top level of the
+repository, is a JSON file containing an array of all bundles (expressed as
+directory names) to include in a running instance of Open MCT. Adding or
+removing paths from this list will add or remove bundles from the running
+application.
 
 ## Tests
 
-Tests are written for [Jasmine 3](http://jasmine.github.io/)
+Tests are written for [Jasmine 1.3](http://jasmine.github.io/1.3/introduction.html)
 and run by [Karma](http://karma-runner.github.io). To run:
 
 `npm test`
@@ -117,6 +137,20 @@ naming convention is otherwise the same.)
 When `npm test` is run, test results will be written as HTML to
 `target/tests`. Code coverage information is written to `target/coverage`.
 
+
+### Functional Testing
+
+The tests described above are all at the unit-level; an additional
+test suite using [Protractor](https://angular.github.io/protractor/)
+is under development, in the `protractor` folder.
+
+To run:
+
+* Install protractor following the instructions above.
+* `cd protractor`
+* `npm install`
+* `npm run all`
+
 # Glossary
 
 Certain terms are used throughout Open MCT with consistent meanings

app.js

@@ -7,72 +7,78 @@
  * node app.js [options]
  */
 
+(function () {
+    "use strict";
 
-const options = require('minimist')(process.argv.slice(2));
-const express = require('express');
-const app = express();
-const fs = require('fs');
-const request = require('request');
+    var BUNDLE_FILE = 'bundles.json',
+        options = require('minimist')(process.argv.slice(2)),
+        express = require('express'),
+        app = express(),
+        fs = require('fs'),
+        request = require('request');
 
-// Defaults
-options.port = options.port || options.p || 8080;
-options.host = options.host || options.h || 'localhost';
-options.directory = options.directory || options.D || '.';
+    // Defaults
+    options.port = options.port || options.p || 8080;
+    options.directory = options.directory || options.D || '.';
+    ['include', 'exclude', 'i', 'x'].forEach(function (opt) {
+        options[opt] = options[opt] || [];
+        // Make sure includes/excludes always end up as arrays
+        options[opt] = Array.isArray(options[opt]) ?
+                options[opt] : [options[opt]];
+    });
+    options.include = options.include.concat(options.i);
+    options.exclude = options.exclude.concat(options.x);
 
-// Show command line options
-if (options.help || options.h) {
-    console.log("\nUsage: node app.js [options]\n");
-    console.log("Options:");
-    console.log("  --help, -h               Show this message.");
-    console.log("  --port, -p <number>      Specify port.");
-    console.log("  --directory, -D <bundle>   Serve files from specified directory.");
-    console.log("");
-    process.exit(0);
-}
-
-app.disable('x-powered-by');
-
-app.use('/proxyUrl', function proxyRequest(req, res, next) {
-    console.log('Proxying request to: ', req.query.url);
-    req.pipe(request({
-        url: req.query.url,
-        strictSSL: false
-    }).on('error', next)).pipe(res);
-});
-
-const webpack = require('webpack');
-const webpackConfig = require('./webpack.config.js');
-webpackConfig.plugins.push(new webpack.HotModuleReplacementPlugin());
-webpackConfig.plugins.push(function() { this.plugin('watch-run', function(watching, callback) { console.log('Begin compile at ' + new Date()); callback(); }) });
-
-webpackConfig.entry.openmct = [
-    'webpack-hot-middleware/client?reload=true',
-    webpackConfig.entry.openmct
-];
-
-const compiler = webpack(webpackConfig);
-
-app.use(require('webpack-dev-middleware')(
-    compiler,
-    {
-        publicPath: '/dist',
-        logLevel: 'warn'
+    // Show command line options
+    if (options.help || options.h) {
+        console.log("\nUsage: node app.js [options]\n");
+        console.log("Options:");
+        console.log("  --help, -h               Show this message.");
+        console.log("  --port, -p <number>      Specify port.");
+        console.log("  --include, -i <bundle>   Include the specified bundle.");
+        console.log("  --exclude, -x <bundle>   Exclude the specified bundle.");
+        console.log("  --directory, -D <bundle>   Serve files from specified directory.");
+        console.log("");
+        process.exit(0);
     }
-));
 
-app.use(require('webpack-hot-middleware')(
-    compiler,
-    {
+    app.disable('x-powered-by');
 
-    }
-));
+    // Override bundles.json for HTTP requests
+    app.use('/' + BUNDLE_FILE, function (req, res) {
+        var bundles;
 
-// Expose index.html for development users.
-app.get('/', function (req, res) {
-    fs.createReadStream('index.html').pipe(res);
-});
+        try {
+            bundles = JSON.parse(fs.readFileSync(BUNDLE_FILE, 'utf8'));
+        } catch (e) {
+            bundles = [];
+        }
 
-// Finally, open the HTTP server and log the instance to the console
-app.listen(options.port, options.host, function() {
-    console.log('Open MCT application running at %s:%s', options.host, options.port)
-});
+        // Handle command line inclusions/exclusions
+        bundles = bundles.concat(options.include);
+        bundles = bundles.filter(function (bundle) {
+            return options.exclude.indexOf(bundle) === -1;
+        });
+        bundles = bundles.filter(function (bundle, index) { // Uniquify
+            return bundles.indexOf(bundle) === index;
+        });
+
+        res.send(JSON.stringify(bundles));
+    });
+
+    app.use('/proxyUrl', function proxyRequest(req, res, next) {
+        console.log('Proxying request to: ', req.query.url);
+        req.pipe(request({
+            url: req.query.url,
+            strictSSL: false
+        }).on('error', next)).pipe(res);
+    });
+
+    // Expose everything else as static files
+    app.use(express['static'](options.directory));
+
+    // Finally, open the HTTP server and log the instance to the console
+    app.listen(options.port, function() {
+        console.log('Open MCT application running at localhost:' + options.port)
+    });
+}());

bower.json

@@ -0,0 +1,27 @@
+{
+  "name": "openmct",
+  "description": "The Open MCT core platform",
+  "main": "",
+  "license": "Apache-2.0",
+  "moduleType": [],
+  "homepage": "http://nasa.github.io/openmct/",
+  "private": true,
+  "dependencies": {
+    "angular": "1.4.4",
+    "angular-route": "1.4.4",
+    "moment": "^2.11.1",
+    "moment-duration-format": "^1.3.0",
+    "requirejs": "~2.1.22",
+    "text": "requirejs-text#^2.0.14",
+    "es6-promise": "^3.3.0",
+    "screenfull": "^3.0.0",
+    "node-uuid": "^1.4.7",
+    "comma-separated-values": "^3.6.4",
+    "FileSaver.js": "^0.0.2",
+    "zepto": "^1.1.6",
+    "eventemitter3": "^1.2.0",
+    "lodash": "3.10.1",
+    "almond": "~0.3.2",
+    "html2canvas": "^0.4.1"
+  }
+}

circle.yml

@@ -0,0 +1,25 @@
+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:
+      appname: openmctweb-staging-deux
+test:
+  post:
+    - gulp lint
+    - gulp checkstyle
+
+general:
+  branches:
+    ignore:
+      - gh-pages

copyright-notice.js

@@ -1,21 +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.
- *****************************************************************************/

docs/src/guide/index.md

@@ -933,10 +933,9 @@ Note that `templateUrl` is not supported for `containers`.
 
 Controls provide options for the `mct-control` directive. 
  
-These standard control types are included in the forms bundle:
+Ten standard control types are included in the forms bundle:
 
-* `textfield`: A text input to enter plain text.
-* `numberfield`: A text input to enter numbers.
+* `textfield`: An area to enter plain text.
 * `select`: A drop-down list of options.
 * `checkbox`: A box which may be checked/unchecked.
 * `color`: A color picker.
@@ -2283,7 +2282,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

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)

example/builtins/README.md

@@ -0,0 +1,8 @@
+This bundle is intended to serve as an example of registering
+extensions which are mapped directly to built-in Angular features.
+
+These are:
+* Controllers
+* Directives
+* Routes
+* Services

example/builtins/bundle.js

@@ -0,0 +1,74 @@
+/*****************************************************************************
+ * 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([
+    "./src/ExampleController",
+    "./src/ExampleDirective",
+    "./src/ExampleService",
+    'legacyRegistry'
+], function (
+    ExampleController,
+    ExampleDirective,
+    ExampleService,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/builtins", {
+        "name": "Angular Built-ins Example",
+        "description": "Example showing how to declare extensions with built-in support from Angular.",
+        "sources": "src",
+        "extensions": {
+            "controllers": [
+                {
+                    "key": "ExampleController",
+                    "implementation": ExampleController,
+                    "depends": [
+                        "$scope",
+                        "exampleService"
+                    ]
+                }
+            ],
+            "directives": [
+                {
+                    "key": "exampleDirective",
+                    "implementation": ExampleDirective,
+                    "depends": [
+                        "examples[]"
+                    ]
+                }
+            ],
+            "routes": [
+                {
+                    "templateUrl": "templates/example.html"
+                }
+            ],
+            "services": [
+                {
+                    "key": "exampleService",
+                    "implementation": ExampleService
+                }
+            ]
+        }
+    });
+});

example/builtins/res/templates/example.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,12 +19,6 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-
-<a class="s-button {{structure.cssClass}}"
-   ng-model="ngModel[field]"
-   ng-class="{ labeled: structure.text }"
-   mct-file-input>
-    <span class="title-label" ng-if="structure.text">
-        {{structure.text}}
-    </span>
-</a>
+<p>Hello, world! I am the default route.</p>
+<p ng-controller="ExampleController">My controller has told me: "{{phrase}}"</p>
+<span example-directive></span>

example/builtins/src/ExampleController.js

@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * 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,Promise*/
+
+/**
+ * Module defining ExampleController. Created by vwoeltje on 11/4/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function ExampleController($scope, exampleService) {
+            $scope.phrase = exampleService.getMessage();
+        }
+
+        return ExampleController;
+    }
+);

example/builtins/src/ExampleDirective.js

@@ -0,0 +1,66 @@
+/*****************************************************************************
+ * 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,Promise*/
+
+/**
+ * Module defining ExampleDirective. Created by vwoeltje on 11/4/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        var HAS_EXTENSIONS = "A directive loaded these message from " +
+                    "example extensions.",
+            NO_EXTENSIONS = "A directive tried to load example extensions," +
+                    " but found none.",
+            MESSAGE = "I heard this from my partial constructor.";
+
+        /**
+         *
+         * @constructor
+         */
+        function ExampleDirective(examples) {
+            // Build up a template from example extensions
+            var template = examples.length > 0 ?
+                    HAS_EXTENSIONS : NO_EXTENSIONS;
+
+            template += "<ul>";
+            examples.forEach(function (E) {
+                template += "<li>";
+                if (typeof E === 'function') {
+                    template += (new E(MESSAGE)).getText();
+                } else {
+                    template += E.text;
+                }
+                template += "</li>";
+            });
+            template += "</ul>";
+
+            return {
+                template: template
+            };
+        }
+
+        return ExampleDirective;
+    }
+);

example/builtins/src/ExampleService.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.
  *
@@ -19,22 +19,28 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define,Promise*/
 
+/**
+ * Module defining ExampleService. Created by vwoeltje on 11/4/14.
+ */
 define(
     [],
     function () {
-        function MCTIndicators(openmct) {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function ExampleService() {
             return {
-                restrict: "E",
-                link: function link(scope, element) {
-                    openmct.indicators.indicatorElements
-                        .forEach(function (indicatorElement) {
-                            element.append(indicatorElement);
-                        });
+                getMessage: function () {
+                    return "I heard this from a service";
                 }
             };
         }
 
-        return MCTIndicators;
+        return ExampleService;
     }
 );

example/composite/bundle.js

@@ -0,0 +1,82 @@
+/*****************************************************************************
+ * 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([
+    "./src/SomeProvider",
+    "./src/SomeOtherProvider",
+    "./src/SomeDecorator",
+    "./src/SomeOtherDecorator",
+    "./src/SomeAggregator",
+    "./src/SomeOtherExample",
+    'legacyRegistry'
+], function (
+    SomeProvider,
+    SomeOtherProvider,
+    SomeDecorator,
+    SomeOtherDecorator,
+    SomeAggregator,
+    SomeOtherExample,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/composite", {
+        "extensions": {
+            "components": [
+                {
+                    "implementation": SomeProvider,
+                    "provides": "someService",
+                    "type": "provider"
+                },
+                {
+                    "implementation": SomeOtherProvider,
+                    "provides": "someService",
+                    "type": "provider"
+                },
+                {
+                    "implementation": SomeDecorator,
+                    "provides": "someService",
+                    "type": "decorator"
+                },
+                {
+                    "implementation": SomeOtherDecorator,
+                    "provides": "someService",
+                    "type": "decorator"
+                },
+                {
+                    "implementation": SomeAggregator,
+                    "provides": "someService",
+                    "type": "aggregator"
+                }
+            ],
+            "examples": [
+                {
+                    "implementation": SomeOtherExample,
+                    "depends": [
+                        "someService"
+                    ]
+                }
+            ]
+        }
+    });
+});

example/composite/src/SomeAggregator.js

@@ -0,0 +1,50 @@
+/*****************************************************************************
+ * 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,Promise*/
+
+/**
+ * Module defining SomeAggregator. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeAggregator(someProviders) {
+            return {
+                getMessages: function () {
+                    return someProviders.map(function (provider) {
+                        return provider.getMessages();
+                    }).reduce(function (a, b) {
+                        return a.concat(b);
+                    }, []);
+                }
+            };
+        }
+
+        return SomeAggregator;
+    }
+);

example/composite/src/SomeDecorator.js

@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * 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,Promise*/
+
+/**
+ * Module defining SomeDecorator. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeDecorator(someProvider) {
+            return {
+                getMessages: function () {
+                    return someProvider.getMessages().map(function (msg) {
+                        return msg.toLocaleUpperCase();
+                    });
+                }
+            };
+        }
+
+        return SomeDecorator;
+    }
+);

example/composite/src/SomeOtherDecorator.js

@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * 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,Promise*/
+
+/**
+ * Module defining SomeOtherDecorator. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeOtherDecorator(someProvider) {
+            return {
+                getMessages: function () {
+                    return someProvider.getMessages().map(function (msg) {
+                        return msg + "...";
+                    });
+                }
+            };
+        }
+
+        return SomeOtherDecorator;
+    }
+);

example/composite/src/SomeOtherExample.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.
  *
@@ -19,19 +19,28 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define,Promise*/
 
-define(function () {
-    return {
-        name: 'Telemetry Table',
-        description: 'Display telemetry values for the current time bounds in tabular form. Supports filtering and sorting.',
-        creatable: true,
-        cssClass: 'icon-tabular-realtime',
-        initialize(domainObject) {
-            domainObject.composition = [];
-            domainObject.configuration = {
-                columnWidths: {},
-                hiddenColumns: {}
+/**
+ * Module defining SomeOtherExample. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeOtherExample(someService) {
+            return {
+                getText: function () {
+                    return someService.getMessages().join(" | ");
+                }
             };
         }
-    };
-});
+
+        return SomeOtherExample;
+    }
+);

example/composite/src/SomeOtherProvider.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.
  *
@@ -19,24 +19,30 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define,Promise*/
 
-define([
-    './tabs'
-], function (
-    Tabs
-) {
-    return function plugin() {
-        return function install(openmct) {
-            openmct.objectViews.addProvider(new Tabs(openmct));
+/**
+ * Module defining SomeOtherProvider. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
 
-            openmct.types.addType('tabs', {
-                name: "Tabs View",
-                creatable: true,
-                cssClass: 'icon-tabs-view',
-                initialize(domainObject) {
-                    domainObject.composition = [];
+        /**
+         *
+         * @constructor
+         */
+        function SomeOtherProvider() {
+            return {
+                getMessages: function () {
+                    return [
+                        "I am a message from some other provider."
+                    ];
                 }
-            });
-        };
-    };
-});
+            };
+        }
+
+        return SomeOtherProvider;
+    }
+);

example/composite/src/SomeProvider.js

@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * 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,Promise*/
+
+/**
+ * Module defining SomeProvider. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeProvider() {
+            return {
+                getMessages: function () {
+                    return [
+                        "I am a message from some provider."
+                    ];
+                }
+            };
+        }
+
+        return SomeProvider;
+    }
+);

example/eventGenerator/bundle.js

@@ -49,7 +49,7 @@ define([
                 {
                     "key": "eventGenerator",
                     "name": "Event Message Generator",
-                    "cssClass": "icon-generator-events",
+                    "cssClass": "icon-folder-new",
                     "description": "For development use. Creates sample event message data that mimics a live data stream.",
                     "priority": 10,
                     "features": "creation",
@@ -60,8 +60,8 @@ define([
                         "source": "eventGenerator",
                         "domains": [
                             {
-                                "key": "utc",
-                                "name": "Timestamp",
+                                "key": "time",
+                                "name": "Time",
                                 "format": "utc"
                             }
                         ],

example/eventGenerator/src/EventTelemetry.js

@@ -22,23 +22,24 @@
 /*global define */
 
 /**
- * Module defining EventTelemetry.
+ * Module defining EventTelemetry. 
  * Created by chacskaylo on 06/18/2015.
- * Modified by shale on 06/23/2015.
+ * Modified by shale on 06/23/2015. 
  */
 define(
-    ['../data/transcript.json'],
-    function (messages) {
+    ['text!../data/transcript.json'],
+    function (transcript) {
         "use strict";
 
-        var firstObservedTime = Date.now();
-
+        var firstObservedTime = Date.now(),
+            messages = JSON.parse(transcript);
+        
         function EventTelemetry(request, interval) {
 
             var latestObservedTime = Date.now(),
                 count = Math.floor((latestObservedTime - firstObservedTime) / interval),
                 generatorData = {};
-
+            
             generatorData.getPointCount = function () {
                 return count;
             };
@@ -47,13 +48,13 @@ define(
                 return i * interval +
                         (domain !== 'delta' ? firstObservedTime : 0);
             };
-
+            
 	        generatorData.getRangeValue = function (i, range) {
 		        var domainDelta = this.getDomainValue(i) - firstObservedTime,
                     ind = i % messages.length;
                 return messages[ind] + " - [" + domainDelta.toString() + "]";
 	        };
-
+            
             return generatorData;
         }
 

example/extensions/bundle.js

@@ -0,0 +1,51 @@
+/*****************************************************************************
+ * 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([
+    "./src/SomeExample",
+    'legacyRegistry'
+], function (
+    SomeExample,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/extensions", {
+        "name": "Custom Extensions Examples",
+        "description": "Example showing how to declare custom extensions.",
+        "sources": "src",
+        "extensions": {
+            "examples": [
+                {
+                    "text": "I came from example/extensions"
+                },
+                {
+                    "implementation": SomeExample,
+                    "depends": [
+                        "exampleService"
+                    ]
+                }
+            ]
+        }
+    });
+});

example/extensions/src/SomeExample.js

@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * 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,Promise*/
+
+/**
+ * Module defining SomeExample. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeExample(exampleService, message) {
+            return {
+                getText: function () {
+                    return [
+                        '"',
+                        exampleService.getMessage(),
+                        '" and "',
+                        message,
+                        '"'
+                    ].join("");
+                }
+            };
+        }
+
+        return SomeExample;
+    }
+);

example/generator/GeneratorMetadataProvider.js

@@ -1,110 +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",
-                    formatString: '%0.2f',
-                    hints: {
-                        range: 1
-                    }
-                },
-                {
-                    key: "cos",
-                    name: "Cosine",
-                    formatString: '%0.2f',
-                    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;
-
-});

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);
     };
 

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;
+    }
+);

example/generator/SinewaveLimitProvider.js

@@ -1,95 +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 = {
-            sin: 0.9, 
-            cos: 0.9
-        },
-        YELLOW = {
-            sin: 0.5,
-            cos: 0.5
-        },
-        LIMITS = {
-            rh: {
-                cssClass: "is-limit--upr is-limit--red",
-                low: RED,
-                high: Number.POSITIVE_INFINITY,
-                name: "Red High"
-            },
-            rl: {
-                cssClass: "is-limit--lwr is-limit--red",
-                high: -RED,
-                low: Number.NEGATIVE_INFINITY,
-                name: "Red Low"
-            },
-            yh: {
-                cssClass: "is-limit--upr is-limit--yellow",
-                low: YELLOW,
-                high: RED,
-                name: "Yellow High"
-            },
-            yl: {
-                cssClass: "is-limit--lwr is-limit--yellow",
-                low: -RED,
-                high: -YELLOW,
-                name: "Yellow Low"
-            }
-        };
-
-    function SinewaveLimitProvider() {
-
-    }
-
-    SinewaveLimitProvider.prototype.supportsLimits = function (domainObject) {
-        return domainObject.type === 'generator';
-    };
-
-    SinewaveLimitProvider.prototype.getLimitEvaluator = function (domainObject) {
-        return {
-            evaluate: function (datum, valueMetadata) {
-                var range = valueMetadata && valueMetadata.key;
-                
-                if (datum[range] > RED[range]) {
-                    return LIMITS.rh;
-                }
-                if (datum[range] < -RED[range]) {
-                    return LIMITS.rl;
-                }
-                if (datum[range] > YELLOW[range]) {
-                    return LIMITS.yh;
-                }
-                if (datum[range] < -YELLOW[range]) {
-                    return LIMITS.yl;
-                }
-            }
-        };
-    };
-
-    return SinewaveLimitProvider;
-});

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 += duration;
-        }
-        return Promise.resolve(data);
-    };
-
-    return StateGeneratorProvider;
-
-});

example/generator/WorkerInterface.js

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 define([
-    'raw-loader!./generatorWorker.js',
+    'text!./generatorWorker.js',
     'uuid'
 ], function (
     workerText,
@@ -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);
+
     };
 
 

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,35 +82,33 @@
     }
 
     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;
 
         var data = [];
 
-        for (; nextStep < end && data.length < 5000; nextStep += step) {
+        for (; nextStep < end; 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) {

example/generator/plugin.js

@@ -23,105 +23,82 @@
 
 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-generator-telemetry",
-            creatable: true,
-            form: [
-                {
-                    name: "State Duration (seconds)",
-                    control: "numberfield",
-                    cssClass: "l-input-sm l-numeric",
-                    key: "duration",
-                    required: true,
-                    property: [
-                        "telemetry",
-                        "duration"
-                    ]
-                }
-            ],
-            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.",
-            cssClass: "icon-generator-telemetry",
+            cssClass: "icon-telemetry",
             creatable: true,
             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) {
@@ -130,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());
     };
 
 });

example/identity/bundle.js

@@ -38,8 +38,7 @@ define([
                     "provides": "identityService",
                     "type": "provider",
                     "depends": [
-                        "dialogService",
-                        "$q"
+                        "dialogService"
                     ]
                 }
             ]

example/identity/src/ExampleIdentityService.js

@@ -55,37 +55,21 @@ define(
          * @implements {IdentityService}
          * @memberof platform/identity
          */
-        function ExampleIdentityProvider(dialogService, $q) {
-            this.dialogService = dialogService;
-            this.$q = $q;
+        function ExampleIdentityProvider(dialogService) {
+            // Handle rejected dialog messages by treating the
+            // current user as undefined.
+            function echo(v) { return v; }
+            function giveUndefined() { return undefined; }
 
-            this.returnUser = this.returnUser.bind(this);
-            this.returnUndefined = this.returnUndefined.bind(this);
+            this.userPromise =
+                dialogService.getUserInput(DIALOG_STRUCTURE, DEFAULT_IDENTITY)
+                    .then(echo, giveUndefined);
         }
 
         ExampleIdentityProvider.prototype.getUser = function () {
-            if (this.user) {
-                return this.$q.when(this.user);
-            } else {
-                return this.dialogService.getUserInput(DIALOG_STRUCTURE, DEFAULT_IDENTITY)
-                    .then(this.returnUser, this.returnUndefined);
-            }
+            return this.userPromise;
         };
 
-        /**
-         * @private
-         */
-        ExampleIdentityProvider.prototype.returnUser = function (user) {
-            return this.user = user;
-        }
-
-        /**
-         * @private
-         */
-        ExampleIdentityProvider.prototype.returnUndefined = function () {
-            return undefined;
-        }
-
         return ExampleIdentityProvider;
     }
 );

example/imagery/bundle.js

@@ -0,0 +1,80 @@
+/*****************************************************************************
+ * 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([
+    "./src/ImageTelemetryProvider",
+    'legacyRegistry'
+], function (
+    ImageTelemetryProvider,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/imagery", {
+        "name": "Imagery",
+        "description": "Example of a component that produces image telemetry.",
+        "extensions": {
+            "components": [
+                {
+                    "implementation": ImageTelemetryProvider,
+                    "type": "provider",
+                    "provides": "telemetryService",
+                    "depends": [
+                        "$q",
+                        "$timeout"
+                    ]
+                }
+            ],
+            "types": [
+                {
+                    "key": "imagery",
+                    "name": "Example Imagery",
+                    "cssClass": "icon-image",
+                    "features": "creation",
+                    "description": "For development use. Creates example imagery data that mimics a live imagery stream.",
+                    "priority": 10,
+                    "model": {
+                        "telemetry": {}
+                    },
+                    "telemetry": {
+                        "source": "imagery",
+                        "domains": [
+                            {
+                                "name": "Time",
+                                "key": "time",
+                                "format": "utc"
+                            }
+                        ],
+                        "ranges": [
+                            {
+                                "name": "Image",
+                                "key": "url",
+                                "format": "imageUrl"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    });
+});

example/imagery/plugin.js

@@ -1,145 +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 ImageryPlugin() {
-
-        var IMAGE_SAMPLES = [
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18731.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18732.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18733.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18734.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18735.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18736.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18737.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18738.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18739.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18740.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18741.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18742.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18743.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18744.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18745.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18746.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18747.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18748.jpg"
-            ];
-
-        function pointForTimestamp(timestamp, name) {
-            return {
-                name: name,
-                utc: Math.floor(timestamp / 5000) * 5000,
-                url: IMAGE_SAMPLES[Math.floor(timestamp / 5000) % IMAGE_SAMPLES.length]
-            };
-        }
-
-        var realtimeProvider = {
-            supportsSubscribe: function (domainObject) {
-                return domainObject.type === 'example.imagery';
-            },
-            subscribe: function (domainObject, callback) {
-                var interval = setInterval(function () {
-                    callback(pointForTimestamp(Date.now(), domainObject.name));
-                }, 5000);
-
-                return function (interval) {
-                    clearInterval(interval);
-                };
-            }
-        };
-
-        var historicalProvider = {
-            supportsRequest: function (domainObject, options) {
-                return domainObject.type === 'example.imagery'
-                    && options.strategy !== 'latest';
-            },
-            request: function (domainObject, options) {
-                var start = options.start;
-                var end = options.end;
-                var data = [];
-                while (start <= end && data.length < 5000) {
-                    data.push(pointForTimestamp(start, domainObject.name));
-                    start += 5000;
-                }
-                return Promise.resolve(data);
-            }
-        };
-
-        var ladProvider = {
-            supportsRequest: function (domainObject, options) {
-                return domainObject.type === 'example.imagery' &&
-                    options.strategy === 'latest';
-            },
-            request: function (domainObject, options) {
-                return Promise.resolve([pointForTimestamp(Date.now(), domainObject.name)]);
-            }
-        };
-
-
-        return function install(openmct) {
-            openmct.types.addType('example.imagery', {
-                key: 'example.imagery',
-                name: 'Example Imagery',
-                cssClass: 'icon-image',
-                description: 'For development use. Creates example imagery ' +
-                    'data that mimics a live imagery stream.',
-                creatable: true,
-                initialize: function (object) {
-                    object.telemetry = {
-                        values: [
-                            {
-                                name: 'Name',
-                                key: 'name'
-                            },
-                            {
-                                name: 'Time',
-                                key: 'utc',
-                                format: 'utc',
-                                hints: {
-                                    domain: 1
-                                }
-                            },
-                            {
-                                name: 'Image',
-                                key: 'url',
-                                format: 'image',
-                                hints: {
-                                    image: 1
-                                }
-                            }
-                        ]
-                    }
-                }
-            });
-
-            openmct.telemetry.addProvider(realtimeProvider);
-            openmct.telemetry.addProvider(historicalProvider);
-            openmct.telemetry.addProvider(ladProvider);
-        };
-    }
-
-    return ImageryPlugin;
-});

example/imagery/src/ImageTelemetry.js

@@ -0,0 +1,81 @@
+/*****************************************************************************
+ * 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,Promise*/
+
+/**
+ * Module defining ImageTelemetry. Created by vwoeltje on 06/22/15.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        var firstObservedTime = Date.now(),
+            images = [
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18731.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18732.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18733.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18734.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18735.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18736.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18737.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18738.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18739.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18740.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18741.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18742.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18743.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18744.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18745.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18746.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18747.jpg",
+                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18748.jpg"
+
+            ].map(function (url, index) {
+                return {
+                    timestamp: firstObservedTime + 1000 * index,
+                    url: url
+                };
+            });
+
+
+        /**
+         *
+         * @constructor
+         */
+        function ImageTelemetry() {
+            return {
+                getPointCount: function () {
+                    return Math.floor((Date.now() - firstObservedTime) / 1000);
+                },
+                getDomainValue: function (i, domain) {
+                    return images[i % images.length].timestamp;
+                },
+                getRangeValue: function (i, range) {
+                    return images[i % images.length].url;
+                }
+            };
+        }
+
+        return ImageTelemetry;
+    }
+);

example/imagery/src/ImageTelemetryProvider.js

@@ -0,0 +1,115 @@
+/*****************************************************************************
+ * 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,Promise*/
+
+/**
+ * Module defining ImageTelemetryProvider. Created by vwoeltje on 06/22/15.
+ */
+define(
+    ["./ImageTelemetry"],
+    function (ImageTelemetry) {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function ImageTelemetryProvider($q, $timeout) {
+            var subscriptions = [];
+
+            //
+            function matchesSource(request) {
+                return request.source === "imagery";
+            }
+
+            // Used internally; this will be repacked by doPackage
+            function generateData(request) {
+                return {
+                    key: request.key,
+                    telemetry: new ImageTelemetry()
+                };
+            }
+
+            //
+            function doPackage(results) {
+                var packaged = {};
+                results.forEach(function (result) {
+                    packaged[result.key] = result.telemetry;
+                });
+                // Format as expected (sources -> keys -> telemetry)
+                return { imagery: packaged };
+            }
+
+            function requestTelemetry(requests) {
+                return $timeout(function () {
+                    return doPackage(requests.filter(matchesSource).map(generateData));
+                }, 0);
+            }
+
+            function handleSubscriptions() {
+                subscriptions.forEach(function (subscription) {
+                    var requests = subscription.requests;
+                    subscription.callback(doPackage(
+                        requests.filter(matchesSource).map(generateData)
+                    ));
+                });
+            }
+
+            function startGenerating() {
+                $timeout(function () {
+                    handleSubscriptions();
+                    if (subscriptions.length > 0) {
+                        startGenerating();
+                    }
+                }, 1000);
+            }
+
+            function subscribe(callback, requests) {
+                var subscription = {
+                    callback: callback,
+                    requests: requests
+                };
+
+                function unsubscribe() {
+                    subscriptions = subscriptions.filter(function (s) {
+                        return s !== subscription;
+                    });
+                }
+
+                subscriptions.push(subscription);
+
+                if (subscriptions.length === 1) {
+                    startGenerating();
+                }
+
+                return unsubscribe;
+            }
+
+            return {
+                requestTelemetry: requestTelemetry,
+                subscribe: subscribe
+            };
+        }
+
+        return ImageTelemetryProvider;
+    }
+);

example/notifications/bundle.js

@@ -26,16 +26,12 @@ define([
     "./src/NotificationLaunchController",
     "./src/DialogLaunchIndicator",
     "./src/NotificationLaunchIndicator",
-    "./res/dialog-launch.html",
-    "./res/notification-launch.html",
     'legacyRegistry'
 ], function (
     DialogLaunchController,
     NotificationLaunchController,
     DialogLaunchIndicator,
     NotificationLaunchIndicator,
-    DialogLaunch,
-    NotificationLaunch,
     legacyRegistry
 ) {
     "use strict";
@@ -45,11 +41,11 @@ define([
             "templates": [
                 {
                     "key": "dialogLaunchTemplate",
-                    "template": DialogLaunch
+                    "templateUrl": "dialog-launch.html"
                 },
                 {
                     "key": "notificationLaunchTemplate",
-                    "template": NotificationLaunch
+                    "templateUrl": "notification-launch.html"
                 }
             ],
             "controllers": [

example/notifications/res/dialog-launch.html

@@ -1,9 +1,9 @@
-<span class="h-indicator" ng-controller="DialogLaunchController">
+<span class="status block" ng-controller="DialogLaunchController">
     <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-    <div class="ls-indicator icon-box-with-arrow s-status-available"><span class="label">
-        <a ng-click="launchProgress(true)">Known</a>
-        <a ng-click="launchProgress(false)">Unknown</a>
-        <a ng-click="launchError()">Error</a>
+    <span class="status-indicator icon-box-with-arrow"></span><span class="label">
+        <a ng-click="launchProgress(true)">Known</a> |
+        <a ng-click="launchProgress(false)">Unknown</a> |
+        <a ng-click="launchError()">Error</a> |
         <a ng-click="launchInfo()">Info</a>
-    </span></div>
+    </span><span class="count"></span>
 </span>

example/notifications/res/notification-launch.html

@@ -1,9 +1,9 @@
-<span class="h-indicator" ng-controller="NotificationLaunchController">
+<span class="status block" ng-controller="NotificationLaunchController">
     <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-    <div class="ls-indicator icon-bell s-status-available"><span class="label">
-        <a ng-click="newInfo()">Success</a>
-        <a ng-click="newError()">Error</a>
-        <a ng-click="newAlert()">Alert</a>
+    <span class="status-indicator icon-bell"></span><span class="label">
+        <a ng-click="newInfo()">Success</a> |
+        <a ng-click="newError()">Error</a> |
+        <a ng-click="newAlert()">Alert</a> |
         <a ng-click="newProgress()">Progress</a>
-    </span></div>
+    </span><span class="count"></span>
 </span>

example/notifications/src/NotificationLaunchController.js

@@ -51,26 +51,76 @@ define(
                 return actionTexts[Math.floor(Math.random()*3)];
             }
 
+            function getExampleActions() {
+                var actions = [
+                    {
+                        label: "Try Again",
+                        callback: function () {
+                            $log.debug("Try Again pressed");
+                        }
+                    },
+                    {
+                        label: "Remove",
+                        callback: function () {
+                            $log.debug("Remove pressed");
+                        }
+                    },
+                    {
+                        label: "Cancel",
+                        callback: function () {
+                            $log.debug("Cancel pressed");
+                        }
+                    }
+                ];
+
+                // Randomly remove some actions off the top; leave at least one
+                actions.splice(0,Math.floor(Math.random() * actions.length));
+
+                return actions;
+            }
+
+            function getExampleSeverity() {
+                var severities = [
+                    "info",
+                    "alert",
+                    "error"
+                ];
+                return severities[Math.floor(Math.random() * severities.length)];
+            }
+
             /**
              * Launch a new notification with a severity level of 'Error'.
              */
-            $scope.newError = function () {
+            $scope.newError = function(){
+
                 notificationService.notify({
                     title: "Example error notification " + messageCounter++,
                     hint: "An error has occurred",
-                    severity: "error"
-                });
+                    severity: "error",
+                    primaryOption: {
+                        label: 'Retry',
+                        callback: function() {
+                            $log.info('Retry clicked');
+                        }
+                    },
+                    options: getExampleActions()});
             };
             /**
              * Launch a new notification with a severity of 'Alert'.
              */
-            $scope.newAlert = function () {
+            $scope.newAlert = function(){
+
                 notificationService.notify({
                     title: "Alert notification " + (messageCounter++),
                     hint: "This is an alert message",
                     severity: "alert",
-                    autoDismiss: true
-                });
+                    primaryOption: {
+                        label: 'Retry',
+                        callback: function() {
+                            $log.info('Retry clicked');
+                        }
+                    },
+                    options: getExampleActions()});
             };
 
 
@@ -78,42 +128,39 @@ define(
              * Launch a new notification with a progress bar that is updated
              * periodically, tracking an ongoing process.
              */
-            $scope.newProgress = function () {
-                let progress = 0;
+            $scope.newProgress = function(){
+
                 var notificationModel = {
                     title: "Progress notification example",
                     severity: "info",
-                    progress: progress,
-                    actionText: getExampleActionText()
+                    progress: 0,
+                    actionText: getExampleActionText(),
+                    unknownProgress: false
                 };
-                let notification;
 
                 /**
                  * Simulate an ongoing process and update the progress bar.
                  * @param notification
                  */
-                function incrementProgress() {
-                    progress = Math.min(100, Math.floor(progress + Math.random() * 30))
-                    let progressText = ["Estimated time" +
+                function incrementProgress(notificationModel) {
+                    notificationModel.progress = Math.min(100, Math.floor(notificationModel.progress + Math.random() * 30));
+                    notificationModel.progressText = ["Estimated time" +
                     " remaining:" +
-                    " about ", 60 - Math.floor((progress / 100) * 60), " seconds"].join(" ");
-                    notification.progress(progress, progressText);
-
-                    if (progress < 100) {
-                        $timeout(function () {
-                            incrementProgress(notificationModel);
-                        }, 1000);
+                    " about ", 60 - Math.floor((notificationModel.progress / 100) * 60), " seconds"].join(" ");
+                    if (notificationModel.progress < 100) {
+                        $timeout(function(){incrementProgress(notificationModel);}, 1000);
                     }
                 }
 
-                notification = notificationService.notify(notificationModel);
-                incrementProgress();
+                notificationService.notify(notificationModel);
+                incrementProgress(notificationModel);
             };
 
             /**
              * Launch a new notification with severity level of INFO.
              */
-            $scope.newInfo = function () {
+            $scope.newInfo = function(){
+
                 notificationService.info({
                     title: "Example Info notification " + messageCounter++
                 });

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*)?$"
+                        }
+                    ]
+                }
+            ]
+        }
+    });
+});

example/simpleVuePlugin/HelloWorld.vue

@@ -1,19 +0,0 @@
-<template>
-  <div class="example">{{ msg }}</div>
-</template>
-
-<script>
-export default {
-  data () {
-    return {
-      msg: 'Hello world!'
-    }
-  }
-}
-</script>
-
-<style>
-.example {
-  color: red;
-}
-</style>

example/simpleVuePlugin/plugin.js

@@ -1,37 +0,0 @@
-import Vue from 'Vue';
-import HelloWorld from './HelloWorld.vue';
-
-function SimpleVuePlugin () {
-    return function install(openmct) {
-        var views = (openmct.mainViews || openmct.objectViews);
-
-        openmct.types.addType('hello-world', {
-            name: 'Hello World',
-            description: 'An introduction object',
-            creatable: true
-        });
-        openmct.objectViews.addProvider({
-            name: "demo-provider",
-            key: "hello-world",
-            cssClass: "icon-packet",
-            canView: function (d) {
-                return d.type === 'hello-world';
-            },
-            view: function (domainObject) {
-                var vm;
-                return {
-                    show: function (container) {
-                        vm = new Vue(HelloWorld);
-                        container.appendChild(vm.$mount().$el);
-                    },
-                    destroy: function (container) {
-                        vm.$destroy();
-                    }
-                };
-            }
-        });
-
-    }
-}
-
-export default SimpleVuePlugin

example/styleguide/bundle.js

@@ -1,26 +1,10 @@
 define([
     "./src/ExampleStyleGuideModelProvider",
     "./src/MCTExample",
-    "./res/templates/intro.html",
-    "./res/templates/standards.html",
-    "./res/templates/colors.html",
-    "./res/templates/status.html",
-    "./res/templates/glyphs.html",
-    "./res/templates/controls.html",
-    "./res/templates/input.html",
-    "./res/templates/menus.html",
     'legacyRegistry'
 ], function (
     ExampleStyleGuideModelProvider,
     MCTExample,
-    introTemplate,
-    standardsTemplate,
-    colorsTemplate,
-    statusTemplate,
-    glyphsTemplate,
-    controlsTemplate,
-    inputTemplate,
-    menusTemplate,
     legacyRegistry
 ) {
     legacyRegistry.register("example/styleguide", {
@@ -32,21 +16,19 @@ define([
                 { "key": "styleguide.intro", "name": "Introduction", "cssClass": "icon-page", "description": "Introduction and overview to the style guide" },
                 { "key": "styleguide.standards", "name": "Standards", "cssClass": "icon-page", "description": "" },
                 { "key": "styleguide.colors", "name": "Colors", "cssClass": "icon-page", "description": "" },
-                { "key": "styleguide.status", "name": "status", "cssClass": "icon-page", "description": "Limits, telemetry paused, etc." },
                 { "key": "styleguide.glyphs", "name": "Glyphs", "cssClass": "icon-page", "description": "Glyphs overview" },
                 { "key": "styleguide.controls", "name": "Controls", "cssClass": "icon-page", "description": "Buttons, selects, HTML controls" },
                 { "key": "styleguide.input", "name": "Text Inputs", "cssClass": "icon-page", "description": "Various text inputs" },
                 { "key": "styleguide.menus", "name": "Menus", "cssClass": "icon-page", "description": "Context menus, dropdowns" }
             ],
             "views": [
-                { "key": "styleguide.intro", "type": "styleguide.intro", "template": introTemplate, "editable": false },
-                { "key": "styleguide.standards", "type": "styleguide.standards", "template": standardsTemplate, "editable": false },
-                { "key": "styleguide.colors", "type": "styleguide.colors", "template": colorsTemplate, "editable": false },
-                { "key": "styleguide.status", "type": "styleguide.status", "template": statusTemplate, "editable": false },
-                { "key": "styleguide.glyphs", "type": "styleguide.glyphs", "template": glyphsTemplate, "editable": false },
-                { "key": "styleguide.controls", "type": "styleguide.controls", "template": controlsTemplate, "editable": false },
-                { "key": "styleguide.input", "type": "styleguide.input", "template": inputTemplate, "editable": false },
-                { "key": "styleguide.menus", "type": "styleguide.menus", "template": menusTemplate, "editable": false }
+                { "key": "styleguide.intro", "type": "styleguide.intro", "templateUrl": "templates/intro.html", "editable": false },
+                { "key": "styleguide.standards", "type": "styleguide.standards", "templateUrl": "templates/standards.html", "editable": false },
+                { "key": "styleguide.colors", "type": "styleguide.colors", "templateUrl": "templates/colors.html", "editable": false },
+                { "key": "styleguide.glyphs", "type": "styleguide.glyphs", "templateUrl": "templates/glyphs.html", "editable": false },
+                { "key": "styleguide.controls", "type": "styleguide.controls", "templateUrl": "templates/controls.html", "editable": false },
+                { "key": "styleguide.input", "type": "styleguide.input", "templateUrl": "templates/input.html", "editable": false },
+                { "key": "styleguide.menus", "type": "styleguide.menus", "templateUrl": "templates/menus.html", "editable": false }
             ],
             "roots": [
                 {
@@ -65,7 +47,6 @@ define([
                             "intro",
                             "standards",
                             "colors",
-                            "status",
                             "glyphs",
                             "styleguide:ui-elements"
                         ]
@@ -101,6 +82,16 @@ define([
                         "$q"
                     ]
                 }
+            ],
+            "stylesheets": [
+                {
+                    "stylesheetUrl": "css/style-guide-espresso.css",
+                    "theme": "espresso"
+                },
+                {
+                    "stylesheetUrl": "css/style-guide-snow.css",
+                    "theme": "snow"
+                }
             ]
         }
     });

example/styleguide/res/sass/_style-guide-base.scss

@@ -0,0 +1,199 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2016, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+.l-style-guide {
+    font-size: 0.9em;
+    text-align: justify;
+    margin: auto 10%;
+
+    a.link {
+        color: $colorKey;
+    }
+
+    h1, h2 {
+        color: pullForward($colorBodyFg, 20%);
+    }
+
+    h2 {
+        font-size: 1.25em;
+    }
+
+    h3 {
+        font-size: 0.9em;
+        margin: $interiorMargin 0;
+        &:not(:first-child) {
+            margin-top: $interiorMarginLg * 2;
+        }
+        text-transform: uppercase;
+    }
+
+    .w-markup {
+        //Wrap markup example "pre" element
+        background-color: $colorCode;
+        border-radius: $interiorMargin;
+        display: block;
+        padding: $interiorMarginLg $interiorMarginLg;
+        position: relative;
+    }
+
+    code,
+    pre {
+        font-size: 0.8rem;
+    }
+
+    code {
+        background-color: $colorCode;
+        border-radius: $controlCr;
+        display: inline-block;
+        padding: 1px $interiorMargin;
+    }
+
+    pre {
+        display: block;
+        margin: 0;
+        max-height: 300px;
+        overflow: auto;
+        padding-bottom: $interiorMarginLg;
+        white-space: pre;
+    }
+
+    table, ul {
+        margin-bottom: $interiorMarginLg;
+        width: auto;
+    }
+
+    .themed {
+        display: none; // Each themed styleguide file will set this to block.
+    }
+
+    .doc-title {
+        color: rgba(#fff, 0.3);
+        text-transform: uppercase;
+    }
+
+    .l-section {
+        border-top: 1px solid rgba(#999, 0.3);
+        margin-top: 2em;
+        padding-top: 1em;
+
+        .cols {
+            @include display(flex);
+            @include flex-direction(row);
+
+            .col {
+                @include flex(1 1 auto);
+                &:not(:last-child) {
+                    $v: $interiorMargin * 4;
+                    border-right: 1px solid $colorInteriorBorder;
+                    margin-right: $v;
+                    padding-right: $v;
+                }
+                min-width: 300px;
+                img {
+                    width: 100%;
+                }
+            }
+
+            &.cols1-1 {
+                // 2 cols, equal width
+                .col {
+                    width: 50%;
+                }
+            }
+
+            &.cols1-2 {
+                // 3 cols, first is 1/3 of the width
+                .col:first-child {
+                    width: 33%;
+                }
+                .col:last-child {
+                    width: 66%;
+                }
+            }
+
+            &.cols2-1 {
+                // 3 cols, first is 2/3 of the width
+                .col:first-child {
+                    width: 66%;
+                }
+                .col:last-child {
+                    width: 33%;
+                }
+            }
+        }
+    }
+
+    // Example grid of glyphs
+    .items-holder.grid {
+        .item.glyph-item,
+        .item.swatch-item {
+            margin-bottom: 50px;
+            margin-right: 10px;
+            position: relative;
+            text-align: left;
+            .glyph {
+                color: $colorGlyphExample;
+                font-size: 5em;
+                margin: $interiorMarginLg 0;
+                text-align: center;
+            }
+
+            table.details td {
+                font-size: inherit;
+                &.label {
+                    color: pushBack($colorBodyFg, 10%);
+                    text-transform: uppercase;
+                    white-space: nowrap;
+                }
+            }
+        }
+
+        .item.glyph-item {
+            width: 225px;
+            height: 200px;
+        }
+
+        .item.swatch-item {
+            $h: 150px;
+            $d: 75px;
+            width: 200px;
+            height: $h;
+            .glyph {
+                text-shadow: 0px 1px 10px rgba(black, 0.3);
+            }
+
+            .h-swatch {
+                position: relative;
+                height: $d + $interiorMarginLg;
+            }
+
+            .swatch {
+                height: $d; width: $d;
+                border: 1px solid $colorInteriorBorder;
+                border-radius: 15%;
+                position: absolute;
+                left: 50%;
+                @include transform(translateX(-50%));
+            }
+        }
+    }
+}
+

example/styleguide/res/sass/style-guide-espresso.scss

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2015, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,19 +19,19 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+@import "bourbon";
+@import "../../../../platform/commonUI/general/res/sass/constants";
+@import "../../../../platform/commonUI/general/res/sass/mixins";
+@import "../../../../platform/commonUI/themes/espresso/res/sass/constants";
+@import "../../../../platform/commonUI/themes/espresso/res/sass/mixins";
+@import "../../../../platform/commonUI/general/res/sass/glyphs";
+@import "../../../../platform/commonUI/general/res/sass/icons";
 
-import CSV from 'comma-separated-values';
-import {saveAs} from 'file-saver/FileSaver';
+// Thematic constants
+$colorCode: rgba(black, 0.2);
+$colorGlyphExample: #fff;
 
-class CSVExporter {
-    export(rows, options) {
-        let headers = (options && options.headers) ||
-            (Object.keys((rows[0] || {})).sort());
-        let filename = (options && options.filename) || "export.csv";
-        let csvText = new CSV(rows, { header: headers }).encode();
-        let blob = new Blob([csvText], { type: "text/csv" });
-        saveAs(blob, filename);
-    }
-};
+@import "style-guide-base";
 
-export default CSVExporter;
+div.themed.espresso { display: block; }
+span.themed.espresso { display: inline; }

example/styleguide/res/sass/style-guide-snow.scss

@@ -0,0 +1,37 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2015, 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.
+ *****************************************************************************/
+@import "bourbon";
+@import "../../../../platform/commonUI/general/res/sass/constants";
+@import "../../../../platform/commonUI/general/res/sass/mixins";
+@import "../../../../platform/commonUI/themes/snow/res/sass/constants";
+@import "../../../../platform/commonUI/themes/snow/res/sass/mixins";
+@import "../../../../platform/commonUI/general/res/sass/glyphs";
+@import "../../../../platform/commonUI/general/res/sass/icons";
+
+// Thematic constants
+$colorCode: rgba(black, 0.1);
+$colorGlyphExample: darken($colorBodyBg, 30%);
+
+@import "style-guide-base";
+
+div.themed.snow { display: block; }
+span.themed.snow { display: inline; }

example/styleguide/res/templates/controls.html

@@ -149,21 +149,12 @@
         <h2>Local Controls</h2>
         <div class="cols cols1-1">
             <div class="col">
-                <p>Local controls are typically buttons and selects that provide actions in close proximity to a component.</p>
-                <p>These controls can optionally be hidden to reduce clutter until the user hovers their cursor over an enclosing element. To use this approach, apply the class <code>.has-local-controls</code> to the element that should be aware of the hover and ensure that element encloses <code>.h-local-controls</code>.</p>
+                <p>Local controls are typically buttons and selects that provide local control to an individual element. Typically, these controls are hidden in order to not block data display until the user hovers their cursor over an element, when the controls are displayed using a transition fade. Mousing out of the element fades the controls from view.</p>
             </div>
-            <mct-example><div class="plot-display-area" style="padding: 10px; position: relative;">
-                Some content in here
-    <div class="h-local-controls h-local-controls-overlay-content l-btn-set">
+            <mct-example><div class="plot-display-area" style="height: 100px; padding: 10px; position: relative;">Hover over me
+    <div class="l-local-controls gl-plot-local-controls t-plot-display-controls">
         <a class="s-button icon-arrow-left" title="Restore previous pan/zoom"></a>
-        <a class="s-button icon-reset" title="Reset pan/zoom"></a>
-    </div>
-</div>
-<div class="plot-display-area has-local-controls" style="padding: 10px; position: relative;">
-    Hover here
-    <div class="h-local-controls h-local-controls-overlay-content local-controls-hidden l-btn-set">
-        <a class="s-button icon-arrow-left" title="Restore previous pan/zoom"></a>
-        <a class="s-button icon-reset" title="Reset pan/zoom"></a>
+        <a class="s-button icon-arrows-out" title="Reset pan/zoom"></a>
     </div>
 </div></mct-example>
         </div>

example/styleguide/res/templates/glyphs.html

@@ -48,9 +48,7 @@
 { 'meaning': 'General usage plus symbol; used in timer object', 'cssClass': 'icon-plus', 'cssContent': 'e926', 'htmlEntity': '&#xe926' },
 { 'meaning': 'Delete', 'cssClass': 'icon-trash', 'cssContent': 'e927', 'htmlEntity': '&#xe927' },
 { 'meaning': 'Close, remove', 'cssClass': 'icon-x', 'cssContent': 'e928', 'htmlEntity': '&#xe928' },
-{ 'meaning': 'Enclosing, inclusive; used in Time Conductor', 'cssClass': 'icon-brackets', 'cssContent': 'e929', 'htmlEntity': '&#xe929' },
-{ 'meaning': 'Something is targeted', 'cssClass': 'icon-crosshair', 'cssContent': 'e930', 'htmlEntity': '&#xe930' },
-{ 'meaning': 'Draggable', 'cssClass': 'icon-grippy', 'cssContent': 'e931', 'htmlEntity': '&#xe931' }
+{ 'meaning': 'Enclosing, inclusive; used in Time Conductor', 'cssClass': 'icon-brackets', 'cssContent': 'e929', 'htmlEntity': '&#xe929' }
 ]; controls= [{ 'meaning': 'Reset zoom/pam', 'cssClass': 'icon-arrows-out', 'cssContent': 'e1000', 'htmlEntity': '&#xe1000' },
 { 'meaning': 'Expand vertically', 'cssClass': 'icon-arrows-right-left', 'cssContent': 'e1001', 'htmlEntity': '&#xe1001' },
 { 'meaning': 'View scrolling', 'cssClass': 'icon-arrows-up-down', 'cssContent': 'e1002', 'htmlEntity': '&#xe1002' },
@@ -86,17 +84,10 @@
 { 'meaning': 'Image thumbs strip; view items grid', 'cssClass': 'icon-thumbs-strip', 'cssContent': 'e1033', 'htmlEntity': '&#xe1033' },
 { 'meaning': 'Two part item, both parts', 'cssClass': 'icon-two-parts-both', 'cssContent': 'e1034', 'htmlEntity': '&#xe1034' },
 { 'meaning': 'Two part item, one only', 'cssClass': 'icon-two-parts-one-only', 'cssContent': 'e1035', 'htmlEntity': '&#xe1035' },
-{ 'meaning': 'Resync', 'cssClass': 'icon-resync', 'cssContent': 'e1036', 'htmlEntity': '&#xe1036' },
-{ 'meaning': 'Reset', 'cssClass': 'icon-reset', 'cssContent': 'e1037', 'htmlEntity': '&#xe1037' },
 { 'meaning': 'Clear', 'cssClass': 'icon-x-in-circle', 'cssContent': 'e1038', 'htmlEntity': '&#xe1038' },
 { 'meaning': 'Brightness', 'cssClass': 'icon-brightness', 'cssContent': 'e1039', 'htmlEntity': '&#xe1039' },
 { 'meaning': 'Contrast', 'cssClass': 'icon-contrast', 'cssContent': 'e1040', 'htmlEntity': '&#xe1040' },
-{ 'meaning': 'Expand', 'cssClass': 'icon-expand', 'cssContent': 'e1041', 'htmlEntity': '&#xe1041' },
-{ 'meaning': 'View items in a tabular list', 'cssClass': 'icon-list-view', 'cssContent': 'e1042', 'htmlEntity': '&#xe1042' },
-{ 'meaning': 'Snap an object corner to a grid', 'cssClass': 'icon-grid-snap-to', 'cssContent': 'e1043', 'htmlEntity': '&#xe1043' },
-{ 'meaning': 'Do not snap an object corner to a grid', 'cssClass': 'icon-grid-snap-no', 'cssContent': 'e1044', 'htmlEntity': '&#xe1044' },
-{ 'meaning': 'Show an object frame in a Display Layout', 'cssClass': 'icon-frame-show', 'cssContent': 'e1045', 'htmlEntity': '&#xe1045' },
-{ 'meaning': 'Do not show an object frame in a Display Layout', 'cssClass': 'icon-frame-hide', 'cssContent': 'e1046', 'htmlEntity': '&#xe1046' }
+{ 'meaning': 'Expand', 'cssClass': 'icon-expand', 'cssContent': 'e1041', 'htmlEntity': '&#xe1041' }
 ]; objects= [{ 'meaning': 'Activity', 'cssClass': 'icon-activity', 'cssContent': 'e1100', 'htmlEntity': '&#xe1100' },
 { 'meaning': 'Activity Mode', 'cssClass': 'icon-activity-mode', 'cssContent': 'e1101', 'htmlEntity': '&#xe1101' },
 { 'meaning': 'Auto-flow Tabular view', 'cssClass': 'icon-autoflow-tabular', 'cssContent': 'e1102', 'htmlEntity': '&#xe1102' },
@@ -126,9 +117,7 @@
 { 'meaning': 'Timeline object', 'cssClass': 'icon-timeline', 'cssContent': 'e1126', 'htmlEntity': '&#xe1126' },
 { 'meaning': 'Timer object', 'cssClass': 'icon-timer', 'cssContent': 'e1127', 'htmlEntity': '&#xe1127' },
 { 'meaning': 'Data Topic', 'cssClass': 'icon-topic', 'cssContent': 'e1128', 'htmlEntity': '&#xe1128' },
-{ 'meaning': 'Fixed Position object', 'cssClass': 'icon-box-with-dashed-lines', 'cssContent': 'e1129', 'htmlEntity': '&#xe1129' },
-{ 'meaning': 'Summary Widget', 'cssClass': 'icon-summary-widget', 'cssContent': 'e1130', 'htmlEntity': '&#xe1130' },
-{ 'meaning': 'Notebook object', 'cssClass': 'icon-notebook', 'cssContent': 'e1131', 'htmlEntity': '&#xe1131' }
+{ 'meaning': 'Fixed Position object', 'cssClass': 'icon-box-with-dashed-lines', 'cssContent': 'e1129', 'htmlEntity': '&#xe1129' }
 ];
 "></div>
 
@@ -152,8 +141,8 @@
         <h2>How to Use Glyphs</h2>
         <div class="cols cols1-1">
             <div class="col">
-                <p>The easiest way to use a glyph is to include its CSS class in an element. The CSS adds a psuedo <code>:before</code> HTML element to whatever element it's attached to that makes proper use of the symbols font.</p>
-                <p>Alternately, you can use the <code>.ui-symbol</code> class in an object that contains encoded HTML entities. This method is only recommended if you cannot use the aforementioned CSS class approach.</p>
+                <p>The easiest way to use a glyph is to include its CSS class in element. The CSS adds a psuedo <code>:before</code> HTML element to whatever element it's attached to that makes proper use of the symbols font.</p>
+                <p>Alternately, you can use the <code>.ui-symbol</code> class in an object that contains encoded HTML entities. This method is only recommended if you cannot use the aforementioned CSS class approach for some reason.</p>
             </div>
             <mct-example><a class="s-button icon-gear" title="Settings"></a>
 <br /><br />
@@ -171,8 +160,8 @@
             <div class="item glyph-item" ng-repeat="glyph in general">
                 <div class="glyph" ng-class="glyph.cssClass"></div>
                 <table class="details">
-                    <tr><td class="label">Class</td><td class="value">.{{glyph.cssClass}}</td></tr>
                     <tr><td class="label">Meaning</td><td class="value">{{glyph.meaning}}</td></tr>
+                    <tr><td class="label">Class</td><td class="value">.{{glyph.cssClass}}</td></tr>
                     <tr><td class="label">CSS Content</td><td class="value">\{{glyph.cssContent}}</td></tr>
                     <tr><td class="label">HTML Entity</td><td class="value">{{glyph.htmlEntity}}</td></tr>
                 </table>
@@ -187,8 +176,8 @@
             <div class="item glyph-item" ng-repeat="glyph in controls">
                 <div class="glyph" ng-class="glyph.cssClass"></div>
                 <table class="details">
-                    <tr><td class="label">Class</td><td class="value">.{{glyph.cssClass}}</td></tr>
                     <tr><td class="label">Meaning</td><td class="value">{{glyph.meaning}}</td></tr>
+                    <tr><td class="label">Class</td><td class="value">.{{glyph.cssClass}}</td></tr>
                     <tr><td class="label">CSS Content</td><td class="value">\{{glyph.cssContent}}</td></tr>
                     <tr><td class="label">HTML Entity</td><td class="value">{{glyph.htmlEntity}}</td></tr>
                 </table>
@@ -203,8 +192,8 @@
             <div class="item glyph-item" ng-repeat="glyph in objects">
                 <div class="glyph" ng-class="glyph.cssClass"></div>
                 <table class="details">
-                    <tr><td class="label">Class</td><td class="value">.{{glyph.cssClass}}</td></tr>
                     <tr><td class="label">Meaning</td><td class="value">{{glyph.meaning}}</td></tr>
+                    <tr><td class="label">Class</td><td class="value">.{{glyph.cssClass}}</td></tr>
                     <tr><td class="label">CSS Content</td><td class="value">\{{glyph.cssContent}}</td></tr>
                     <tr><td class="label">HTML Entity</td><td class="value">{{glyph.htmlEntity}}</td></tr>
                 </table>

example/styleguide/res/templates/intro.html

@@ -34,7 +34,7 @@
             <p>As you develop plugins for Open MCT, consider how a generalized component might be combined with others when designing to create a rich and powerful larger object, rather than adding a single monolithic, non-modular plugin. To solve a particular problem or allow a new feature in Open MCT, you may need to introduce more than just one new object type.</p>
             </div>
             <div class="col">
-                <img src="../images/diagram-objects.svg" />
+                <img src="/example/styleguide/res/images/diagram-objects.svg" />
             </div>
         </div>
     </div>
@@ -48,7 +48,7 @@
             <p>The types of objects that a container can hold should be based on the purpose of the container and the views that it affords. For example, a Folder’s purpose is to allow a user to conceptually organize objects of all other types; a Folder must therefore be able to contain an object of any type.</p>
             </div>
             <div class="col">
-                <img src="../images/diagram-containment.svg" />
+                <img src="/example/styleguide/res/images/diagram-containment.svg" />
             </div>
         </div>
     </div>
@@ -60,7 +60,7 @@
                 <p>Views are simply different ways to view the content of a given object. For example, telemetry data could be viewed as a plot or a table. A clock can display its time in analog fashion or with digital numbers. In each view, all of the content is present; it’s just represented differently. When providing views for an object, all the content of the object should be present in each view.</p>
             </div>
             <div class="col">
-                <img src="../images/diagram-views.svg" />
+                <img src="/example/styleguide/res/images/diagram-views.svg" />
             </div>
         </div>
     </div>
@@ -70,4 +70,4 @@
     <p></p>
     <p></p>
     <p></p>
-</div>
+</div>

example/styleguide/res/templates/mct-example.html

@@ -4,5 +4,5 @@
         <pre></pre>
     </span>
     <h3>Example</h3>
-    <div class="w-mct-example"></div>
+    <div></div>
 </div>

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>

example/styleguide/res/templates/status.html

@@ -1,227 +0,0 @@
-<!--
- Open MCT, Copyright (c) 2014-2016, United States Government
- as represented by the Administrator of the National Aeronautics and Space
- Administration. All rights reserved.
-
- Open MCT is licensed under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
- Open MCT includes source code licensed under additional open source
- licenses. See the Open Source Licenses file (LICENSES.md) included with
- this source code distribution or the Licensing information page available
- at runtime from the About dialog for additional information.
--->
-<style>
-    .w-mct-example div[class*="s-status"],
-    .w-mct-example span[class*="s-status"],
-    .w-mct-example div[class*="s-limit"],
-    .w-mct-example span[class*="s-limit"] {
-        border-radius: 3px;
-        padding: 2px 5px;
-    }
-    .w-mct-example table {
-        width: 100%;
-    }
-</style>
-<div class="l-style-guide s-text">
-    <p class="doc-title">Open MCT Style Guide</p>
-    <h1>Status Indication</h1>
-
-    <div class="l-section">
-        <h2>Status Classes</h2>
-        <div class="cols cols1-1">
-            <div class="col">
-                <p>Status classes allow any block or inline-block element to be decorated in order to articulate a
-                    status. Provided classes include color-only and color plus icon; custom icons can easily be
-                    employed by using a color-only status class in combination with an <a class="link" href="#/browse/styleguide:home/glyphs?tc.mode=local&tc.timeSystem=utc&tc.startDelta=1800000&tc.endDelta=0&view=styleguide.glyphs">glyph</a>.</p>
-                <ul>
-                    <li>Color only</li>
-                    <ul>
-                        <li><code>s-status-warning-hi</code></li>
-                        <li><code>s-status-warning-lo</code></li>
-                        <li><code>s-status-diagnostic</code></li>
-                        <li><code>s-status-info</code></li>
-                        <li><code>s-status-ok</code></li>
-                    </ul>
-                    <li>Color and icon</li>
-                    <ul>
-                        <li><code>s-status-icon-warning-hi</code></li>
-                        <li><code>s-status-icon-warning-lo</code></li>
-                        <li><code>s-status-icon-diagnostic</code></li>
-                        <li><code>s-status-icon-info</code></li>
-                        <li><code>s-status-icon-ok</code></li>
-                    </ul>
-                </ul>
-            </div>
-<mct-example><!-- Color alone examples -->
-<div class="s-status-warning-hi">WARNING HI</div>
-<div class="s-status-warning-lo">WARNING LOW</div>
-<div class="s-status-diagnostic">DIAGNOSTIC</div>
-<div class="s-status-info">INFO</div>
-<div class="s-status-ok">OK</div>
-
-<!-- Color and icon examples -->
-<div class="s-status-icon-warning-hi">WARNING HI with icon</div>
-<div class="s-status-icon-warning-lo">WARNING LOW with icon</div>
-<div class="s-status-icon-diagnostic">DIAGNOSTIC with icon</div>
-<div class="s-status-icon-info">INFO with icon</div>
-<div class="s-status-icon-ok">OK with icon</div>
-<div class="s-status-warning-hi icon-alert-triangle">WARNING HI with custom icon</div>
-<div>Some text with an <span class="s-status-icon-diagnostic">inline element</span> showing a Diagnostic status.</div>
-</mct-example>
-        </div>
-    </div>
-
-    <div class="l-section">
-        <h2>Limit Classes</h2>
-        <div class="cols cols1-1">
-            <div class="col">
-                <p>Limit classes are a specialized form of status, specifically meant to be applied to telemetry
-                    displays to indicate that a limit threshold has been violated. Open MCT provides both severity
-                    and direction classes; severity (yellow and red) can be used alone or in combination
-                    with direction (upper or lower). Direction classes cannot be used on their own.</p>
-                <p>Like Status classes, Limits can be used as color-only, or color plus icon. Custom icons can
-                be applied in the same fashion as described above.</p>
-                <ul>
-                    <li>Severity color alone</li>
-                    <ul>
-                        <li><code>s-limit-yellow</code>: A yellow limit.</li>
-                        <li><code>s-limit-red</code>: A red limit.</li>
-                    </ul>
-                    <li>Severity color and icon</li>
-                    <ul>
-                        <li><code>s-limit-icon-yellow</code>: A yellow limit with icon.</li>
-                        <li><code>s-limit-icon-red</code>: A red limit with icon.</li>
-                    </ul>
-                    <li>Direction indicators. MUST be used with a &quot;color alone&quot; limit class. See
-                    examples for more.</li>
-                    <ul>
-                        <li><code>s-limit-upr</code>: Upper limit.</li>
-                        <li><code>s-limit-lwr</code>: Lower limit.</li>
-                    </ul>
-                </ul>
-            </div>
-<mct-example><!-- Color alone examples -->
-<div class="s-limit-yellow">Yellow limit</div>
-<div class="s-limit-red">Red limit</div>
-
-<!-- Color and icon examples -->
-<div class="s-limit-icon-yellow">Yellow limit with icon</div>
-<div class="s-limit-icon-red">Red limit with icon</div>
-<div class="s-limit-red icon-alert-rect">Red Limit with a custom icon</div>
-<div>Some text with an <span class="s-limit-icon-yellow">inline element</span> showing a yellow limit.</div>
-
-<!-- Severity and direction examples -->
-<div class="s-limit-yellow s-limit-lwr">Lower yellow limit</div>
-<div class="s-limit-red s-limit-upr">Upper red limit</div>
-
-<!-- Limits applied in a table -->
-<table>
-    <tr class='header'><td>Name</td><td>Value 1</td><td>Value 2</td></tr>
-    <tr><td>ENG_PWR 4991</td><td>7.023</td><td class="s-limit-yellow s-limit-upr">70.23</td></tr>
-    <tr><td>ENG_PWR 4992</td><td>49.784</td><td class="s-limit-red s-limit-lwr">-121.22</td></tr>
-    <tr><td>ENG_PWR 4993</td><td class="s-limit-yellow icon-alert-triangle">0.451</td><td>1.007</td></tr>
-</table>
-</mct-example>
-        </div>
-    </div>
-
-    <div class="l-section">
-        <h2>Status Bar Indicators</h2>
-        <div class="cols cols1-1">
-            <div class="col">
-                <p>Indicators are small iconic notification elements that appear in the Status Bar area of
-                    the application at the window's bottom. Indicators should be used to articulate the state of a
-                    system and optionally provide gestures related to that system. They use a combination of icon and
-                    color to identify themselves and articulate a state respectively.</p>
-                <h3>Recommendations</h3>
-                <ul>
-                    <li><strong>Keep the icon consistent</strong>. The icon is the principal identifier of the system and is a valuable
-                        recall aid for the user. Don't change the icon as a system's state changes, use color and
-                        text for that purpose.</li>
-                    <li><strong>Don't use the same icon more than once</strong>. Select meaningful and distinct icons so the user
-                        will be able to quickly identify what they're looking for.</li>
-                </ul>
-
-                <h3>States</h3>
-                <ul>
-                    <li><strong>Disabled</strong>: The system is not available to the user.</li>
-                    <li><strong>Off / Available</strong>: The system is accessible to the user but is not currently
-                        &quot;On&quot; or has not been configured. If the Indicator directly provides gestures
-                        related to the system, such as opening a configuration dialog box, then use
-                        &quot;Available&quot;; if the user must act elsewhere or the system isn't user-controllable,
-                        use &quot;Off&quot;.</li>
-                    <li><strong>On</strong>: The system is enabled or configured; it is having an effect on the larger application.</li>
-                    <li><strong>Alert / Error</strong>: There has been a problem with the system. Generally, &quot;Alert&quot;
-                        should be used to call attention to an issue that isn't critical, while  &quot;Error&quot;
-                        should be used to call attention to a problem that the user should really be aware of or do
-                        something about.</li>
-                </ul>
-
-                <h3>Structure</h3>
-                <p>Indicators consist of a <code>.ls-indicator</code>
-                    wrapper element with <code>.icon-*</code> classes for the type of thing they represent and
-                    <code>.s-status-*</code> classes to articulate the current state. Title attributes should be used
-                    to provide more verbose information about the thing and/or its status.</p>
-                <p>The wrapper encloses a <code>.label</code> element that is displayed on hover. This element should
-                    include a brief statement of the current status, and can also include clickable elements
-                    as <code>&lt;a&gt;</code> tags. An optional <code>.count</code> element can be included to display
-                    information such as a number of messages.</p>
-                <p>Icon classes are as defined on the
-                    <a class="link" href="#/browse/styleguide:home/glyphs?tc.mode=local&tc.timeSystem=utc&tc.startDelta=1800000&tc.endDelta=0&view=styleguide.glyphs">
-                        Glyphs page</a>. Status classes applicable to Indicators are as follows:</p>
-                <ul>
-                    <li><code>s-status-disabled</code></li>
-                    <li><code>s-status-off</code></li>
-                    <li><code>s-status-available</code></li>
-                    <li><code>s-status-on</code></li>
-                    <li><code>s-status-alert</code></li>
-                    <li><code>s-status-error</code></li>
-                </ul>
-            </div>
-<mct-example><div class="s-ue-bottom-bar status-holder s-status-bar">
-    <span class="ls-indicator icon-database s-status-disabled" title="The system is currently disabled.">
-        <span class="label">System not enabled.</span>
-    </span>
-</div>
-
-<div class="s-ue-bottom-bar status-holder s-status-bar">
-    <span class="ls-indicator icon-database s-status-available" title="Configure data connection.">
-        <span class="label">Data connection available
-            <a class="icon-gear">Configure</a>
-        </span>
-    </span>
-</div>
-
-<div class="s-ue-bottom-bar status-holder s-status-bar">
-    <span class="ls-indicator icon-database s-status-on" title="Data connected.">
-        <span class="label">Connected to Skynet
-            <a class="icon-gear">Change</a>
-            <a>Disconnect</a>
-        </span>
-    </span>
-</div>
-
-<div class="s-ue-bottom-bar status-holder s-status-bar">
-    <span class="ls-indicator icon-database s-status-alert" title="System is self-aware.">
-        <span class="label">Skynet at Turing Level 5</span>
-    </span>
-    <span class="ls-indicator icon-bell s-status-error" title="You have alerts.">
-        <span class="label">
-            <a class="icon-alert-triangle">View Alerts</a>
-        </span>
-        <span class="count">495</span>
-    </span>
-</div>
-</mct-example>
-        </div>
-    </div>
-</div>

example/styleguide/src/ExampleStyleGuideModelProvider.js

@@ -34,7 +34,6 @@ define(
             pages['standards'] = { name: "Standards", type: "styleguide.standards", location: "styleguide:home" };
             pages['colors'] = { name: "Colors", type: "styleguide.colors", location: "styleguide:home" };
             pages['glyphs'] = { name: "Glyphs", type: "styleguide.glyphs", location: "styleguide:home" };
-            pages['status'] = { name: "Status Indication", type: "styleguide.status", location: "styleguide:home" };
             pages['controls'] = { name: "Controls", type: "styleguide.controls", location: "styleguide:ui-elements" };
             pages['input'] = { name: "Text Inputs", type: "styleguide.input", location: "styleguide:ui-elements" };
             pages['menus'] = { name: "Menus", type: "styleguide.menus", location: "styleguide:ui-elements" };

example/styleguide/src/MCTExample.js

@@ -1,5 +1,5 @@
 define([
-    '../res/templates/mct-example.html'
+    'text!../res/templates/mct-example.html'
 ], function (
     MCTExampleTemplate
 ) {

example/taxonomy/bundle.js

@@ -0,0 +1,68 @@
+/*****************************************************************************
+ * 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([
+    "./src/ExampleTaxonomyModelProvider",
+    'legacyRegistry'
+], function (
+    ExampleTaxonomyModelProvider,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/taxonomy", {
+        "name": "Example taxonomy",
+        "description": "Example illustrating the addition of a static top-level hierarchy",
+        "extensions": {
+            "roots": [
+                {
+                    "id": "exampleTaxonomy"
+                }
+            ],
+            "models": [
+                {
+                    "id": "exampleTaxonomy",
+                    "model": {
+                        "type": "folder",
+                        "name": "Stub Subsystems",
+                        "composition": [
+                            "examplePacket0",
+                            "examplePacket1",
+                            "examplePacket2"
+                        ]
+                    }
+                }
+            ],
+            "components": [
+                {
+                    "provides": "modelService",
+                    "type": "provider",
+                    "implementation": ExampleTaxonomyModelProvider,
+                    "depends": [
+                        "$q"
+                    ]
+                }
+            ]
+        }
+    });
+});

example/taxonomy/src/ExampleTaxonomyModelProvider.js

@@ -0,0 +1,69 @@
+/*****************************************************************************
+ * 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";
+
+        function ExampleTaxonomyModelProvider($q) {
+            var models = {},
+                packetId,
+                telemetryId,
+                i,
+                j;
+
+            // Add some "subsystems"
+            for (i = 0; i < 3; i += 1) {
+                packetId = "examplePacket" + i;
+
+                models[packetId] = {
+                    name: "Stub Subsystem " + (i + 1),
+                    type: "telemetry.panel",
+                    composition: []
+                };
+
+                // Add some "telemetry points"
+                for (j = 0; j < 100 * (i + 1); j += 1) {
+                    telemetryId = "exampleTelemetry" + j;
+                    models[telemetryId] = {
+                        name: "SWG" + i + "." + j,
+                        type: "generator",
+                        telemetry: {
+                            period: 10 + i + j
+                        }
+                    };
+                    models[packetId].composition.push(telemetryId);
+                }
+            }
+
+            return {
+                getModels: function () {
+                    return $q.when(models);
+                }
+            };
+        }
+
+        return ExampleTaxonomyModelProvider;
+    }
+);

example/worker/README.md

@@ -0,0 +1 @@
+Example of running a Web Worker using the `workerService`.

example/worker/bundle.js

@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * 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([
+    "./src/FibonacciIndicator",
+    'legacyRegistry'
+], function (
+    FibonacciIndicator,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/worker", {
+        "extensions": {
+            "indicators": [
+                {
+                    "implementation": FibonacciIndicator,
+                    "depends": [
+                        "workerService",
+                        "$rootScope"
+                    ]
+                }
+            ],
+            "workers": [
+                {
+                    "key": "example.fibonacci",
+                    "scriptUrl": "FibonacciWorker.js"
+                }
+            ]
+        }
+    });
+});

example/worker/src/FibonacciIndicator.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.
  *
@@ -19,48 +19,49 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define*/
 
 define(
-    ['zepto'],
-    function ($) {
+    [],
+    function () {
+        "use strict";
 
         /**
-         * The mct-file-input handles behavior of the file input form control.
+         * Displays Fibonacci numbers in the status area.
          * @constructor
-         * @memberof platform/forms
          */
-        function MCTFileInput(fileInputService) {
+        function FibonacciIndicator(workerService, $rootScope) {
+            var latest,
+                counter = 0,
+                worker = workerService.run('example.fibonacci');
 
-            function link(scope, element, attrs, control) {
-
-                function setText(fileName) {
-                    scope.structure.text = fileName.length > 20 ?
-                        fileName.substr(0, 20) + "..." :
-                        fileName;
-                }
-
-                function handleClick() {
-                    fileInputService.getInput().then(function (result) {
-                        setText(result.name);
-                        scope.ngModel[scope.field] = result;
-                        control.$setValidity("file-input", true);
-                    }, function () {
-                        setText('Select File');
-                        control.$setValidity("file-input", false);
-                    });
-                }
-
-                control.$setValidity("file-input", false);
-                element.on('click', handleClick);
+            function requestNext() {
+                worker.postMessage([counter]);
+                counter += 1;
             }
 
+            function handleResponse(event) {
+                latest = event.data;
+                $rootScope.$apply();
+                requestNext();
+            }
+
+            worker.onmessage = handleResponse;
+            requestNext();
+
             return {
-                restrict: "A",
-                require: "^form",
-                link: link
+                getCssClass: function () {
+                    return "icon-object-unknown";
+                },
+                getText: function () {
+                    return latest;
+                },
+                getDescription: function () {
+                    return "";
+                }
             };
         }
 
-        return MCTFileInput;
+        return FibonacciIndicator;
     }
 );

example/worker/src/FibonacciWorker.js

@@ -0,0 +1,15 @@
+/*global self*/
+(function () {
+    "use strict";
+
+    // Calculate fibonacci numbers inefficiently.
+    // We can do this because we're on a background thread, and
+    // won't halt the UI.
+    function fib(n) {
+        return n < 2 ? n : (fib(n - 1) + fib(n - 2));
+    }
+
+    self.onmessage = function (event) {
+        self.postMessage(fib(event.data));
+    };
+}());

gulpfile.js

@@ -0,0 +1,176 @@
+/*****************************************************************************
+ * 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 require,__dirname*/
+
+var gulp = require('gulp'),
+    sourcemaps = require('gulp-sourcemaps'),
+    path = require('path'),
+    fs = require('fs'),
+    git = require('git-rev-sync'),
+    moment = require('moment'),
+    project = require('./package.json'),
+    _ = require('lodash'),
+    paths = {
+        main: 'openmct.js',
+        dist: 'dist',
+        reports: 'dist/reports',
+        scss: ['./platform/**/*.scss', './example/**/*.scss'],
+        assets: [
+            './{example,platform}/**/*.{css,css.map,png,svg,ico,woff,eot,ttf}'
+        ],
+        scripts: [ 'openmct.js', 'platform/**/*.js', 'src/**/*.js' ],
+        specs: [ 'platform/**/*Spec.js', 'src/**/*Spec.js' ],
+    },
+    options = {
+        requirejsOptimize: {
+            name: 'bower_components/almond/almond.js',
+            include: paths.main.replace('.js', ''),
+            wrap: {
+                startFile: "src/start.frag",
+                endFile: "src/end.frag"
+            },
+            mainConfigFile: paths.main,
+            wrapShim: true
+        },
+        karma: {
+            configFile: path.resolve(__dirname, 'karma.conf.js'),
+            singleRun: true
+        },
+        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'
+            }
+        }
+    };
+
+if (process.env.NODE_ENV === 'development') {
+    options.requirejsOptimize.optimize = 'none';
+}
+
+
+gulp.task('scripts', function () {
+    var requirejsOptimize = require('gulp-requirejs-optimize');
+    var replace = require('gulp-replace-task');
+    return gulp.src(paths.main)
+        .pipe(sourcemaps.init())
+        .pipe(requirejsOptimize(options.requirejsOptimize))
+        .pipe(sourcemaps.write('.'))
+        .pipe(replace(options.replace))
+        .pipe(gulp.dest(paths.dist));
+});
+
+gulp.task('test', function (done) {
+    var karma = require('karma');
+    new karma.Server(options.karma, done).start();
+});
+
+gulp.task('stylesheets', function () {
+    var sass = require('gulp-sass');
+    var rename = require('gulp-rename');
+    var bourbon = require('node-bourbon');
+    options.sass.includePaths = bourbon.includePaths;
+
+    return gulp.src(paths.scss, {base: '.'})
+        .pipe(sourcemaps.init())
+        .pipe(sass(options.sass).on('error', sass.logError))
+        .pipe(rename(function (file) {
+            file.dirname =
+                file.dirname.replace(path.sep + 'sass', path.sep + 'css');
+            return file;
+        }))
+        .pipe(sourcemaps.write('.'))
+        .pipe(gulp.dest(__dirname));
+});
+
+gulp.task('lint', function () {
+    var jshint = require('gulp-jshint');
+    var merge = require('merge-stream');
+
+    var nonspecs = paths.specs.map(function (glob) {
+            return "!" + glob;
+        }),
+        scriptLint = gulp.src(paths.scripts.concat(nonspecs))
+            .pipe(jshint()),
+        specLint = gulp.src(paths.specs)
+            .pipe(jshint({ jasmine: true }));
+
+    return merge(scriptLint, specLint)
+        .pipe(jshint.reporter('gulp-jshint-html-reporter', {
+            filename: paths.reports + '/lint/jshint-report.html',
+            createMissingFolders : true
+        }))
+        .pipe(jshint.reporter('default'))
+        .pipe(jshint.reporter('fail'));
+});
+
+gulp.task('checkstyle', function () {
+    var jscs = require('gulp-jscs');
+    var mkdirp = require('mkdirp');
+    var reportName = 'jscs-html-report.html';
+    var reportPath = path.resolve(paths.reports, 'checkstyle', reportName);
+    var moveReport = fs.rename.bind(fs, reportName, reportPath, _.noop);
+
+    mkdirp.sync(path.resolve(paths.reports, 'checkstyle'));
+
+    return gulp.src(paths.scripts)
+        .pipe(jscs())
+        .pipe(jscs.reporter())
+        .pipe(jscs.reporter('jscs-html-reporter')).on('finish', moveReport)
+        .pipe(jscs.reporter('fail'));
+});
+
+gulp.task('fixstyle', function () {
+    var jscs = require('gulp-jscs');
+
+    return gulp.src(paths.scripts, { base: '.' })
+        .pipe(jscs({ fix: true }))
+        .pipe(gulp.dest('.'));
+});
+
+gulp.task('assets', ['stylesheets'], function () {
+    return gulp.src(paths.assets)
+        .pipe(gulp.dest(paths.dist));
+});
+
+gulp.task('watch', function () {
+    return gulp.watch(paths.scss, ['stylesheets', 'assets']);
+});
+
+gulp.task('serve', function () {
+    console.log('Running development server with all defaults');
+    var app = require('./app.js');
+});
+
+gulp.task('develop', ['serve', 'stylesheets', 'watch']);
+
+gulp.task('install', [ 'assets', 'scripts' ]);
+
+gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]);
+
+gulp.task('build', [ 'verify', 'install' ]);

index.html

@@ -21,71 +21,45 @@
 -->
 <!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="dist/openmct.js"></script>
-        <link rel="stylesheet" href="dist/styles/openmct.css">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16">
-        <link rel="shortcut icon" href="dist/favicons/favicon.ico">
-    </head>
-    <body>
-    </body>
-    <script>
-        const FIVE_MINUTES = 5 * 60 * 1000;
-        const THIRTY_MINUTES = 30 * 60 * 1000;
-
-        [
-            '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.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.DisplayLayout({
-            showAsView: ['summary-widget', 'example.imagery']
-        }));
-        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: - THIRTY_MINUTES,
-                        end: FIVE_MINUTES
-                    }
-                }
-            ]
-        }));
-        openmct.install(openmct.plugins.SummaryWidget());
-        openmct.install(openmct.plugins.Notebook());
-        openmct.install(openmct.plugins.FolderView());
-        openmct.install(openmct.plugins.Tabs());
-        openmct.install(openmct.plugins.FlexibleLayout());
-        openmct.install(openmct.plugins.LADTable());
-        openmct.install(openmct.plugins.Filters(['table', 'telemetry.plot.overlay']));
-        openmct.install(openmct.plugins.ObjectMigration());
-        openmct.start();
+<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/imagery',
+                'example/eventGenerator'
+            ].forEach(
+                openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
+            );
+            openmct.install(openmct.plugins.MyItems());
+            openmct.install(openmct.plugins.LocalStorage());
+            openmct.install(openmct.plugins.Snow());
+            openmct.install(openmct.plugins.Generator());
+            openmct.install(openmct.plugins.UTCTimeSystem());
+
+            openmct.time.clock('local', {start: -15 * 60 * 1000, end: 0});
+            openmct.time.clockOffsets({start: -15 * 60 * 1000, end: 0});
+            openmct.time.timeSystem('utc', openmct.time.bounds());
+            window.openmct = openmct;
+            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>

karma.conf.js

@@ -21,48 +21,74 @@
  *****************************************************************************/
 
 /*global module,process*/
-
-const devMode = process.env.NODE_ENV !== 'production';
-
-module.exports = (config) => {
-
-    const webpackConfig = require('./webpack.config.js');
-    delete webpackConfig.output;
-
-    if (!devMode) {
-        webpackConfig.module.rules.push({
-            test: /\.js$/,
-            exclude: /node_modules|example/,
-            use: 'istanbul-instrumenter-loader'
-        });
-    }
-
+module.exports = function(config) {
     config.set({
+
+        // Base path that will be used to resolve all file patterns.
         basePath: '',
-        frameworks: ['jasmine'],
+
+        // Frameworks to use
+        // Available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+        frameworks: ['jasmine', 'requirejs'],
+
+        // List of files / patterns to load in the browser.
+        // By default, files are also included in a script tag.
         files: [
-            'platform/**/*Spec.js',
-            'src/**/*Spec.js'
+            {pattern: 'bower_components/**/*.js', included: false},
+            {pattern: 'node_modules/d3-*/**/*.js', 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'
         ],
+
+        // List of files to exclude.
+        exclude: [
+            'platform/framework/src/Main.js'
+        ],
+
+        // Preprocess matching files before serving them to the browser.
+        // https://npmjs.org/browse/keyword/karma-preprocessor
+        preprocessors: {
+            'src/**/!(*Spec).js': [ 'coverage' ],
+            'platform/**/src/**/!(*Spec).js': [ 'coverage' ]
+        },
+
+        // Test results reporter to use
+        // Possible values: 'dots', 'progress'
+        // Available reporters: https://npmjs.org/browse/keyword/karma-reporter
+        reporters: ['progress', 'coverage', 'html', 'junit'],
+
+        // Web server port.
         port: 9876,
-        reporters: [
-            'progress',
-            'coverage',
-            'html'
-        ],
-        browsers: ['ChromeHeadless'],
+
+        // Wnable / disable colors in the output (reporters and logs).
         colors: true,
+
         logLevel: config.LOG_INFO,
+
+        // Rerun tests when any file changes.
         autoWatch: true,
 
+        // Specify browsers to run tests in.
+        // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+        browsers: [
+            'Chrome'
+        ],
+
+        // Code coverage reporting.
         coverageReporter: {
             dir: process.env.CIRCLE_ARTIFACTS ?
                 process.env.CIRCLE_ARTIFACTS + '/coverage' :
                 "dist/reports/coverage",
             check: {
                 global: {
-                    lines: 80,
-                    excludes: ['src/plugins/plot/**/*.js']
+                    lines: 80
                 }
             }
         },
@@ -74,19 +100,12 @@ module.exports = (config) => {
             foldAll: false
         },
 
-        preprocessors: {
-            // add webpack as preprocessor
-            'platform/**/*Spec.js': [ 'webpack' ],
-            'src/**/*Spec.js': [ 'webpack' ]
+        junitReporter: {
+            outputDir: process.env.CIRCLE_TEST_REPORTS || 'dist/reports/junit'
         },
 
-        webpack: webpackConfig,
-
-        webpackMiddleware: {
-            stats: 'errors-only',
-            logLevel: 'warn'
-        },
+        // Continuous Integration mode.
+        // If true, Karma captures browsers, runs the tests and exits.
         singleRun: true
     });
-}
-
+};

openmct.js

@@ -19,19 +19,86 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global module,BUILD_CONSTANTS*/
+/*global requirejs*/
 
-const matcher = /\/openmct.js$/;
-if (document.currentScript) {
-    let src = document.currentScript.src;
-    if (src && matcher.test(src)) {
-        // eslint-disable-next-line no-undef
-        __webpack_public_path__ = src.replace(matcher, '') + '/';
+requirejs.config({
+    "paths": {
+        "legacyRegistry": "src/legacyRegistry",
+        "angular": "bower_components/angular/angular.min",
+        "angular-route": "bower_components/angular-route/angular-route.min",
+        "csv": "bower_components/comma-separated-values/csv.min",
+        "EventEmitter": "bower_components/eventemitter3/index",
+        "es6-promise": "bower_components/es6-promise/es6-promise.min",
+        "html2canvas": "bower_components/html2canvas/build/html2canvas.min",
+        "moment": "bower_components/moment/moment",
+        "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format",
+        "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",
+        "zepto": "bower_components/zepto/zepto.min",
+        "lodash": "bower_components/lodash/lodash",
+        "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",
+        "d3-collection": "node_modules/d3-collection/build/d3-collection.min",
+        "d3-color": "node_modules/d3-color/build/d3-color.min",
+        "d3-format": "node_modules/d3-format/build/d3-format.min",
+        "d3-interpolate": "node_modules/d3-interpolate/build/d3-interpolate.min",
+        "d3-time": "node_modules/d3-time/build/d3-time.min",
+        "d3-time-format": "node_modules/d3-time-format/build/d3-time-format.min"
+    },
+    "shim": {
+        "angular": {
+            "exports": "angular"
+        },
+        "angular-route": {
+            "deps": ["angular"]
+        },
+        "EventEmitter": {
+            "exports": "EventEmitter"
+        },
+        "html2canvas": {
+            "exports": "html2canvas"
+        },
+        "moment-duration-format": {
+            "deps": ["moment"]
+        },
+        "screenfull": {
+            "exports": "screenfull"
+        },
+        "zepto": {
+            "exports": "Zepto"
+        },
+        "lodash": {
+            "exports": "lodash"
+        },
+        "d3-selection": {
+            "exports": "d3-selection"
+        },
+        "d3-scale": {
+            "deps": ["d3-array", "d3-collection", "d3-color", "d3-format", "d3-interpolate", "d3-time", "d3-time-format"],
+            "exports": "d3-scale"
+        },
+        "d3-axis": {
+            "exports": "d3-axis"
+        }
     }
-}
+});
 
-const MCT = require('./src/MCT');
+define([
+    './platform/framework/src/Main',
+    './src/defaultRegistry',
+    './src/MCT'
+], function (Main, defaultRegistry, MCT) {
+    var openmct = new MCT();
 
-var openmct = new MCT();
+    openmct.legacyRegistry = defaultRegistry;
 
-module.exports = openmct;
+    openmct.on('start', function () {
+        return new Main().run(defaultRegistry);
+    });
+
+    return openmct;
+});

package.json

@@ -1,89 +1,66 @@
 {
   "name": "openmct",
-  "version": "0.14.0-SNAPSHOT",
+  "version": "0.12.1-SNAPSHOT",
   "description": "The Open MCT core platform",
-  "dependencies": {},
-  "devDependencies": {
-    "angular": "1.4.14",
-    "angular-route": "1.4.14",
-    "babel-eslint": "8.2.6",
-    "comma-separated-values": "^3.6.4",
-    "concurrently": "^3.6.1",
-    "copy-webpack-plugin": "^4.5.2",
-    "css-loader": "^1.0.0",
-    "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",
-    "eslint": "5.2.0",
-    "eventemitter3": "^1.2.0",
-    "exports-loader": "^0.7.0",
+  "dependencies": {
+    "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",
-    "fast-sass-loader": "1.4.6",
-    "file-loader": "^1.1.11",
-    "file-saver": "^1.3.8",
+    "minimist": "^1.1.1",
+    "request": "^2.69.0"
+  },
+  "devDependencies": {
+    "bower": "^1.7.7",
     "git-rev-sync": "^1.4.0",
     "glob": ">= 3.0.0",
-    "html-loader": "^0.5.5",
-    "html2canvas": "^1.0.0-alpha.12",
-    "imports-loader": "^0.8.0",
-    "istanbul-instrumenter-loader": "^3.0.1",
-    "jasmine-core": "^3.1.0",
+    "gulp": "^3.9.0",
+    "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": "^2.2.0",
+    "gulp-sourcemaps": "^1.6.0",
+    "jasmine-core": "^2.3.0",
+    "jscs-html-reporter": "^0.1.0",
     "jsdoc": "^3.3.2",
-    "karma": "^2.0.3",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-cli": "^1.0.1",
-    "karma-coverage": "^1.1.2",
+    "jshint": "^2.7.0",
+    "karma": "^0.13.3",
+    "karma-chrome-launcher": "^0.1.12",
+    "karma-cli": "0.0.4",
+    "karma-coverage": "^0.5.3",
     "karma-html-reporter": "^0.2.7",
-    "karma-jasmine": "^1.1.2",
-    "karma-webpack": "^3.0.0",
-    "location-bar": "^3.0.1",
+    "karma-jasmine": "^0.1.5",
+    "karma-junit-reporter": "^0.3.8",
+    "karma-requirejs": "^0.2.2",
     "lodash": "^3.10.1",
     "markdown-toc": "^0.11.7",
     "marked": "^0.3.5",
-    "mini-css-extract-plugin": "^0.4.1",
-    "minimist": "^1.1.1",
+    "merge-stream": "^1.0.0",
+    "mkdirp": "^0.5.1",
     "moment": "^2.11.1",
-    "moment-duration-format": "^2.2.2",
-    "moment-timezone": "^0.5.21",
     "node-bourbon": "^4.2.3",
-    "node-sass": "^4.9.2",
-    "painterro": "^0.2.65",
-    "printj": "^1.1.0",
-    "raw-loader": "^0.5.1",
-    "request": "^2.69.0",
-    "split": "^1.0.0",
-    "style-loader": "^0.21.0",
-    "v8-compile-cache": "^1.1.0",
-    "vue": "2.5.6",
-    "vue-loader": "^15.2.6",
-    "vue-template-compiler": "2.5.6",
-    "webpack": "^4.16.2",
-    "webpack-cli": "^3.1.0",
-    "webpack-dev-middleware": "^3.1.3",
-    "webpack-hot-middleware": "^2.22.3",
-    "zepto": "^1.2.0"
+    "requirejs": "2.1.x",
+    "split": "^1.0.0"
   },
   "scripts": {
     "start": "node app.js",
-    "lint": "eslint platform src openmct.js",
-    "lint:fix": "eslint platform src openmct.js --fix",
-    "build:prod": "NODE_ENV=production webpack",
-    "build:dev": "webpack",
-    "build:watch": "webpack --watch",
     "test": "karma start --single-run",
-    "test:watch": "karma start --no-single-run",
-    "verify": "concurrently 'npm:test' 'npm:lint'",
+    "jshint": "jshint platform example",
+    "watch": "karma start",
     "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": "npm run build:prod"
+    "prepublish": "node ./node_modules/bower/bin/bower install && node ./node_modules/gulp/bin/gulp.js install"
   },
   "repository": {
     "type": "git",

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.
  *
@@ -21,17 +21,17 @@
  *****************************************************************************/
 
 define([
-    "./res/templates/about-dialog.html",
+    "text!./res/templates/about-dialog.html",
     "./src/LogoController",
     "./src/AboutController",
     "./src/LicenseController",
-    "./res/templates/app-logo.html",
-    "./res/templates/about-logo.html",
-    "./res/templates/overlay-about.html",
-    "./res/templates/license-apache.html",
-    "./res/templates/license-mit.html",
-    "./res/templates/licenses.html",
-    "./res/templates/licenses-export-md.html",
+    "text!./res/templates/app-logo.html",
+    "text!./res/templates/about-logo.html",
+    "text!./res/templates/overlay-about.html",
+    "text!./res/templates/license-apache.html",
+    "text!./res/templates/license-mit.html",
+    "text!./res/templates/licenses.html",
+    "text!./res/templates/licenses-export-md.html",
     'legacyRegistry'
 ], function (
     aboutDialogTemplate,

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>

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.
 

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.
 

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.
 

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.
 

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.
 

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.
 

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.
 

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.
  *

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.
  *

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.
  *

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.
  *

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.
  *

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.
  *

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,19 +26,21 @@ define([
     "./src/InspectorPaneController",
     "./src/BrowseObjectController",
     "./src/MenuArrowController",
-    "./src/ObjectHeaderController",
     "./src/navigation/NavigationService",
     "./src/navigation/NavigateAction",
     "./src/navigation/OrphanNavigationHandler",
     "./src/windowing/NewTabAction",
-    "./res/templates/browse.html",
-    "./res/templates/browse-object.html",
-    "./res/templates/browse/object-header.html",
-    "./res/templates/browse/object-header-frame.html",
-    "./res/templates/menu-arrow.html",
-    "./res/templates/back-arrow.html",
-    "./res/templates/browse/object-properties.html",
-    "./res/templates/browse/inspector-region.html",
+    "./src/windowing/FullscreenAction",
+    "./src/windowing/WindowTitler",
+    "text!./res/templates/browse.html",
+    "text!./res/templates/browse-object.html",
+    "text!./res/templates/items/grid-item.html",
+    "text!./res/templates/browse/object-header.html",
+    "text!./res/templates/menu-arrow.html",
+    "text!./res/templates/back-arrow.html",
+    "text!./res/templates/items/items.html",
+    "text!./res/templates/browse/object-properties.html",
+    "text!./res/templates/browse/inspector-region.html",
     'legacyRegistry'
 ], function (
     BrowseController,
@@ -46,17 +48,19 @@ define([
     InspectorPaneController,
     BrowseObjectController,
     MenuArrowController,
-    ObjectHeaderController,
     NavigationService,
     NavigateAction,
     OrphanNavigationHandler,
     NewTabAction,
+    FullscreenAction,
+    WindowTitler,
     browseTemplate,
     browseObjectTemplate,
+    gridItemTemplate,
     objectHeaderTemplate,
-    objectHeaderFrameTemplate,
     menuArrowTemplate,
     backArrowTemplate,
+    itemsTemplate,
     objectPropertiesTemplate,
     inspectorRegionTemplate,
     legacyRegistry
@@ -65,6 +69,15 @@ define([
     legacyRegistry.register("platform/commonUI/browse", {
         "extensions": {
             "routes": [
+                {
+                    "when": "/browse/:ids*?",
+                    "template": browseTemplate,
+                    "reloadOnSearch": false
+                },
+                {
+                    "when": "",
+                    "redirectTo": "/browse/"
+                }
             ],
             "constants": [
                 {
@@ -94,10 +107,7 @@ define([
                     "depends": [
                         "$scope",
                         "agentService",
-                        "$window",
-                        "$location",
-                        "$attrs",
-                        "navigationService"
+                        "$window"
                     ]
                 },
                 {
@@ -124,16 +134,7 @@ define([
                         "$scope",
                         "agentService",
                         "$window",
-                        "navigationService",
-                        "$location",
-                        "$attrs"
-                    ]
-                },
-                {
-                    "key": "ObjectHeaderController",
-                    "implementation": ObjectHeaderController,
-                    "depends": [
-                        "$scope"
+                        "navigationService"
                     ]
                 }
             ],
@@ -149,15 +150,21 @@ define([
                     ]
                 },
                 {
-                    "key": "object-header",
-                    "template": objectHeaderTemplate,
+                    "key": "grid-item",
+                    "template": gridItemTemplate,
                     "uses": [
-                        "type"
+                        "type",
+                        "action",
+                        "location"
+                    ],
+                    "gestures": [
+                        "info",
+                        "menu"
                     ]
                 },
                 {
-                    "key": "object-header-frame",
-                    "template": objectHeaderFrameTemplate,
+                    "key": "object-header",
+                    "template": objectHeaderTemplate,
                     "uses": [
                         "type"
                     ]
@@ -221,9 +228,41 @@ define([
                     "group": "windowing",
                     "cssClass": "icon-new-window",
                     "priority": "preferred"
+                },
+                {
+                    "key": "fullscreen",
+                    "implementation": FullscreenAction,
+                    "category": "view-control",
+                    "group": "windowing",
+                    "priority": "default"
+                }
+            ],
+            "views": [
+                {
+                    "key": "items",
+                    "name": "Items",
+                    "cssClass": "icon-thumbs-strip",
+                    "description": "Grid of available items",
+                    "template": itemsTemplate,
+                    "uses": [
+                        "composition"
+                    ],
+                    "gestures": [
+                        "drop"
+                    ],
+                    "type": "folder",
+                    "editable": false
                 }
             ],
             "runs": [
+                {
+                    "implementation": WindowTitler,
+                    "depends": [
+                        "navigationService",
+                        "$rootScope",
+                        "$document"
+                    ]
+                },
                 {
                     "implementation": OrphanNavigationHandler,
                     "depends": [
@@ -233,18 +272,16 @@ define([
                     ]
                 }
             ],
-            "templates": [
+            "licenses": [
                 {
-                    key: "browseRoot",
-                    template: browseTemplate
-                },
-                {
-                    key: "browseObject",
-                    template: browseObjectTemplate
-                },
-                {
-                    key: "inspectorRegion",
-                    template: inspectorRegionTemplate
+                    "name": "screenfull.js",
+                    "version": "1.2.0",
+                    "description": "Wrapper for cross-browser usage of fullscreen API",
+                    "author": "Sindre Sorhus",
+                    "website": "https://github.com/sindresorhus/screenfull.js/",
+                    "copyright": "Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)",
+                    "license": "license-mit",
+                    "link": "https://github.com/sindresorhus/screenfull.js/blob/gh-pages/license"
                 }
             ]
         }

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.
 

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.
 
@@ -20,7 +20,7 @@
  at runtime from the About dialog for additional information.
 -->
 <div ng-controller="BrowseObjectController" class="abs l-flex-col">
-    <div class="holder flex-elem l-flex-row object-browse-bar t-primary">
+    <div class="holder flex-elem l-flex-row object-browse-bar ">
         <div class="items-select left flex-elem l-flex-row grows">
             <mct-representation key="'back-arrow'"
                                 mct-object="domainObject"
@@ -31,18 +31,16 @@
             </mct-representation>
         </div>
         <div class="btn-bar right l-flex-row flex-elem flex-justify-end flex-fixed">
-            <span class="l-object-action-buttons">
-                <mct-representation key="'switcher'"
-                                    mct-object="domainObject"
-                                    ng-model="representation">
-                </mct-representation>
-                <!-- Temporarily, on mobile, the action buttons are hidden-->
-                <mct-representation key="'action-group'"
-                                    mct-object="domainObject"
-                                    parameters="{ category: 'view-control' }"
-                                    class="mobile-hide l-object-action-buttons">
-                </mct-representation>
-            </span>
+            <mct-representation key="'switcher'"
+                                mct-object="domainObject"
+                                ng-model="representation">
+            </mct-representation>
+            <!-- Temporarily, on mobile, the action buttons are hidden-->
+            <mct-representation key="'action-group'"
+                                mct-object="domainObject"
+                                parameters="{ category: 'view-control' }"
+                                class="mobile-hide">
+            </mct-representation>
         </div>
     </div>
     <div class="holder l-flex-col flex-elem grows l-object-wrapper l-controls-visible l-time-controller-visible">
@@ -57,13 +55,9 @@
             </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>
+    <mct-include key="'conductor'" class="abs holder flex-elem flex-fixed l-flex-row l-time-conductor-holder"></mct-include>
 </div>

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.
 
@@ -24,9 +24,9 @@
     <mct-include key="'topbar-browse'"></mct-include>
     <div class="abs holder holder-main browse-area s-browse-area browse-wrapper"
          ng-controller="PaneController as modelPaneTree"
-         ng-class="modelPaneTree.visible() ? 'pane-tree-showing' : 'pane-tree-hidden'" hide-parameter="hideTree">
+         ng-class="modelPaneTree.visible() ? 'pane-tree-showing' : 'pane-tree-hidden'">
         <mct-split-pane class='abs contents'
-                        anchor='left' alias="leftSide">
+                        anchor='left'>
             <div class='split-pane-component treeview pane left'>
                 <div class="abs holder l-flex-col holder-treeview-elements">
                     <mct-representation key="'create-button'"
@@ -58,14 +58,13 @@
 
                 <div class='holder holder-object-and-inspector abs' id='content-area'
                      ng-controller="InspectorPaneController as modelPaneInspect"
-                     ng-class="modelPaneInspect.visible() ? 'pane-inspect-showing' : 'pane-inspect-hidden'" 
-                     hide-parameter="hideInspector">
+                     ng-class="modelPaneInspect.visible() ? 'pane-inspect-showing' : 'pane-inspect-hidden'">
 
-                    <mct-split-pane class='l-object-and-inspector contents abs' anchor='right' alias="rightSide">
+                    <mct-split-pane class='l-object-and-inspector contents abs' anchor='right'>
                         <div class='split-pane-component t-object pane primary-pane left'>
                             <mct-representation mct-object="navigatedObject"
                                                 key="navigatedObject.getCapability('status').get('editing') ? 'edit-object' : 'browse-object'"
-                                                class="abs holder holder-object t-main-view">
+                                                class="abs holder holder-object">
                             </mct-representation>
                             <a class="mini-tab-icon anchor-right mobile-hide toggle-pane toggle-inspect flush-right"
                                title="{{ modelPaneInspect.visible()? 'Hide' : 'Show' }} the Inspection pane"
@@ -88,3 +87,4 @@
     </div>
     <mct-include key="'bottombar'"></mct-include>
 </div>
+

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>

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,16 +20,12 @@
  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'"
         mct-object='domainObject'
         class="flex-elem context-available-w"></mct-representation>
-</span>
+</span>

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.
 
@@ -19,46 +19,43 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div ng-controller="ObjectInspectorController as controller" class="grid-properties">
-    <ul class="l-inspector-part">
-        <h2 class="first">Properties</h2>
-        <li class="t-repeat grid-row"
-             ng-repeat="data in metadata"
-             ng-class="{ first:$index === 0 }">
-            <div class="grid-cell label">{{ data.name }}</div>
-            <div class="grid-cell value">{{ data.value }}</div>
-        </li>
-    </ul>
-
-    <ul class="l-inspector-part" ng-if="contextutalParents.length > 0">
-        <h2 title="The location of this linked object.">Location</h2>
-        <li class="grid-row">
-            <div class="label" ng-if="primaryParents.length > 0">This Link</div>
-            <div class="grid-cell value">
-                <div class="t-repeat inspector-location"
-                     ng-repeat="parent in contextutalParents"
-                     ng-class="{ last:($index + 1) === contextualParents.length }">
-                    <mct-representation key="'label'"
-                                        mct-object="parent"
-                                        ng-click="parent.getCapability('action').perform('navigate')"
-                                        class="location-item">
-                    </mct-representation>
-                </div>
+<div ng-controller="ObjectInspectorController as controller">
+    <ul class="flex-elem grows l-inspector-part">
+        <li>
+            <em class="t-inspector-part-header">Properties</em>
+            <div class="inspector-properties"
+                 ng-repeat="data in metadata"
+                 ng-class="{ first:$index === 0 }">
+                <div class="label">{{ data.name }}</div>
+                <div class="value">{{ data.value }}</div>
             </div>
         </li>
-        <li class="grid-row" ng-if="primaryParents.length > 0">
-            <div class="grid-cell label">Original</div>
-            <div class="grid-cell value">
-                <div class="t-repeat inspector-location value"
-                     ng-repeat="parent in primaryParents"
-                     ng-class="{ last:($index + 1) === primaryParents.length }">
-                    <mct-representation key="'label'"
-                                        mct-object="parent"
-                                        ng-click="parent.getCapability('action').perform('navigate')"
-                                        class="location-item">
-                    </mct-representation>
-                </div>
-            </div>
+        <li ng-if="contextutalParents.length > 0">
+            <em class="t-inspector-part-header" title="The location of this linked object.">Location</em>
+            <div ng-if="primaryParents.length > 0" class="section-header">This Object</div>
+            <span class="inspector-location"
+                  ng-repeat="parent in contextutalParents"
+                  ng-class="{ last:($index + 1) === contextualParents.length }">
+                <mct-representation key="'label'"
+                                    mct-object="parent"
+                                    ng-model="ngModel"
+                                    ng-click="ngModel.selectedObject = parent"
+                                    class="location-item">
+                </mct-representation>
+            </span>
+        </li>
+        <li ng-if="primaryParents.length > 0">
+            <div class="section-header">Object's Original</div>
+            <span class="inspector-location"
+                  ng-repeat="parent in primaryParents"
+                  ng-class="{ last:($index + 1) === primaryParents.length }">
+                <mct-representation key="'label'"
+                                    mct-object="parent"
+                                    ng-model="ngModel"
+                                    ng-click="ngModel.selectedObject = parent"
+                                    class="location-item">
+                </mct-representation>
+            </span>
         </li>
     </ul>
 </div>

platform/commonUI/browse/res/templates/items/grid-item.html

@@ -0,0 +1,45 @@
+<!--
+ 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.
+-->
+<!-- For selected, add class 'selected' to outer div -->
+<div class='item grid-item' ng-click='action.perform("navigate")'>
+    <div class='contents abs'>
+        <div class='top-bar bar abs'>
+            <span class='icon-people' title='Shared'></span>
+            <mct-representation class="desktop-hide" key="'info-button'" mct-object="domainObject"></mct-representation>
+        </div>
+        <div class='item-main abs lg'>
+            <span class="t-item-icon" ng-class="{ 'l-icon-link':location.isLink() }">
+                <span class="t-item-icon-glyph ng-binding {{type.getCssClass()}}"></span>
+            </span>
+            <div class='abs item-open icon-pointer-right'></div>
+        </div>
+        <div class='bottom-bar bar abs'>
+            <div class='title'>{{model.name}}</div>
+            <div class='details'>
+                <span>{{type.getName()}}</span>
+                <span ng-show="model.composition !== undefined">
+                    - {{model.composition.length}} Item<span ng-show="model.composition.length > 1">s</span>
+                </span>
+            </div>
+        </div>
+    </div>
+</div>

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.
 
@@ -19,9 +19,9 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-<div class="ls-indicator {{ngModel.getCssClass()}}"
-	 title="{{ngModel.getDescription()}}"
-	 ng-show="ngModel.getText().length > 0">
-	<span class="label">{{ngModel.getText()}}</span>
+<div class='items-holder grid abs'>
+    <mct-representation key="'grid-item'"
+                        ng-repeat="childObject in composition"
+                        mct-object="childObject">
+    </mct-representation>
 </div>

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.
 

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.
  *
@@ -25,8 +25,8 @@
  * @namespace platform/commonUI/browse
  */
 define(
-    ['lodash'],
-    function (_) {
+    [],
+    function () {
 
         /**
          * The BrowseController is used to populate the initial scope in Browse
@@ -47,9 +47,8 @@ define(
             urlService,
             defaultPath
         ) {
-            window.browseScope = $scope;
-            var initialPath = ($route.current.params.ids || defaultPath).split("/"),
-                currentIds;
+            var initialPath = ($route.current.params.ids || defaultPath).split("/");
+            var currentIds;
 
             $scope.treeModel = {
                 selectedObject: undefined,
@@ -57,24 +56,7 @@ define(
                     navigationService.setNavigation(object, true);
                 },
                 allowSelection: function (object) {
-                    var domainObjectInView = navigationService.getNavigation(),
-                        isInEditMode = domainObjectInView.getCapability('status').get('editing');
-
-                    if (isInEditMode) {
-
-                        var actions = object.getCapability('action'),
-                            previewAction = actions.getActions({key: 'mct-preview-action'})[0];
-
-                        if (previewAction && previewAction.perform) {
-                            previewAction.perform();
-                            return false;
-                        } else {
-                            return navigationService.shouldNavigate();
-                        }
-
-                    } else {
-                        return true;
-                    }
+                    return navigationService.shouldNavigate();
                 }
             };
 
@@ -175,28 +157,12 @@ define(
             // (e.g. bookmarks to pages in OpenMCT) and prevent them.  Instead,
             // navigate to the path ourselves, which results in it being
             // properly set.
-            $scope.$on('$routeChangeStart', function (event, route, oldRoute) {
+            $scope.$on('$routeChangeStart', function (event, route) {
                 if (route.$$route === $route.current.$$route) {
                     if (route.pathParams.ids &&
                         route.pathParams.ids !== $route.current.pathParams.ids) {
-
-                        var otherParams = _.omit(route.params, 'ids');
-                        var oldOtherParams = _.omit(oldRoute.params, 'ids');
-                        var deletedParams = _.omit(oldOtherParams, _.keys(otherParams));
-
                         event.preventDefault();
-
-                        navigateToPath(route.pathParams.ids.split('/'))
-                            .then(function () {
-                                if (!_.isEqual(otherParams, oldOtherParams)) {
-                                    _.forEach(otherParams, function (v, k) {
-                                        $location.search(k, v);
-                                    });
-                                    _.forEach(deletedParams, function (k) {
-                                        $location.search(k, null);
-                                    });
-                                }
-                            });
+                        navigateToPath(route.pathParams.ids.split('/'));
                     } else {
                         navigateToPath([]);
                     }