Whitespace only change

...to help diagnose CircleCI failures

API.md

@@ -1,279 +0,0 @@
-# Open MCT API
-
-The Open MCT framework public api can be utilized by building the application
-(`gulp install`) and then copying the file from `dist/main.js` to your
-directory of choice.
-
-Open MCT supports AMD, CommonJS, and loading via a script tag; it's easy to use
-in your project. The [`openmct`]{@link module:openmct} module is exported
-via AMD and CommonJS, and is also exposed as `openmct` in the global scope
-if loaded via a script tag.
-
-## Overview
-
-Open MCT's goal is to allow you to browse, create, edit, and visualize all of
-the domain knowledge you need on a daily basis.
-
-To do this, the main building block provided by Open MCT is the _domain object_.
-The temperature sensor on the starboard solar panel,
-an overlay plot comparing the results of all temperature sensor,
-the command dictionary for a spacecraft,
-the individual commands in that dictionary, your "my documents" folder:
-All of these things are domain objects.
-
-Domain objects have Types, so a specific instrument temperature sensor is a
-"Telemetry Point," and turning on a drill for a certain duration of time is
-an "Activity".  Types allow you to form an ontology of knowledge and provide
-an abstraction for grouping, visualizing, and interpreting data.
-
-And then we have Views. Views allow you to visualize domain objects. Views can
-apply to specific domain objects; they may also apply to certain types of
-domain objects, or they may apply to everything.  Views are simply a method
-of visualizing domain objects.
-
-Regions allow you to specify what views are displayed for specific types of
-domain objects in response to different user actions. For instance, you may
-want to display a different view while editing, or you may want to update the
-toolbar display when objects are selected.  Regions allow you to map views to
-specific user actions.
-
-Domain objects can be mutated and persisted, developers can create custom
-actions and apply them to domain objects, and many more things can be done.
-For more information, read on!
-
-## Running Open MCT
-
-Once the [`openmct`](@link module:openmct) module has been loaded, you can
-simply invoke [`start`]{@link module:openmct.MCT#start} to run Open MCT:
-
-
-```
-openmct.start();
-```
-
-Generally, however, you will want to configure Open MCT by adding plugins
-before starting it. It is important to install plugins and configure Open MCT
-_before_ calling [`start`]{@link module:openmct.MCT#start}; Open MCT is not
-designed to be reconfigured once started.
-
-## Configuring Open MCT
-
-The [`openmct`]{@link module:openmct} module (more specifically, the
-[`MCT`]{@link module:openmct.MCT} class, of which `openmct` is an instance)
-exposes a variety of methods to allow the application to be configured,
-extended, and customized before running.
-
-Short examples follow; see the linked documentation for further details.
-
-### Adding Domain Object Types
-
-Custom types may be registered via
-[`openmct.types`]{@link module:openmct.MCT#types}:
-
-```
-openmct.types.addType('my-type', {
-    label: "My Type",
-    description: "This is a type that I added!",
-    creatable: true
-});
-```
-
-### Adding Views
-
-Custom views may be registered based on the region in the application
-where they should appear:
-
-* [`openmct.mainViews`]{@link module:openmct.MCT#mainViews} is a registry
-  of views of domain objects which should appear in the main viewing area.
-* [`openmct.inspectors`]{@link module:openmct.MCT#inspectors} is a registry
-  of views of domain objects and/or active selections, which should appear in
-  the Inspector.
-* [`openmct.toolbars`]{@link module:openmct.MCT#toolbars} is a registry
-  of views of domain objects and/or active selections, which should appear in
-  the toolbar area while editing.
-* [`openmct.indicators`]{@link module:openmct.MCT#inspectors} is a registry
-  of views which should appear in the status area of the application.
-
-Example:
-
-```
-openmct.mainViews.addProvider({
-    canView: function (domainObject) {
-        return domainObject.type === 'my-type';
-    },
-    view: function (domainObject) {
-        return new MyView(domainObject);
-    }
-});
-```
-
-### Adding a Root-level Object
-
-In many cases, you'd like a certain object (or a certain hierarchy of
-objects) to be accessible from the top level of the application (the
-tree on the left-hand side of Open MCT.) It is typical to expose a telemetry
-dictionary as a hierarchy of telemetry-providing domain objects in this
-fashion.
-
-To do so, use the [`addRoot`]{@link module:openmct.ObjectAPI#addRoot} method
-of the [object API]{@link module:openmct.ObjectAPI}:
-
-```
-openmct.objects.addRoot({ key: "my-key", namespace: "my-namespace" });
-```
-
-Root objects are loaded just like any other objects, i.e. via an object
-provider.
-
-### Adding 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
-default solution for composition, but there may be cases where you want
-to provide the composition of a certain object (or type of object) dynamically.
-For instance, you may want to populate a hierarchy under a custom root-level
-object based on the contents of a telemetry dictionary.
-To do this, you can add a new CompositionProvider:
-
-```
-openmct.composition.addProvider({
-    appliesTo: function (domainObject) {
-        return domainObject.type === 'my-type';
-    },
-    load: function (domainObject) {
-        return Promise.resolve(myDomainObjects);
-    }
-});
-```
-
-### Adding Telemetry Providers
-
-When connecting to a new telemetry source, you will want to register a new
-[telemetry provider]{@link module:openmct.TelemetryAPI~TelemetryProvider}
-with the [telemetry API]{@link module:openmct.TelemetryAPI#addProvider}:
-
-```
-openmct.telemetry.addProvider({
-    canProvideTelemetry: function (domainObject) {
-        return domainObject.type === 'my-type';
-    },
-    properties: function (domainObject) {
-        return [
-            { key: 'value', name: "Temperature", units: "degC" },
-            { key: 'time', name: "UTC" }
-        ];
-    },
-    request: function (domainObject, options) {
-        var telemetryId = domainObject.myTelemetryId;
-        return myAdapter.request(telemetryId, options.start, options.end);
-    },
-    subscribe: function (domainObject, callback) {
-        var telemetryId = domainObject.myTelemetryId;
-        myAdapter.subscribe(telemetryId, callback);
-        return myAdapter.unsubscribe.bind(myAdapter, telemetryId, callback);
-    }
-});
-```
-
-The implementations for `request` and `subscribe` can vary depending on the
-nature of the endpoint which will provide telemetry. In the example above,
-it is assumed that `myAdapter` contains the specific implementations
-(HTTP requests, WebSocket connections, etc.) associated with some telemetry
-source.
-
-## Using Open MCT
-
-When implementing new features, it is useful and sometimes necessary to
-utilize functionality exposed by Open MCT.
-
-### Retrieving Composition
-
-To limit which objects are loaded at any given time, the composition of
-a domain object must be requested asynchronously:
-
-```
-openmct.composition(myObject).load().then(function (childObjects) {
-    childObjects.forEach(doSomething);
-});
-```
-
-### Support Common Gestures
-
-Custom views may also want to support common gestures using the
-[gesture API]{@link module:openmct.GestureAPI}. For instance, to make
-a view (or part of a view) selectable:
-
-```
-openmct.gestures.selectable(myHtmlElement, myDomainObject);
-```
-
-### Working with Domain Objects
-
-The [object API]{@link module:openmct.ObjectAPI} provides useful methods
-for working with domain objects.
-
-To make changes to a domain object, use the
-[`mutate`]{@link module:openmct.ObjectAPI#mutate} method:
-
-```
-openmct.objects.mutate(myDomainObject, "name", "New name!");
-```
-
-Making modifications in this fashion allows other usages of the domain
-object to remain up to date using the
-[`observe`]{@link module:openmct.ObjectAPI#observe} method:
-
-```
-openmct.objects.observe(myDomainObject, "name", function (newName) {
-    myLabel.textContent = newName;
-});
-```
-
-### Using Telemetry
-
-Very often in Open MCT, you wish to work with telemetry data (for instance,
-to display it in a custom visualization.)
-
-
-### Synchronizing with the Time Conductor
-
-Views which wish to remain synchronized with the state of Open MCT's
-time conductor should utilize
-[`openmct.conductor`]{@link module:openmct.TimeConductor}:
-
-```
-openmct.conductor.on('bounds', function (newBounds) {
-    requestTelemetry(newBounds.start, newBounds.end).then(displayTelemetry);
-});
-```
-
-## Plugins
-
-While you can register new features with Open MCT directly, it is generally
-more useful to package these as a plugin. A plugin is a function that takes
-[`openmct`]{@link module:openmct} as an argument, and performs configuration
-upon `openmct` when invoked.
-
-### Installing Plugins
-
-To install plugins, use the [`install`]{@link module:openmct.MCT#install}
-method:
-
-```
-openmct.install(myPlugin);
-```
-
-The plugin will be invoked to configure Open MCT before it is started.
-
-### Writing Plugins
-
-Plugins configure Open MCT, and should utilize the
-[`openmct`]{@link module:openmct} module to do so, as summarized above in
-"Configuring Open MCT" and "Using Open MCT" above.
-
-### Distributing Plugins
-
-Hosting or downloading plugins is outside of the scope of this documentation.
-We recommend distributing plugins as UMD modules which export a single
-function.
-

LICENSES.md

@@ -560,132 +560,3 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
----
-
-### Almond
-
-* Link: https://github.com/requirejs/almond
-
-* Version: 0.3.3
-
-* Author: jQuery Foundation
-
-* Description: Lightweight RequireJS replacement for builds
-
-#### License
-
-Copyright jQuery Foundation and other contributors, https://jquery.org/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/requirejs/almond
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====
-
-Copyright and related rights for sample code are waived via CC0. Sample
-code is defined as all source code displayed within the prose of the
-documentation.
-
-CC0: http://creativecommons.org/publicdomain/zero/1.0/
-
-====
-
-Files located in the node_modules directory, and certain utilities used
-to build or test the software in the test and dist directories, are
-externally maintained libraries used by this software which have their own
-licenses; we recommend you read them, as their terms may differ from the
-terms above.
-
-
-### Lodash
-
-* Link: https://lodash.com
-
-* Version: 3.10.1
-
-* Author: Dojo Foundation
-
-* Description: Utility functions
-
-#### License
-
-Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
-Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
-DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-### EventEmitter3
-
-* Link: https://github.com/primus/eventemitter3
-
-* Version: 1.2.0
-
-* Author: Arnout Kazemier
-
-* Description: Event-driven programming support
-
-#### License
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Arnout Kazemier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -4,30 +4,16 @@ Open MCT is a next-generation mission control framework for visualization of dat
 
 Please visit our [Official Site](https://nasa.github.io/openmct/) and [Getting Started Guide](https://nasa.github.io/openmct/getting-started/)
 
+
 ## See Open MCT in Action
 
 Try Open MCT now with our [live demo](https://openmct-demo.herokuapp.com/).
 ![Demo](https://nasa.github.io/openmct/static/res/images/Open-MCT.Browse.Layout.Mars-Weather-1.jpg)
 
 ## New API
+A new API is currently under development that will deprecate a lot of the documentation currently in the docs directory, however Open MCT will remain compatible with the currently documented API. An updated set of tutorials is being developed with the new API, and progress on this task can be followed in the [associated pull request](https://github.com/nasa/openmct/pull/999). Any code in this branch should be considered experimental, and we welcome any feedback.
 
-A simpler, [easier-to-use API](https://nasa.github.io/openmct/docs/api/)
-has been added to Open MCT. Changes in this
-API include a move away from a declarative system of JSON configuration files
-towards an imperative system based on function calls. Developers will be able
-to extend and build on Open MCT by making direct function calls to a public
-API. Open MCT is also being refactored to minimize the dependencies that using
-Open MCT imposes on developers, such as the current requirement to use
-AngularJS.
-
-This new API has not yet been heavily used and is likely to contain defects.
-You can help by trying it out, and reporting any issues you encounter
-using our GitHub issue tracker. Such issues may include bugs, suggestions,
-missing documentation, or even just requests for help if you're having
-trouble.
-
-We want Open MCT to be as easy to use, install, run, and develop for as
-possible, and your feedback will help us get there!
+Differences between the two APIs include a move away from a declarative system of JSON configuration files towards an imperative system based on function calls. Developers will be able to extend and build on Open MCT by making direct function calls to a public API. Open MCT is also being refactored to minimize the dependencies that using Open MCT imposes on developers, such as the current requirement to use Angular JS.
 
 ## Building and Running Open MCT Locally
 

bower.json

@@ -19,10 +19,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",
-    "d3": "~4.1.0",
-    "html2canvas": "^0.4.1"
+    "html2canvas": "^0.4.1",
+    "jspdf": "^1.2.61"
   }
 }

build-docs.sh

@@ -24,7 +24,7 @@
 
 # Script to build and deploy docs.
 
-OUTPUT_DIRECTORY="dist/docs"
+OUTPUT_DIRECTORY="target/docs"
 # Docs, once built, are pushed to the private website repo
 REPOSITORY_URL="git@github.com:nasa/openmct-website.git"
 WEBSITE_DIRECTORY="website"

docs/src/index.md

@@ -9,29 +9,26 @@
 
  Open MCT provides functionality out of the box, but it's also a platform for
  building rich mission operations applications based on modern web technology. 
- The platform is configured by plugins which extend the platform at a variety
- of extension points. The details of how to
+ The platform is configured declaratively, and defines conventions for
+ building on the provided capabilities by creating modular 'bundles' that 
+ extend the platform at a variety of extension points. The details of how to
  extend the platform are provided in the following documentation.
 
 ## Sections
+
+ * The [Architecture Overview](architecture/) describes the concepts used 
+ throughout Open MCT, and gives a high level overview of the platform's design.
+ 
+ * The [Developer's Guide](guide/) goes into more detail about how to use the
+ platform and the functionality that it provides.
+ 
+ * The [Tutorials](tutorials/) give examples of extending the platform to add 
+ functionality, 
+ and integrate with data sources.
  
  * The [API](api/) document is generated from inline documentation 
  using [JSDoc](http://usejsdoc.org/), and describes the JavaScript objects and
  functions that make up the software platform.
 
- * The [Development Process](process/) document describes the
+ * Finally, the [Development Process](process/) document describes the 
  Open MCT software development cycle.
-
-## Legacy Documentation
-
-As we transition to a new API, the following documentation for the old API
-(which is supported during the transtion) may be useful as well:
-
- * The [Architecture Overview](architecture/) describes the concepts used
- throughout Open MCT, and gives a high level overview of the platform's design.
-
- * The [Developer's Guide](guide/) goes into more detail about how to use the
- platform and the functionality that it provides.
-
- * The [Tutorials](tutorials/) give examples of extending the platform to add
- functionality, and integrate with data sources.

docs/src/tutorials/index.md

@@ -131,11 +131,11 @@ one which exposes no extensions - which looks like:
 
 ```diff
 define([
-    'openmct'
+    'legacyRegistry'
 ], function (
-    openmct
+    legacyRegistry
 ) {
-    openmct.legacyRegistry.register("tutorials/todo", {
+    legacyRegistry.register("tutorials/todo", {
         "name": "To-do Plugin",
         "description": "Allows creating and editing to-do lists.",
         "extensions":
@@ -155,134 +155,176 @@ has been finalized.
 
 #### Before
 ```diff
-<!--
- Open MCT, Copyright (c) 2014-2016, United States Government
- as represented by the Administrator of the National Aeronautics and Space
- Administration. All rights reserved.
+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",
+        "es6-promise": "bower_components/es6-promise/promise.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"
+    },
+    "shim": {
+        "angular": {
+            "exports": "angular"
+        },
+        "angular-route": {
+            "deps": [ "angular" ]
+        },
+        "moment-duration-format": {
+            "deps": [ "moment" ]
+        },
+        "screenfull": {
+            "exports": "screenfull"
+        },
+        "zepto": {
+            "exports": "Zepto"
+        }
+    }
+});
 
- 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.
--->
-<!doctype html>
-<html lang="en">
-<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>
-        require([
-            'openmct'
-        ], function (openmct) {
-            [
-                'example/imagery',
-                'example/eventGenerator',
-                'example/generator',
-                'platform/features/my-items',
-                'platform/persistence/local'
-            ].forEach(
-                openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
-            );
-            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>
+define([
+    './platform/framework/src/Main',
+    'legacyRegistry',
 
+    './platform/framework/bundle',
+    './platform/core/bundle',
+    './platform/representation/bundle',
+    './platform/commonUI/about/bundle',
+    './platform/commonUI/browse/bundle',
+    './platform/commonUI/edit/bundle',
+    './platform/commonUI/dialog/bundle',
+    './platform/commonUI/formats/bundle',
+    './platform/commonUI/general/bundle',
+    './platform/commonUI/inspect/bundle',
+    './platform/commonUI/mobile/bundle',
+    './platform/commonUI/themes/espresso/bundle',
+    './platform/commonUI/notification/bundle',
+    './platform/containment/bundle',
+    './platform/execution/bundle',
+    './platform/exporters/bundle',
+    './platform/telemetry/bundle',
+    './platform/features/clock/bundle',
+    './platform/features/imagery/bundle',
+    './platform/features/layout/bundle',
+    './platform/features/pages/bundle',
+    './platform/features/plot/bundle',
+    './platform/features/timeline/bundle',
+    './platform/features/table/bundle',
+    './platform/forms/bundle',
+    './platform/identity/bundle',
+    './platform/persistence/aggregator/bundle',
+    './platform/persistence/local/bundle',
+    './platform/persistence/queue/bundle',
+    './platform/policy/bundle',
+    './platform/entanglement/bundle',
+    './platform/search/bundle',
+    './platform/status/bundle',
+    './platform/commonUI/regions/bundle'
+], function (Main, legacyRegistry) {
+    return {
+        legacyRegistry: legacyRegistry,
+        run: function () {
+            return new Main().run(legacyRegistry);
+        }
+    };
+});
 ```
-__index.html__
+__main.js__
 
 #### After
 
 ```diff
-<!--
- Open MCT, Copyright (c) 2014-2016, United States Government
- as represented by the Administrator of the National Aeronautics and Space
- Administration. All rights reserved.
+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",
+        "es6-promise": "bower_components/es6-promise/promise.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"
+    },
+    "shim": {
+        "angular": {
+            "exports": "angular"
+        },
+        "angular-route": {
+            "deps": [ "angular" ]
+        },
+        "moment-duration-format": {
+            "deps": [ "moment" ]
+        },
+        "screenfull": {
+            "exports": "screenfull"
+        },
+        "zepto": {
+            "exports": "Zepto"
+        }
+    }
+});
 
- 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.
--->
-<!doctype html>
-<html lang="en">
-<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>
-        require([
-            'openmct',
-+           'tutorials/todo/bundle'
-        ], function (openmct) {
-            [
-                'example/imagery',
-                'example/eventGenerator',
-                'example/generator',
-                'platform/features/my-items',
-                'platform/persistence/local',
-+               'tutorials/todo'
-            ].forEach(
-                openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
-            );
-            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>
+define([
+    './platform/framework/src/Main',
+    'legacyRegistry',
 
+    './platform/framework/bundle',
+    './platform/core/bundle',
+    './platform/representation/bundle',
+    './platform/commonUI/about/bundle',
+    './platform/commonUI/browse/bundle',
+    './platform/commonUI/edit/bundle',
+    './platform/commonUI/dialog/bundle',
+    './platform/commonUI/formats/bundle',
+    './platform/commonUI/general/bundle',
+    './platform/commonUI/inspect/bundle',
+    './platform/commonUI/mobile/bundle',
+    './platform/commonUI/themes/espresso/bundle',
+    './platform/commonUI/notification/bundle',
+    './platform/containment/bundle',
+    './platform/execution/bundle',
+    './platform/exporters/bundle',
+    './platform/telemetry/bundle',
+    './platform/features/clock/bundle',
+    './platform/features/imagery/bundle',
+    './platform/features/layout/bundle',
+    './platform/features/pages/bundle',
+    './platform/features/plot/bundle',
+    './platform/features/timeline/bundle',
+    './platform/features/table/bundle',
+    './platform/forms/bundle',
+    './platform/identity/bundle',
+    './platform/persistence/aggregator/bundle',
+    './platform/persistence/local/bundle',
+    './platform/persistence/queue/bundle',
+    './platform/policy/bundle',
+    './platform/entanglement/bundle',
+    './platform/search/bundle',
+    './platform/status/bundle',
+    './platform/commonUI/regions/bundle',
+    
++   './tutorials/todo/bundle'
+], function (Main, legacyRegistry) {
+    return {
+        legacyRegistry: legacyRegistry,
+        run: function () {
+            return new Main().run(legacyRegistry);
+        }
+    };
+});
 ```    
-__index.html__
+__main.js__
 
 At this point, we can reload Open MCT. We haven't introduced any new 
 functionality, so we don't see anything different, but if we run with logging 
@@ -307,11 +349,11 @@ our bundle definition:
 
 ```diff
 define([
-    'openmct'
+    'legacyRegistry'
 ], function (
-    openmct
+    legacyRegistry
 ) {
-    openmct.legacyRegistry.register("tutorials/todo", {
+    legacyRegistry.register("tutorials/todo", {
         "name": "To-do Plugin",
         "description": "Allows creating and editing to-do lists.",
         "extensions":
@@ -320,7 +362,7 @@ define([
 +          {
 +              "key": "example.todo",
 +              "name": "To-Do List",
-+              "cssclass": "icon-check",
++              "glyph": "2",
 +              "description": "A list of things that need to be done.",
 +              "features": ["creation"]
 +          }
@@ -403,11 +445,11 @@ definition:
 
 ```diff
 define([
-    'openmct'
+    'legacyRegistry'
 ], function (
-    openmct
+    legacyRegistry
 ) {
-    openmct.legacyRegistry.register("tutorials/todo", {
+    legacyRegistry.register("tutorials/todo", {
     "name": "To-do Plugin",
     "description": "Allows creating and editing to-do lists.",
     "extensions": {
@@ -415,7 +457,7 @@ define([
             {
                 "key": "example.todo",
                 "name": "To-Do List",
-                "cssclass": "icon-check",
+                "glyph": "2",
                 "description": "A list of things that need to be done.",
                 "features": ["creation"]
             }
@@ -424,7 +466,7 @@ define([
 +           {
 +               "key": "example.todo",
 +               "type": "example.todo",
-+               "cssclass": "icon-check",
++               "glyph": "2",
 +               "name": "List",
 +               "templateUrl": "templates/todo.html",
 +               "editable": true
@@ -460,11 +502,11 @@ definition of that type.
 
 ```diff
 define([
-    'openmct'
+    'legacyRegistry'
 ], function (
-    openmct
+    legacyRegistry
 ) {
-    openmct.legacyRegistry.register("tutorials/todo", {
+    legacyRegistry.register("tutorials/todo", {
     "name": "To-do Plugin",
     "description": "Allows creating and editing to-do lists.",
     "extensions": {
@@ -472,7 +514,7 @@ define([
             {
                 "key": "example.todo",
                 "name": "To-Do List",
-                "cssclass": "icon-check",
+                "glyph": "2",
                 "description": "A list of things that need to be done.",
                 "features": ["creation"],
 +               "model": {
@@ -487,7 +529,7 @@ define([
             {
                 "key": "example.todo",
                 "type": "example.todo",
-                "cssclass": "icon-check",
+                "glyph": "2",
                 "name": "List",
                 "templateUrl": "templates/todo.html",
                 "editable": true
@@ -632,13 +674,13 @@ it in our bundle definition, as an extension of category `controllers`:
 
 ```diff
 define([
-    'openmct',
-+    './src/controllers/TodoController'
+    'legacyRegistry',
+    './src/controllers/TodoController'
 ], function (
-    openmct,
-+    TodoController
+    legacyRegistry,
+    TodoController
 ) {
-    openmct.legacyRegistry.register("tutorials/todo", {
+    legacyRegistry.register("tutorials/todo", {
     "name": "To-do Plugin",
     "description": "Allows creating and editing to-do lists.",
     "extensions": {
@@ -646,7 +688,7 @@ define([
             {
                 "key": "example.todo",
                 "name": "To-Do List",
-                "cssclass": "icon-check",
+                "glyph": "2",
                 "description": "A list of things that need to be done.",
                 "features": ["creation"],
                 "model": {
@@ -661,7 +703,7 @@ define([
             {
                 "key": "example.todo",
                 "type": "example.todo",
-                "cssclass": "icon-check",
+                "glyph": "2",
                 "name": "List",
                 "templateUrl": "templates/todo.html",
                 "editable": true
@@ -726,13 +768,13 @@ extension definition.
 
 ```diff
 define([
-    'openmct',
+    'legacyRegistry',
     './src/controllers/TodoController'
 ], function (
-    openmct,
+    legacyRegistry,
     TodoController
 ) {
-    openmct.legacyRegistry.register("tutorials/todo", {
+    legacyRegistry.register("tutorials/todo", {
     "name": "To-do Plugin",
     "description": "Allows creating and editing to-do lists.",
     "extensions": {
@@ -740,7 +782,7 @@ define([
             {
                 "key": "example.todo",
                 "name": "To-Do List",
-                "cssclass": "icon-check",
+                "glyph": "2",
                 "description": "A list of things that need to be done.",
                 "features": ["creation"],
                 "model": {
@@ -755,7 +797,7 @@ define([
             {
                 "key": "example.todo",
                 "type": "example.todo",
-                "cssclass": "icon-check",
+                "glyph": "2",
                 "name": "List",
                 "templateUrl": "templates/todo.html",
                 "editable": true,
@@ -765,7 +807,7 @@ define([
 +                           "items": [
 +                               {
 +                                   "text": "Add Task",
-+                                   "cssclass": "icon-plus",
++                                   "glyph": "+",
 +                                   "method": "addTask",
 +                                   "control": "button"
 +                               }
@@ -774,7 +816,7 @@ define([
 +                       {
 +                           "items": [
 +                               {
-+                                   "cssclass": "icon-trash",
++                                   "glyph": "Z",
 +                                   "method": "removeTask",
 +                                   "control": "button"
 +                               }
@@ -956,13 +998,13 @@ declare that dependency in its extension definition:
 
 ```diff
 define([
-    'openmct',
+    'legacyRegistry',
     './src/controllers/TodoController'
 ], function (
-    openmct,
+    legacyRegistry,
     TodoController
 ) {
-    openmct.legacyRegistry.register("tutorials/todo", {
+    legacyRegistry.register("tutorials/todo", {
     "name": "To-do Plugin",
     "description": "Allows creating and editing to-do lists.",
     "extensions": {
@@ -970,7 +1012,7 @@ define([
             {
                 "key": "example.todo",
                 "name": "To-Do List",
-                "cssclass": "icon-check",
+                "glyph": "2",
                 "description": "A list of things that need to be done.",
                 "features": ["creation"],
                 "model": {
@@ -985,7 +1027,7 @@ define([
             {
                 "key": "example.todo",
                 "type": "example.todo",
-                "cssclass": "icon-check",
+                "glyph": "2",
                 "name": "List",
                 "templateUrl": "templates/todo.html",
                 "editable": true,
@@ -995,7 +1037,7 @@ define([
                             "items": [
                                 {
                                     "text": "Add Task",
-                                    "cssclass": "icon-plus",
+                                    "glyph": "+",
                                     "method": "addTask",
                                     "control": "button"
                                 }
@@ -1004,7 +1046,7 @@ define([
                         {
                             "items": [
                                 {
-                                    "cssclass": "icon-trash",
+                                    "glyph": "Z",
                                     "method": "removeTask",
                                     "control": "button"
                                 }
@@ -1221,13 +1263,13 @@ declare it in our bundle definition, this time as an extension of category
 
 ```diff
 define([
-    'openmct',
+    'legacyRegistry',
     './src/controllers/TodoController'
 ], function (
-    openmct,
+    legacyRegistry,
     TodoController
 ) {
-    openmct.legacyRegistry.register("tutorials/todo", {
+    legacyRegistry.register("tutorials/todo", {
     "name": "To-do Plugin",
     "description": "Allows creating and editing to-do lists.",
     "extensions": {
@@ -1235,7 +1277,7 @@ define([
             {
                 "key": "example.todo",
                 "name": "To-Do List",
-                "cssclass": "icon-check",
+                "glyph": "2",
                 "description": "A list of things that need to be done.",
                 "features": ["creation"],
                 "model": {
@@ -1247,7 +1289,7 @@ define([
             {
                 "key": "example.todo",
                 "type": "example.todo",
-                "cssclass": "icon-check",
+                "glyph": "2",
                 "name": "List",
                 "templateUrl": "templates/todo.html",
                 "editable": true,
@@ -1257,7 +1299,7 @@ define([
                             "items": [
                                 {
                                     "text": "Add Task",
-                                    "cssclass": "icon-plus",
+                                    "glyph": "+",
                                     "method": "addTask",
                                     "control": "button"
                                 }
@@ -1266,7 +1308,7 @@ define([
                         {
                             "items": [
                                 {
-                                    "cssclass": "icon-trash",
+                                    "glyph": "Z",
                                     "method": "removeTask",
                                     "control": "button"
                                 }
@@ -1361,11 +1403,11 @@ bundle definition looks like:
 
 ```diff
 define([
-    'openmct'
+    'legacyRegistry'
 ], function (
-    openmct
+    legacyRegistry
 ) {
-    openmct.legacyRegistry.register("tutorials/bargraph", {
+    legacyRegistry.register("tutorials/bargraph", {
     "name": "Bar Graph",
     "description": "Provides the Bar Graph view of telemetry elements.",
     "extensions": {
@@ -1373,7 +1415,7 @@ define([
             {
                 "name": "Bar Graph",
                 "key": "example.bargraph",
-                "cssclass": "icon-autoflow-tabular",
+                "glyph": "H",
                 "templateUrl": "templates/bargraph.html",
                 "needs": [ "telemetry" ],
                 "delegation": true
@@ -1531,7 +1573,7 @@ The corresponding CSS file which styles and positions these elements:
 ```
 __tutorials/bargraph/res/css/bargraph.css__
 
-This is already enough that, if we add `"tutorials/bargraph"` to `index.html`, 
+This is already enough that, if we add `"tutorials/bargraph"` to `main.js`, 
 we should be able to run Open MCT and see our Bar Graph as an available view 
 for domain objects which provide telemetry (such as the example 
 _Sine Wave Generator_) as well as for _Telemetry Panel_ objects:
@@ -1662,13 +1704,13 @@ service we made use of.
 
 ```diff
 define([
-    'openmct',
+    'legacyRegistry',
     './src/controllers/BarGraphController'
 ], function (
-    openmct,
+    legacyRegistry,
     BarGraphController
 ) {
-    openmct.legacyRegistry.register("tutorials/bargraph", {
+    legacyRegistry.register("tutorials/bargraph", {
     "name": "Bar Graph",
     "description": "Provides the Bar Graph view of telemetry elements.",
     "extensions": {
@@ -1676,7 +1718,7 @@ define([
             {
                 "name": "Bar Graph",
                 "key": "example.bargraph",
-                "cssclass": "icon-autoflow-tabular",
+                "glyph": "H",
                 "templateUrl": "templates/bargraph.html",
                 "needs": [ "telemetry" ],
                 "delegation": true
@@ -1828,13 +1870,13 @@ First, let's add a tool bar for changing these three values in Edit mode:
 
 ```diff
 define([
-    'openmct',
+    'legacyRegistry',
     './src/controllers/BarGraphController'
 ], function (
-    openmct,
+    legacyRegistry,
     BarGraphController
 ) {
-    openmct.legacyRegistry.register("tutorials/bargraph", {
+    legacyRegistry.register("tutorials/bargraph", {
     "name": "Bar Graph",
     "description": "Provides the Bar Graph view of telemetry elements.",
     "extensions": {
@@ -1842,7 +1884,7 @@ define([
             {
                 "name": "Bar Graph",
                 "key": "example.bargraph",
-                "cssclass": "icon-autoflow-tabular",
+                "glyph": "H",
                 "templateUrl": "templates/bargraph.html",
                 "needs": [ "telemetry" ],
                 "delegation": true,
@@ -2308,33 +2350,27 @@ will retrieve from the server.)
 
 ```diff
 define([
-    'openmct'
+    'legacyRegistry'
 ], function (
-    openmct
+    legacyRegistry
 ) {
-    openmct.legacyRegistry.register("tutorials/telemetry", {
+    legacyRegistry.register("tutorials/telemetry", {
         "name": "Example Telemetry Adapter",
         "extensions": {
             "types": [
                 {
                     "name": "Spacecraft",
                     "key": "example.spacecraft",
-                    "cssclass": "icon-object"
+                    "glyph": "o"
                 }
             ],
             "roots": [
                 {
                     "id": "example:sc",
-                    "priority": "preferred"
-                }
-            ],
-            "models": [
-                {
-                    "id": "example:sc",
+                    "priority": "preferred",
                     "model": {
                         "type": "example.spacecraft",
                         "name": "My Spacecraft",
-                        "location": "ROOT",
                         "composition": []
                     }
                 }
@@ -2353,70 +2389,91 @@ preferred so that this shows up near the top, instead of below My Items.
 
 If we include this in our set of active bundles:
 
-```html
-<!--
- Open MCT, Copyright (c) 2014-2016, United States Government
- as represented by the Administrator of the National Aeronautics and Space
- Administration. All rights reserved.
+```diff
+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",
+        "es6-promise": "bower_components/es6-promise/promise.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"
+    },
+    "shim": {
+        "angular": {
+            "exports": "angular"
+        },
+        "angular-route": {
+            "deps": [ "angular" ]
+        },
+        "moment-duration-format": {
+            "deps": [ "moment" ]
+        },
+        "screenfull": {
+            "exports": "screenfull"
+        },
+        "zepto": {
+            "exports": "Zepto"
+        }
+    }
+});
 
- 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.
--->
-<!doctype html>
-<html lang="en">
-<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>
-        require([
-            'openmct',
-            './tutorials/telemetry/bundle'
-        ], function (openmct) {
-            [
-                'example/imagery',
-                'example/eventGenerator',
-                'example/generator',
-                'platform/features/my-items',
-                'platform/persistence/local',
-                'tutorials/telemetry'
-            ].forEach(
-                openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
-            );
-            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>
+define([
+    './platform/framework/src/Main',
+    'legacyRegistry',
 
+    './platform/framework/bundle',
+    './platform/core/bundle',
+    './platform/representation/bundle',
+    './platform/commonUI/about/bundle',
+    './platform/commonUI/browse/bundle',
+    './platform/commonUI/edit/bundle',
+    './platform/commonUI/dialog/bundle',
+    './platform/commonUI/formats/bundle',
+    './platform/commonUI/general/bundle',
+    './platform/commonUI/inspect/bundle',
+    './platform/commonUI/mobile/bundle',
+    './platform/commonUI/themes/espresso/bundle',
+    './platform/commonUI/notification/bundle',
+    './platform/containment/bundle',
+    './platform/execution/bundle',
+    './platform/exporters/bundle',
+    './platform/telemetry/bundle',
+    './platform/features/clock/bundle',
+    './platform/features/imagery/bundle',
+    './platform/features/layout/bundle',
+    './platform/features/pages/bundle',
+    './platform/features/plot/bundle',
+    './platform/features/timeline/bundle',
+    './platform/features/table/bundle',
+    './platform/forms/bundle',
+    './platform/identity/bundle',
+    './platform/persistence/aggregator/bundle',
+    './platform/persistence/local/bundle',
+    './platform/persistence/queue/bundle',
+    './platform/policy/bundle',
+    './platform/entanglement/bundle',
+    './platform/search/bundle',
+    './platform/status/bundle',
+    './platform/commonUI/regions/bundle',
+    
++   './tutorials/telemetry/bundle'
+], function (Main, legacyRegistry) {
+    return {
+        legacyRegistry: legacyRegistry,
+        run: function () {
+            return new Main().run(legacyRegistry);
+        }
+    };
+});
 ```
-__index.html__
+__main.js__
 
 ...we will be able to reload Open MCT and see that it is present:
 
@@ -2688,35 +2745,35 @@ with the platform):
 
 ```diff
 define([
-    'openmct',
+    'legacyRegistry',
 +   './src/ExampleTelemetryServerAdapter',
 +   './src/ExampleTelemetryInitializer',
 +   './src/ExampleTelemetryModelProvider'
 ], function (
-    openmct,
+    legacyRegistry,
 +   ExampleTelemetryServerAdapter,
 +   ExampleTelemetryInitializer,
 +   ExampleTelemetryModelProvider
 ) {
-    openmct.legacyRegistry.register("tutorials/telemetry", {
+    legacyRegistry.register("tutorials/telemetry", {
     "name": "Example Telemetry Adapter",
     "extensions": {
         "types": [
             {
                 "name": "Spacecraft",
                 "key": "example.spacecraft",
-                "cssclass": "icon-object"
+                "glyph": "o"
             },
 +           {
 +               "name": "Subsystem",
 +               "key": "example.subsystem",
-+               "cssclass": "icon-object",
++               "glyph": "o",
 +               "model": { "composition": [] }
 +           },
 +           {
 +               "name": "Measurement",
 +               "key": "example.measurement",
-+               "cssclass": "icon-telemetry",
++               "glyph": "T",
 +               "model": { "telemetry": {} },
 +               "telemetry": {
 +                   "source": "example.source",
@@ -2733,15 +2790,9 @@ define([
             {
                 "id": "example:sc",
                 "priority": "preferred",
-            }
-        ],
-        "models": [
-            {
-                "id": "example:sc",
                 "model": {
                     "type": "example.spacecraft",
                     "name": "My Spacecraft",
-                    "location": "ROOT",
                     "composition": []
                 }
             }
@@ -2897,7 +2948,7 @@ will implement:
 /*global define*/
 
 define(
-    ['./ExampleTelemetrySeries'],
+    ['./src/ExampleTelemetrySeries'],
     function (ExampleTelemetrySeries) {
         "use strict";
 
@@ -3013,35 +3064,35 @@ Finally, we expose this `telemetryService` provider declaratively:
 
 ```diff
 define([
-    'openmct',
+    'legacyRegistry',
     './src/ExampleTelemetryServerAdapter',
     './src/ExampleTelemetryInitializer',
     './src/ExampleTelemetryModelProvider'
 ], function (
-    openmct,
+    legacyRegistry,
     ExampleTelemetryServerAdapter,
     ExampleTelemetryInitializer,
     ExampleTelemetryModelProvider
 ) {
-    openmct.legacyRegistry.register("tutorials/telemetry", {
+    legacyRegistry.register("tutorials/telemetry", {
     "name": "Example Telemetry Adapter",
     "extensions": {
         "types": [
             {
                 "name": "Spacecraft",
                 "key": "example.spacecraft",
-                "cssclass": "icon-object"
+                "glyph": "o"
             },
             {
                 "name": "Subsystem",
                 "key": "example.subsystem",
-                "cssclass": "icon-object",
+                "glyph": "o",
                 "model": { "composition": [] }
             },
             {
                 "name": "Measurement",
                 "key": "example.measurement",
-                "cssclass": "icon-telemetry",
+                "glyph": "T",
                 "model": { "telemetry": {} },
                 "telemetry": {
                     "source": "example.source",
@@ -3057,16 +3108,10 @@ define([
         "roots": [
             {
                 "id": "example:sc",
-                "priority": "preferred"
-            }
-        ],
-        "models": [
-            {
-                "id": "example:sc",
+                "priority": "preferred",
                 "model": {
                     "type": "example.spacecraft",
                     "name": "My Spacecraft",
-                    "location": "ROOT",
                     "composition": []
                 }
             }
@@ -3203,7 +3248,7 @@ We then need only to utilize these methods from our `telemetryService`:
 /*global define*/
 
 define(
-    ['./ExampleTelemetrySeries'],
+    ['./src/ExampleTelemetrySeries'],
     function (ExampleTelemetrySeries) {
         "use strict";
 
@@ -3305,4 +3350,3 @@ server can handle this.)
 Running Open MCT again, we can still plot our historical telemetry - but 
 now we also see that it updates in real-time as more data comes in from the 
 server.
- 

example/generator/bundle.js

@@ -99,7 +99,7 @@ define([
                         "source": "generator",
                         "domains": [
                             {
-                                "key": "utc",
+                                "key": "time",
                                 "name": "Time"
                             },
                             {

example/localTimeSystem/bundle.js

@@ -1,48 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web 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 Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define([
-    "./src/LocalTimeSystem",
-    "./src/LocalTimeFormat",
-    'legacyRegistry'
-], function (
-    LocalTimeSystem,
-    LocalTimeFormat,
-    legacyRegistry
-) {
-    legacyRegistry.register("example/localTimeSystem", {
-        "extensions": {
-            "formats": [
-                {
-                    "key": "local-format",
-                    "implementation": LocalTimeFormat
-                }
-            ],
-            "timeSystems": [
-                {
-                    "implementation": LocalTimeSystem,
-                    "depends": ["$timeout"]
-                }
-            ]
-        }
-    });
-});

example/localTimeSystem/src/LADTickSource.js

@@ -1,43 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web 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 Web 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(['../../../platform/features/conductor/core/src/timeSystems/LocalClock'], function (LocalClock) {
-    /**
-     * @implements TickSource
-     * @constructor
-     */
-    function LADTickSource ($timeout, period) {
-        LocalClock.call(this, $timeout, period);
-
-        this.metadata = {
-            key: 'test-lad',
-            mode: 'lad',
-            cssclass: 'icon-clock',
-            label: 'Latest Available Data',
-            name: 'Latest available data',
-            description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.'
-        };
-    }
-    LADTickSource.prototype = Object.create(LocalClock.prototype);
-
-    return LADTickSource;
-});

example/localTimeSystem/src/LocalTimeFormat.js

@@ -1,112 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web 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 Web 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([
-    'moment'
-], function (
-    moment
-) {
-
-    var DATE_FORMAT = "YYYY-MM-DD h:mm:ss.SSS a",
-        DATE_FORMATS = [
-            DATE_FORMAT,
-            "YYYY-MM-DD h:mm:ss a",
-            "YYYY-MM-DD h:mm a",
-            "YYYY-MM-DD"
-        ];
-
-    /**
-     * @typedef Scale
-     * @property {number} min the minimum scale value, in ms
-     * @property {number} max the maximum scale value, in ms
-     */
-
-    /**
-     * Formatter for UTC timestamps. Interprets numeric values as
-     * milliseconds since the start of 1970.
-     *
-     * @implements {Format}
-     * @constructor
-     * @memberof platform/commonUI/formats
-     */
-    function LocalTimeFormat() {
-    }
-
-    /**
-     * Returns an appropriate time format based on the provided value and
-     * the threshold required.
-     * @private
-     */
-    function getScaledFormat (d) {
-        var m = moment.utc(d);
-        /**
-         * Uses logic from d3 Time-Scales, v3 of the API. See
-         * https://github.com/d3/d3-3.x-api-reference/blob/master/Time-Scales.md
-         *
-         * Licensed
-         */
-        return [
-            [".SSS", function(m) { return m.milliseconds(); }],
-            [":ss", function(m) { return m.seconds(); }],
-            ["hh:mma", function(m) { return m.minutes(); }],
-            ["hha", function(m) { return m.hours(); }],
-            ["ddd DD", function(m) {
-                return m.days() &&
-                    m.date() != 1;
-            }],
-            ["MMM DD", function(m) { return m.date() != 1; }],
-            ["MMMM", function(m) {
-                return m.month();
-            }],
-            ["YYYY", function() { return true; }]
-        ].filter(function (row){
-            return row[1](m);
-        })[0][0];
-    };
-
-    /**
-     *
-     * @param value
-     * @param {Scale} [scale] Optionally provides context to the
-     * format request, allowing for scale-appropriate formatting.
-     * @returns {string} the formatted date
-     */
-    LocalTimeFormat.prototype.format = function (value, scale) {
-        if (scale !== undefined){
-            var scaledFormat = getScaledFormat(value, scale);
-            if (scaledFormat) {
-                return moment.utc(value).format(scaledFormat);
-            }
-        }
-        return moment(value).format(DATE_FORMAT);
-    };
-
-    LocalTimeFormat.prototype.parse = function (text) {
-        return moment(text, DATE_FORMATS).valueOf();
-    };
-
-    LocalTimeFormat.prototype.validate = function (text) {
-        return moment(text, DATE_FORMATS).isValid();
-    };
-
-    return LocalTimeFormat;
-});

example/localTimeSystem/src/LocalTimeSystem.js

@@ -1,79 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web 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 Web 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([
-    '../../../platform/features/conductor/core/src/timeSystems/TimeSystem',
-    '../../../platform/features/conductor/core/src/timeSystems/LocalClock',
-    './LADTickSource'
-], function (TimeSystem, LocalClock, LADTickSource) {
-    var THIRTY_MINUTES = 30 * 60 * 1000,
-        DEFAULT_PERIOD = 1000;
-
-    /**
-     * This time system supports UTC dates and provides a ticking clock source.
-     * @implements TimeSystem
-     * @constructor
-     */
-    function LocalTimeSystem ($timeout) {
-        TimeSystem.call(this);
-
-        /**
-         * Some metadata, which will be used to identify the time system in
-         * the UI
-         * @type {{key: string, name: string, glyph: string}}
-         */
-        this.metadata = {
-            'key': 'local',
-            'name': 'Local',
-            'glyph': '\u0043'
-        };
-
-        this.fmts = ['local-format'];
-        this.sources = [new LocalClock($timeout, DEFAULT_PERIOD), new LADTickSource($timeout, DEFAULT_PERIOD)];
-    }
-
-    LocalTimeSystem.prototype = Object.create(TimeSystem.prototype);
-
-    LocalTimeSystem.prototype.formats = function () {
-        return this.fmts;
-    };
-
-    LocalTimeSystem.prototype.deltaFormat = function () {
-        return 'duration';
-    };
-
-    LocalTimeSystem.prototype.tickSources = function () {
-        return this.sources;
-    };
-
-    LocalTimeSystem.prototype.defaults = function (key) {
-        var now = Math.ceil(Date.now() / 1000) * 1000;
-        return {
-            key: 'local-default',
-            name: 'Local 12 hour time system defaults',
-            deltas: {start: THIRTY_MINUTES, end: 0},
-            bounds: {start: now - THIRTY_MINUTES, end: now}
-        };
-    };
-
-    return LocalTimeSystem;
-});

example/msl/bundle.js

@@ -23,18 +23,20 @@
 
 define([
     "./src/RemsTelemetryServerAdapter",
+    "./src/RemsTelemetryInitializer",
     "./src/RemsTelemetryModelProvider",
     "./src/RemsTelemetryProvider",
     'legacyRegistry',
     "module"
 ], function (
     RemsTelemetryServerAdapter,
+    RemsTelemetryInitializer,
     RemsTelemetryModelProvider,
     RemsTelemetryProvider,
     legacyRegistry
 ) {
     "use strict";
-    legacyRegistry.register("example/msl", {
+    legacyRegistry.register("example/notifications", {
         "name" : "Mars Science Laboratory Data Adapter",
         "extensions" : {
         "types": [
@@ -59,7 +61,7 @@ define([
                     "domains": [
                         {
                             "name": "Time",
-                            "key": "utc",
+                            "key": "timestamp",
                             "format": "utc"
                         }
                     ]
@@ -79,7 +81,7 @@ define([
                 "model": {
                     "type": "msl.curiosity",
                     "name": "Mars Science Laboratory",
-                    "composition": ["msl_tlm:rems"]
+                    "composition": []
                 }
             }
         ],
@@ -90,6 +92,12 @@ define([
                 "depends": ["$q", "$http", "$log", "REMS_WS_URL"]
             }
         ],
+        "runs": [
+            {
+                "implementation": RemsTelemetryInitializer,
+                "depends": ["rems.adapter", "objectService"]
+            }
+        ],
         "components": [
             {
                 "provides": "modelService",

example/msl/src/RemsTelemetryInitializer.js

@@ -0,0 +1,71 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+/*global define*/
+
+define(
+    function (){
+        "use strict";
+
+        var TAXONOMY_ID = "msl:curiosity",
+            PREFIX = "msl_tlm:";
+
+        /**
+         * Function that is executed on application startup and populates
+         * the navigation tree with objects representing the MSL REMS
+         * telemetry points. The tree is populated based on the data
+         * dictionary on the provider.
+         *
+         * @param {RemsTelemetryServerAdapter} adapter The server adapter
+         * (necessary in order to retrieve data dictionary)
+         * @param objectService the ObjectService which allows for lookup of
+         * objects by ID
+         * @constructor
+         */
+        function RemsTelemetryInitializer(adapter, objectService) {
+            function makeId(element) {
+                return PREFIX + element.identifier;
+            }
+
+            function initializeTaxonomy(dictionary) {
+                function getTaxonomyObject(domainObjects) {
+                    return domainObjects[TAXONOMY_ID];
+                }
+
+                function populateModel (taxonomyObject) {
+                    return taxonomyObject.useCapability(
+                        "mutation",
+                        function (model) {
+                            model.name = dictionary.name;
+                            model.composition = dictionary.instruments.map(makeId);
+                        }
+                    );
+                }
+
+                objectService.getObjects([TAXONOMY_ID])
+                    .then(getTaxonomyObject)
+                    .then(populateModel);
+            }
+            initializeTaxonomy(adapter.dictionary);
+        }
+        return RemsTelemetryInitializer;
+    }
+);

gulpfile.js

@@ -21,34 +21,41 @@
  *****************************************************************************/
 
 /*global require,__dirname*/
-
 var gulp = require('gulp'),
+    requirejsOptimize = require('gulp-requirejs-optimize'),
     sourcemaps = require('gulp-sourcemaps'),
+    rename = require('gulp-rename'),
+    sass = require('gulp-sass'),
+    bourbon = require('node-bourbon'),
+    jshint = require('gulp-jshint'),
+    jscs = require('gulp-jscs'),
+    replace = require('gulp-replace-task'),
+    karma = require('karma'),
     path = require('path'),
     fs = require('fs'),
     git = require('git-rev-sync'),
     moment = require('moment'),
+    merge = require('merge-stream'),
     project = require('./package.json'),
     _ = require('lodash'),
     paths = {
-        main: 'openmct.js',
+        main: 'main.js',
         dist: 'dist',
+        assets: 'dist/assets',
         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' ],
+        scripts: [ 'main.js', 'platform/**/*.js', 'src/**/*.js' ],
         specs: [ 'platform/**/*Spec.js', 'src/**/*Spec.js' ],
+        static: [
+            'index.html',
+            'platform/**/*',
+            'example/**/*',
+            'bower_components/**/*'
+        ]
     },
     options = {
         requirejsOptimize: {
-            name: 'bower_components/almond/almond.js',
-            include: paths.main.replace('.js', ''),
-            wrap: {
-                startFile: "src/start.frag",
-                endFile: "src/end.frag"
-            },
+            name: paths.main.replace(/\.js$/, ''),
             mainConfigFile: paths.main,
             wrapShim: true
         },
@@ -57,6 +64,7 @@ var gulp = require('gulp'),
             singleRun: true
         },
         sass: {
+            includePaths: bourbon.includePaths,
             sourceComments: true
         },
         replace: {
@@ -70,8 +78,6 @@ var gulp = require('gulp'),
     };
 
 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))
@@ -81,16 +87,10 @@ gulp.task('scripts', function () {
 });
 
 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))
@@ -104,9 +104,6 @@ gulp.task('stylesheets', function () {
 });
 
 gulp.task('lint', function () {
-    var jshint = require('gulp-jshint');
-    var merge = require('merge-stream');
-
     var nonspecs = paths.specs.map(function (glob) {
             return "!" + glob;
         }),
@@ -125,36 +122,25 @@ gulp.task('lint', function () {
 });
 
 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)
+gulp.task('static', ['stylesheets'], function () {
+    return gulp.src(paths.static, { base: '.' })
         .pipe(gulp.dest(paths.dist));
 });
 
 gulp.task('watch', function () {
-    return gulp.watch(paths.scss, ['stylesheets', 'assets']);
+    gulp.watch(paths.scss, ['stylesheets']);
 });
 
 gulp.task('serve', function () {
@@ -164,7 +150,7 @@ gulp.task('serve', function () {
 
 gulp.task('develop', ['serve', 'stylesheets', 'watch']);
 
-gulp.task('install', [ 'assets', 'scripts' ]);
+gulp.task('install', [ 'static', 'scripts' ]);
 
 gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]);
 

index.html

@@ -28,17 +28,12 @@
     <script src="bower_components/requirejs/require.js">
     </script>
     <script>
-        require(['openmct'], function (openmct) {
-            [
-                'example/imagery',
-                'example/eventGenerator',
-                'example/generator',
-                'platform/features/my-items',
-                'platform/persistence/local'
-            ].forEach(
-                openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
-            );
-            openmct.start();
+        require(['main'], function (mct) {
+            require([
+                './example/imagery/bundle',
+                './example/eventGenerator/bundle',
+                './example/generator/bundle'
+            ], mct.run.bind(mct));
         });
     </script>
     <link rel="stylesheet" href="platform/commonUI/general/res/css/startup-base.css">
@@ -52,5 +47,7 @@
     <div class="l-splash-holder s-splash-holder">
         <div class="l-splash s-splash"></div>
     </div>
+
+    <div ng-view></div>
 </body>
 </html>

jsdoc.json

@@ -1,9 +1,9 @@
 {
     "source": {
         "include": [
-            "src/"
+            "platform/"
         ],
-        "includePattern": "src/.+\\.js$",
+        "includePattern": "platform/.+\\.js$",
         "excludePattern": ".+\\Spec\\.js$|lib/.+"
     },
     "plugins": [

karma.conf.js

@@ -37,11 +37,9 @@ module.exports = function(config) {
             {pattern: 'bower_components/**/*.js', included: false},
             {pattern: 'src/**/*.js', 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'
         ],
 

main.js

@@ -27,18 +27,16 @@ requirejs.config({
         "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",
+        "jsPDF": "bower_components/jspdf/dist/jspdf.debug",
         "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": "bower_components/d3/d3.min"
+        "zepto": "bower_components/zepto/zepto.min"
     },
     "shim": {
         "angular": {
@@ -47,12 +45,12 @@ requirejs.config({
         "angular-route": {
             "deps": ["angular"]
         },
-        "EventEmitter": {
-            "exports": "EventEmitter"
-        },
         "html2canvas": {
             "exports": "html2canvas"
         },
+        "jsPDF": {
+            "exports": "jsPDF"
+        },
         "moment-duration-format": {
             "deps": ["moment"]
         },
@@ -61,28 +59,54 @@ requirejs.config({
         },
         "zepto": {
             "exports": "Zepto"
-        },
-        "lodash": {
-            "exports": "lodash"
-        },
-        "d3": {
-            "exports": "d3"
         }
     }
 });
 
 define([
     './platform/framework/src/Main',
-    './src/defaultRegistry',
-    './src/MCT'
-], function (Main, defaultRegistry, MCT) {
-    var openmct = new MCT();
+    'legacyRegistry',
 
-    openmct.legacyRegistry = defaultRegistry;
-
-    openmct.on('start', function () {
-        return new Main().run(defaultRegistry);
-    });
-
-    return openmct;
+    './platform/framework/bundle',
+    './platform/core/bundle',
+    './platform/representation/bundle',
+    './platform/commonUI/about/bundle',
+    './platform/commonUI/browse/bundle',
+    './platform/commonUI/edit/bundle',
+    './platform/commonUI/dialog/bundle',
+    './platform/commonUI/formats/bundle',
+    './platform/commonUI/general/bundle',
+    './platform/commonUI/inspect/bundle',
+    './platform/commonUI/mobile/bundle',
+    './platform/commonUI/themes/espresso/bundle',
+    './platform/commonUI/notification/bundle',
+    './platform/containment/bundle',
+    './platform/execution/bundle',
+    './platform/exporters/bundle',
+    './platform/telemetry/bundle',
+    './platform/features/clock/bundle',
+    './platform/features/fixed/bundle',
+    './platform/features/imagery/bundle',
+    './platform/features/layout/bundle',
+    './platform/features/pages/bundle',
+    './platform/features/plot/bundle',
+    './platform/features/timeline/bundle',
+    './platform/features/table/bundle',
+    './platform/forms/bundle',
+    './platform/identity/bundle',
+    './platform/persistence/aggregator/bundle',
+    './platform/persistence/local/bundle',
+    './platform/persistence/queue/bundle',
+    './platform/policy/bundle',
+    './platform/entanglement/bundle',
+    './platform/search/bundle',
+    './platform/status/bundle',
+    './platform/commonUI/regions/bundle'
+], function (Main, legacyRegistry) {
+    return {
+        legacyRegistry: legacyRegistry,
+        run: function () {
+            return new Main().run(legacyRegistry);
+        }
+    };
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmct",
-  "version": "0.12.1-SNAPSHOT",
+  "version": "0.12.0-SNAPSHOT",
   "description": "The Open MCT core platform",
   "dependencies": {
     "express": "^4.13.1",
@@ -21,7 +21,6 @@
     "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",
     "jshint": "^2.7.0",
     "karma": "^0.13.3",
@@ -49,8 +48,8 @@
     "test": "karma start --single-run",
     "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'",
+    "jsdoc": "jsdoc -c jsdoc.json -r -d target/docs/api",
+    "otherdoc": "node docs/gendocs.js --in docs/src --out target/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",
     "docs": "npm run jsdoc ; npm run otherdoc",
     "prepublish": "node ./node_modules/bower/bin/bower install && node ./node_modules/gulp/bin/gulp.js install"
   },

platform/commonUI/browse/bundle.js

@@ -41,7 +41,6 @@ define([
     "text!./res/templates/items/items.html",
     "text!./res/templates/browse/object-properties.html",
     "text!./res/templates/browse/inspector-region.html",
-    "text!./res/templates/view-object.html",
     'legacyRegistry'
 ], function (
     BrowseController,
@@ -64,7 +63,6 @@ define([
     itemsTemplate,
     objectPropertiesTemplate,
     inspectorRegionTemplate,
-    viewObjectTemplate,
     legacyRegistry
 ) {
 
@@ -72,13 +70,14 @@ define([
         "extensions": {
             "routes": [
                 {
-                    "when": "/browse/:ids*?",
+                    "when": "/browse/:ids*",
                     "template": browseTemplate,
                     "reloadOnSearch": false
                 },
                 {
                     "when": "",
-                    "redirectTo": "/browse/"
+                    "template": browseTemplate,
+                    "reloadOnSearch": false
                 }
             ],
             "constants": [
@@ -143,7 +142,7 @@ define([
             "representations": [
                 {
                     "key": "view-object",
-                    "template": viewObjectTemplate
+                    "templateUrl": "templates/view-object.html"
                 },
                 {
                     "key": "browse-object",

platform/commonUI/browse/res/templates/browse-object.html

@@ -43,7 +43,7 @@
             </mct-representation>
         </div>
     </div>
-    <div class="holder l-flex-col flex-elem grows l-object-wrapper l-controls-visible l-time-controller-visible">
+    <div class="holder l-flex-col flex-elem grows l-object-wrapper">
         <div class="holder l-flex-col flex-elem grows l-object-wrapper-inner">
             <!-- Toolbar and Save/Cancel buttons -->
             <div class="l-edit-controls flex-elem l-flex-row flex-align-end">
@@ -59,5 +59,4 @@
             </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/object-header.html

@@ -22,8 +22,7 @@
 <span class='type-icon flex-elem {{type.getCssClass()}}'></span>
 <span class="l-elem-wrapper l-flex-row flex-elem grows">
     <span ng-if="parameters.mode" class='action flex-elem'>{{parameters.mode}}</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>
+    <span class='title-label flex-elem flex-can-shrink'>{{model.name}}</span>
     <mct-representation
         key="'menu-arrow'"
         mct-object='domainObject'

platform/commonUI/browse/src/BrowseController.js

@@ -28,6 +28,8 @@ define(
     [],
     function () {
 
+        var ROOT_ID = "ROOT";
+
         /**
          * The BrowseController is used to populate the initial scope in Browse
          * mode. It loads the root object from the objectService and makes it
@@ -47,21 +49,74 @@ define(
             urlService,
             defaultPath
         ) {
-            var initialPath = ($route.current.params.ids || defaultPath).split("/");
+            var path = [ROOT_ID].concat(
+                ($route.current.params.ids || defaultPath).split("/")
+            );
 
-            var currentIds = $route.current.params.ids;
+            function updateRoute(domainObject) {
+                var priorRoute = $route.current,
+                    // Act as if params HADN'T changed to avoid page reload
+                    unlisten;
 
-            $scope.treeModel = {
-                selectedObject: undefined
-            };
+                unlisten = $scope.$on('$locationChangeSuccess', function () {
+                    // Checks path to make sure /browse/ is at front
+                    // if so, change $route.current
+                    if ($location.path().indexOf("/browse/") === 0) {
+                        $route.current = priorRoute;
+                    }
+                    unlisten();
+                });
+                // urlService.urlForLocation used to adjust current
+                // path to new, addressed, path based on
+                // domainObject
+                $location.path(urlService.urlForLocation("browse", domainObject));
 
-            function idsForObject(domainObject) {
-                return urlService
-                    .urlForLocation("", domainObject)
-                    .replace('/', '');
             }
 
-            // Find an object in an array of objects.
+            function setScopeObjects(domainObject, navigationAllowed) {
+                if (navigationAllowed) {
+                    $scope.navigatedObject = domainObject;
+                    $scope.treeModel.selectedObject = domainObject;
+                    updateRoute(domainObject);
+                } else {
+                    //If navigation was unsuccessful (ie. blocked), reset
+                    // the selected object in the tree to the currently
+                    // navigated object
+                    $scope.treeModel.selectedObject = $scope.navigatedObject ;
+                }
+            }
+
+            // Callback for updating the in-scope reference to the object
+            // that is currently navigated-to.
+            function setNavigation(domainObject) {
+                if (domainObject === $scope.navigatedObject) {
+                    //do nothing;
+                    return;
+                }
+                if (domainObject) {
+                    domainObject.getCapability("action").perform("navigate").then(setScopeObjects.bind(undefined, domainObject));
+                } else {
+                    setScopeObjects(domainObject, true);
+                }
+            }
+
+            function navigateTo(domainObject) {
+
+                // Check if an object has been navigated-to already...
+                // If not, or if an ID path has been explicitly set in the URL,
+                // navigate to the URL-specified object.
+                if (!navigationService.getNavigation() || $route.current.params.ids) {
+                    // If not, pick a default as the last
+                    // root-level component (usually "mine")
+                    navigationService.setNavigation(domainObject);
+                    $scope.navigatedObject = domainObject;
+                } else {
+                    // Otherwise, just expose the currently navigated object.
+                    $scope.navigatedObject = navigationService.getNavigation();
+                    updateRoute($scope.navigatedObject);
+                }
+            }
+
             function findObject(domainObjects, id) {
                 var i;
                 for (i = 0; i < domainObjects.length; i += 1) {
@@ -71,96 +126,63 @@ define(
                 }
             }
 
-            // helper, fetch a single object from the object service.
-            function getObject(id) {
-                return objectService.getObjects([id])
-                    .then(function (results) {
-                        return results[id];
-                    });
-            }
-
-            // recursively locate and return an object inside of a container
-            // via a path.  If at any point in the recursion it fails to find
-            // the next object, it will return the parent.
-            function findViaComposition(containerObject, path) {
-                var nextId = path.shift();
-                if (!nextId) {
-                    return containerObject;
-                }
-                return containerObject.useCapability('composition')
-                    .then(function (composees) {
-                        var nextObject = findObject(composees, nextId);
-                        if (!nextObject) {
-                            return containerObject;
+            // Navigate to the domain object identified by path[index],
+            // which we expect to find in the composition of the passed
+            // domain object.
+            function doNavigate(domainObject, index) {
+                var composition = domainObject.useCapability("composition");
+                if (composition) {
+                    composition.then(function (c) {
+                        var nextObject = findObject(c, path[index]);
+                        if (nextObject) {
+                            if (index + 1 >= path.length) {
+                                navigateTo(nextObject);
+                            } else {
+                                doNavigate(nextObject, index + 1);
+                            }
+                        } else if (index === 1 && c.length > 0) {
+                            // Roots are in a top-level container that we don't
+                            // want to be selected, so if we couldn't find an
+                            // object at the path we wanted, at least select
+                            // one of its children.
+                            navigateTo(c[c.length - 1]);
+                        } else {
+                            // Couldn't find the next element of the path
+                            // so navigate to the last path object we did find
+                            navigateTo(domainObject);
                         }
-                        if (!nextObject.hasCapability('composition')) {
-                            return nextObject;
-                        }
-                        return findViaComposition(nextObject, path);
                     });
-            }
-
-            function navigateToObject(desiredObject) {
-                $scope.navigatedObject = desiredObject;
-                $scope.treeModel.selectedObject = desiredObject;
-                navigationService.setNavigation(desiredObject);
-                currentIds = idsForObject(desiredObject);
-                $route.current.pathParams.ids = currentIds;
-                $location.path('/browse/' + currentIds);
-            }
-
-            function navigateToPath(path) {
-                return getObject('ROOT')
-                    .then(function (root) {
-                        return findViaComposition(root, path);
-                    })
-                    .then(navigateToObject);
-            }
-
-
-            getObject('ROOT')
-                .then(function (root) {
-                    $scope.domainObject = root;
-                    navigateToPath(initialPath);
-                });
-
-            // Handle navigation events from view service.  Only navigates
-            // if path has changed.
-            function navigateDirectlyToModel(domainObject) {
-                var newIds = idsForObject(domainObject);
-                if (currentIds !== newIds) {
-                    currentIds = newIds;
-                    navigateToObject(domainObject);
+                } else {
+                    // Similar to above case; this object has no composition,
+                    // so navigate to it instead of subsequent path elements.
+                    navigateTo(domainObject);
                 }
             }
 
+            // Load the root object, put it in the scope.
+            // Also, load its immediate children, and (possibly)
+            // navigate to one of them, so that navigation state has
+            // a useful initial value.
+            objectService.getObjects([path[0]]).then(function (objects) {
+                $scope.domainObject = objects[path[0]];
+                doNavigate($scope.domainObject, 1);
+            });
+
+            // Provide a model for the tree to modify
+            $scope.treeModel = {
+                selectedObject: navigationService.getNavigation()
+            };
+
             // Listen for changes in navigation state.
-            navigationService.addListener(navigateDirectlyToModel);
+            navigationService.addListener(setNavigation);
 
             // Also listen for changes which come from the tree. Changes in
             // the tree will trigger a change in browse navigation state.
-            $scope.$watch("treeModel.selectedObject", function (newObject, oldObject) {
-                if (oldObject !== newObject) {
-                    navigateDirectlyToModel(newObject);
-                }
-            });
-
-
-            // Listen for route changes which are caused by browser events
-            // (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) {
-                if (route.$$route === $route.current.$$route &&
-                    route.pathParams.ids !== $route.current.pathParams.ids) {
-                    event.preventDefault();
-                    navigateToPath(route.pathParams.ids.split('/'));
-                }
-            });
+            $scope.$watch("treeModel.selectedObject", setNavigation);
 
             // Clean up when the scope is destroyed
             $scope.$on("$destroy", function () {
-                navigationService.removeListener(navigateDirectlyToModel);
+                navigationService.removeListener(setNavigation);
             });
         }
 

platform/commonUI/browse/src/BrowseObjectController.js

@@ -51,16 +51,24 @@ define(
             }
 
             function updateQueryParam(viewKey) {
-                if (viewKey && $location.search().view !== viewKey) {
+                var unlisten,
+                    priorRoute = $route.current;
+
+                if (viewKey) {
                     $location.search('view', viewKey);
+                    unlisten = $scope.$on('$locationChangeSuccess', function () {
+                        // Checks path to make sure /browse/ is at front
+                        // if so, change $route.current
+                        if ($location.path().indexOf("/browse/") === 0) {
+                            $route.current = priorRoute;
+                        }
+                        unlisten();
+                    });
                 }
             }
 
             $scope.$watch('domainObject', setViewForDomainObject);
             $scope.$watch('representation.selected.key', updateQueryParam);
-            $scope.$on('$locationChangeSuccess', function () {
-                setViewForDomainObject($scope.domainObject);
-            });
 
             $scope.doAction = function (action) {
                 return $scope[action] && $scope[action]();

platform/commonUI/browse/src/InspectorPaneController.js

@@ -64,11 +64,11 @@ define(
                 attachStatusListener(domainObject);
             }
 
-            navigationService.addListener(attachStatusListener);
+            var navigationListener = navigationService.addListener(attachStatusListener);
 
             $scope.$on("$destroy", function () {
                 statusListener();
-                navigationService.removeListener(attachStatusListener);
+                navigationListener();
             });
         }
 

platform/commonUI/browse/test/BrowseControllerSpec.js

@@ -35,17 +35,18 @@ define(
                 mockNavigationService,
                 mockRootObject,
                 mockUrlService,
-                mockDefaultRootObject,
-                mockOtherDomainObject,
+                mockDomainObject,
                 mockNextObject,
                 testDefaultRoot,
+                mockActionCapability,
                 controller;
 
-            function waitsForNavigation() {
-                var calls = mockNavigationService.setNavigation.calls.length;
-                waitsFor(function () {
-                    return mockNavigationService.setNavigation.calls.length > calls ;
-                });
+            function mockPromise(value) {
+                return {
+                    then: function (callback) {
+                        return mockPromise(callback(value));
+                    }
+                };
             }
 
             function instantiateController() {
@@ -67,27 +68,15 @@ define(
                     "$scope",
                     ["$on", "$watch"]
                 );
-                mockRoute = { current: { params: {}, pathParams: {} } };
-                mockUrlService = jasmine.createSpyObj(
-                    "urlService",
-                    ["urlForLocation"]
-                );
-                mockUrlService.urlForLocation.andCallFake(function (mode, object) {
-                    if (object === mockDefaultRootObject) {
-                        return [mode, testDefaultRoot].join('/');
-                    }
-                    if (object === mockOtherDomainObject) {
-                        return [mode, 'other'].join('/');
-                    }
-                    if (object === mockNextObject) {
-                        return [mode, testDefaultRoot, 'next'].join('/');
-                    }
-                    throw new Error('Tried to get url for unexpected object');
-                });
+                mockRoute = { current: { params: {} } };
                 mockLocation = jasmine.createSpyObj(
                     "$location",
                     ["path"]
                 );
+                mockUrlService = jasmine.createSpyObj(
+                    "urlService",
+                    ["urlForLocation"]
+                );
                 mockObjectService = jasmine.createSpyObj(
                     "objectService",
                     ["getObjects"]
@@ -102,78 +91,62 @@ define(
                     ]
                 );
                 mockRootObject = jasmine.createSpyObj(
-                    "rootObjectContainer",
-                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
+                    "domainObject",
+                    ["getId", "getCapability", "getModel", "useCapability"]
                 );
-                mockDefaultRootObject = jasmine.createSpyObj(
-                    "defaultRootObject",
-                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
-                );
-                mockOtherDomainObject = jasmine.createSpyObj(
-                    "otherDomainObject",
-                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
+                mockDomainObject = jasmine.createSpyObj(
+                    "domainObject",
+                    ["getId", "getCapability", "getModel", "useCapability"]
                 );
                 mockNextObject = jasmine.createSpyObj(
-                    "nestedDomainObject",
-                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
+                    "nextObject",
+                    ["getId", "getCapability", "getModel", "useCapability"]
                 );
-                mockObjectService.getObjects.andReturn(Promise.resolve({
+
+                mockObjectService.getObjects.andReturn(mockPromise({
                     ROOT: mockRootObject
                 }));
-                mockRootObject.useCapability.andReturn(Promise.resolve([
-                    mockOtherDomainObject,
-                    mockDefaultRootObject
+                mockRootObject.useCapability.andReturn(mockPromise([
+                    mockDomainObject
                 ]));
-                mockRootObject.hasCapability.andReturn(true);
-                mockDefaultRootObject.useCapability.andReturn(Promise.resolve([
+                mockDomainObject.useCapability.andReturn(mockPromise([
                     mockNextObject
                 ]));
-                mockDefaultRootObject.hasCapability.andReturn(true);
-                mockOtherDomainObject.hasCapability.andReturn(false);
                 mockNextObject.useCapability.andReturn(undefined);
-                mockNextObject.hasCapability.andReturn(false);
                 mockNextObject.getId.andReturn("next");
-                mockDefaultRootObject.getId.andReturn(testDefaultRoot);
+                mockDomainObject.getId.andReturn(testDefaultRoot);
+
+                mockActionCapability = jasmine.createSpyObj('actionCapability', ['perform']);
 
                 instantiateController();
-                waitsForNavigation();
             });
 
             it("uses composition to set the navigated object, if there is none", function () {
                 instantiateController();
-                waitsForNavigation();
-                runs(function () {
-                    expect(mockNavigationService.setNavigation)
-                        .toHaveBeenCalledWith(mockDefaultRootObject);
-                });
+                expect(mockNavigationService.setNavigation)
+                    .toHaveBeenCalledWith(mockDomainObject);
             });
 
             it("navigates to a root-level object, even when default path is not found", function () {
-                mockDefaultRootObject.getId
+                mockDomainObject.getId
                     .andReturn("something-other-than-the-" + testDefaultRoot);
                 instantiateController();
-
-                waitsForNavigation();
-                runs(function () {
-                    expect(mockNavigationService.setNavigation)
-                        .toHaveBeenCalledWith(mockDefaultRootObject);
-                });
-
+                expect(mockNavigationService.setNavigation)
+                    .toHaveBeenCalledWith(mockDomainObject);
             });
-            //
+
             it("does not try to override navigation", function () {
-                mockNavigationService.getNavigation.andReturn(mockDefaultRootObject);
+                mockNavigationService.getNavigation.andReturn(mockDomainObject);
                 instantiateController();
-                waitsForNavigation();
-                expect(mockScope.navigatedObject).toBe(mockDefaultRootObject);
+                expect(mockScope.navigatedObject).toBe(mockDomainObject);
             });
-            //
+
             it("updates scope when navigated object changes", function () {
                 // Should have registered a listener - call it
                 mockNavigationService.addListener.mostRecentCall.args[0](
-                    mockOtherDomainObject
+                    mockDomainObject
                 );
-                expect(mockScope.navigatedObject).toEqual(mockOtherDomainObject);
+                expect(mockScope.navigatedObject).toEqual(mockDomainObject);
             });
 
 
@@ -193,12 +166,9 @@ define(
             it("uses route parameters to choose initially-navigated object", function () {
                 mockRoute.current.params.ids = testDefaultRoot + "/next";
                 instantiateController();
-                waitsForNavigation();
-                runs(function () {
-                    expect(mockScope.navigatedObject).toBe(mockNextObject);
-                    expect(mockNavigationService.setNavigation)
-                        .toHaveBeenCalledWith(mockNextObject);
-                });
+                expect(mockScope.navigatedObject).toBe(mockNextObject);
+                expect(mockNavigationService.setNavigation)
+                    .toHaveBeenCalledWith(mockNextObject);
             });
 
             it("handles invalid IDs by going as far as possible", function () {
@@ -207,13 +177,9 @@ define(
                 // it hits an invalid ID.
                 mockRoute.current.params.ids = testDefaultRoot + "/junk";
                 instantiateController();
-                waitsForNavigation();
-                runs(function () {
-                    expect(mockScope.navigatedObject).toBe(mockDefaultRootObject);
-                    expect(mockNavigationService.setNavigation)
-                        .toHaveBeenCalledWith(mockDefaultRootObject);
-
-                });
+                expect(mockScope.navigatedObject).toBe(mockDomainObject);
+                expect(mockNavigationService.setNavigation)
+                    .toHaveBeenCalledWith(mockDomainObject);
             });
 
             it("handles compositionless objects by going as far as possible", function () {
@@ -222,33 +188,84 @@ define(
                 // should stop at it since remaining IDs cannot be loaded.
                 mockRoute.current.params.ids = testDefaultRoot + "/next/junk";
                 instantiateController();
-                waitsForNavigation();
-                runs(function () {
-                    expect(mockScope.navigatedObject).toBe(mockNextObject);
-                    expect(mockNavigationService.setNavigation)
-                        .toHaveBeenCalledWith(mockNextObject);
-                });
+                expect(mockScope.navigatedObject).toBe(mockNextObject);
+                expect(mockNavigationService.setNavigation)
+                    .toHaveBeenCalledWith(mockNextObject);
             });
 
             it("updates the displayed route to reflect current navigation", function () {
-                // In order to trigger a route update and not a route change,
-                // the current route must be updated before location.path is
-                // called.
-                expect(mockRoute.current.pathParams.ids)
-                    .not
-                    .toBe(testDefaultRoot + '/next');
-                mockLocation.path.andCallFake(function () {
-                    expect(mockRoute.current.pathParams.ids)
-                        .toBe(testDefaultRoot + '/next');
+                var mockContext = jasmine.createSpyObj('context', ['getPath']),
+                    mockUnlisten = jasmine.createSpy('unlisten'),
+                    mockMode = "browse";
+
+                mockContext.getPath.andReturn(
+                    [mockRootObject, mockDomainObject, mockNextObject]
+                );
+
+                //Return true from navigate action
+                mockActionCapability.perform.andReturn(mockPromise(true));
+
+                mockNextObject.getCapability.andCallFake(function (c) {
+                    return (c === 'context' && mockContext) ||
+                        (c === 'action' && mockActionCapability);
                 });
+                mockScope.$on.andReturn(mockUnlisten);
+                // Provide a navigation change
                 mockNavigationService.addListener.mostRecentCall.args[0](
                     mockNextObject
                 );
+
+                // Allows the path index to be checked
+                // prior to setting $route.current
+                mockLocation.path.andReturn("/browse/");
+
+                mockNavigationService.setNavigation.andReturn(true);
+                mockActionCapability.perform.andReturn(mockPromise(true));
+
+                // Exercise the Angular workaround
+                mockNavigationService.addListener.mostRecentCall.args[0]();
+                mockScope.$on.mostRecentCall.args[1]();
+                expect(mockUnlisten).toHaveBeenCalled();
+
+                // location.path to be called with the urlService's
+                // urlFor function with the next domainObject and mode
                 expect(mockLocation.path).toHaveBeenCalledWith(
-                    '/browse/' + testDefaultRoot + '/next'
+                    mockUrlService.urlForLocation(mockMode, mockNextObject)
                 );
             });
 
+            it("after successful navigation event sets the selected tree " +
+                "object", function () {
+                mockScope.navigatedObject = mockDomainObject;
+                mockNavigationService.setNavigation.andReturn(true);
+
+                mockActionCapability.perform.andReturn(mockPromise(true));
+                mockNextObject.getCapability.andReturn(mockActionCapability);
+
+                //Simulate a change in selected tree object
+                mockScope.treeModel = {selectedObject: mockDomainObject};
+                mockScope.$watch.mostRecentCall.args[1](mockNextObject);
+
+                expect(mockScope.treeModel.selectedObject).toBe(mockNextObject);
+                expect(mockScope.treeModel.selectedObject).not.toBe(mockDomainObject);
+            });
+
+            it("after failed navigation event resets the selected tree" +
+                " object", function () {
+                mockScope.navigatedObject = mockDomainObject;
+
+                //Return false from navigation action
+                mockActionCapability.perform.andReturn(mockPromise(false));
+                mockNextObject.getCapability.andReturn(mockActionCapability);
+
+                //Simulate a change in selected tree object
+                mockScope.treeModel = {selectedObject: mockDomainObject};
+                mockScope.$watch.mostRecentCall.args[1](mockNextObject);
+
+                expect(mockScope.treeModel.selectedObject).not.toBe(mockNextObject);
+                expect(mockScope.treeModel.selectedObject).toBe(mockDomainObject);
+            });
+
         });
     }
 );

platform/commonUI/browse/test/BrowseObjectControllerSpec.js

@@ -29,6 +29,7 @@ define(
             var mockScope,
                 mockLocation,
                 mockRoute,
+                mockUnlisten,
                 controller;
 
             // Utility function; look for a $watch on scope and fire it
@@ -50,7 +51,9 @@ define(
                     "$location",
                     ["path", "search"]
                 );
-                mockLocation.search.andReturn({});
+                mockUnlisten = jasmine.createSpy("unlisten");
+
+                mockScope.$on.andReturn(mockUnlisten);
 
                 controller = new BrowseObjectController(
                     mockScope,
@@ -66,6 +69,10 @@ define(
                 // Allows the path index to be checked
                 // prior to setting $route.current
                 mockLocation.path.andReturn("/browse/");
+
+                // Exercise the Angular workaround
+                mockScope.$on.mostRecentCall.args[1]();
+                expect(mockUnlisten).toHaveBeenCalled();
             });
 
             it("sets the active view from query parameters", function () {

platform/commonUI/edit/bundle.js

@@ -200,6 +200,7 @@ define([
                     "name": "Remove",
                     "description": "Remove this object from its containing object.",
                     "depends": [
+                        "$q",
                         "navigationService"
                     ]
                 },
@@ -244,9 +245,7 @@ define([
                     "key": "cancel",
                     "category": "conclude-editing",
                     "implementation": CancelAction,
-                    // Because we use the name as label for edit buttons and mct-control buttons need
-                    // the label to be set to undefined in order to not apply the labeled CSS rule.
-                    "name": undefined,
+                    "name": "Cancel",
                     "cssclass": "icon-x no-label",
                     "description": "Discard changes made to these objects.",
                     "depends": []
@@ -347,8 +346,7 @@ define([
                     "implementation": TransactionService,
                     "depends": [
                         "$q",
-                        "$log",
-                        "cacheService"
+                        "$log"
                     ]
                 },
                 {

platform/commonUI/edit/res/templates/edit-action-buttons.html

@@ -25,7 +25,7 @@
         <mct-control key="'button'"
                      structure="{
                         text: saveActions[0].getMetadata().name,
-                        click: actionPerformer(saveActions[0]),
+                        click: saveActions[0].perform,
                         cssclass: 'major ' + saveActions[0].getMetadata().cssclass
                      }">
         </mct-control>
@@ -42,12 +42,11 @@
     </span>
 
     <span ng-repeat="currentAction in otherEditActions">
-        <mct-control key="'button'"
-                     structure="{
-                        text: currentAction.getMetadata().name,
-                        click: actionPerformer(currentAction),
-                        cssclass: currentAction.getMetadata().cssclass
-                     }">
-        </mct-control>
+        <a class='s-button {{currentAction.getMetadata().cssclass}}'
+           title='{{currentAction.getMetadata().name}}'
+           ng-click="currentAction.perform()"
+           ng-class="{ major: $index === 0 && saveActions.length === 0 }">
+            <span class="title-label">{{currentAction.getMetadata().name}}</span>
+        </a>
     </span>
 </span>

platform/commonUI/edit/res/templates/edit-object.html

@@ -66,9 +66,4 @@
             </mct-representation>
         </div><!--/ l-object-wrapper-inner -->
     </div>
-    <mct-representation mct-object="domainObject"
-                        key="'time-conductor'"
-                        class="abs holder flex-elem flex-fixed l-flex-row l-time-conductor-holder">
-    </mct-representation>
-
 </div>

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

@@ -40,11 +40,19 @@ define(
             var self = this,
                 editAction = this.domainObject.getCapability('action').getActions("edit")[0];
 
+            // Persist changes to the domain object
+            function doPersist() {
+                var persistence =
+                    self.domainObject.getCapability('persistence');
+                return persistence.persist();
+            }
+
             // Link these objects
             function doLink() {
                 var composition = self.domainObject &&
                         self.domainObject.getCapability('composition');
-                return composition && composition.add(self.selectedObject);
+                return composition && composition.add(self.selectedObject)
+                        .then(doPersist);
             }
 
             if (editAction) {

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

@@ -50,6 +50,12 @@ define(
                 domainObject = this.domainObject,
                 dialogService = this.dialogService;
 
+            // Persist modifications to this domain object
+            function doPersist() {
+                var persistence = domainObject.getCapability('persistence');
+                return persistence && persistence.persist();
+            }
+
             // Update the domain object model based on user input
             function updateModel(userInput, dialog) {
                 return domainObject.useCapability('mutation', function (model) {
@@ -67,9 +73,11 @@ define(
                     dialog.getFormStructure(),
                     dialog.getInitialFormValue()
                 ).then(function (userInput) {
-                    // Update the model, if user input was provided
-                    return userInput && updateModel(userInput, dialog);
-                });
+                        // Update the model, if user input was provided
+                        return userInput && updateModel(userInput, dialog);
+                    }).then(function (result) {
+                        return result && doPersist();
+                    });
             }
 
             return type && showDialog(type);
@@ -86,7 +94,9 @@ define(
                 creatable = type && type.hasFeature('creation');
 
             // Only allow creatable types to be edited
-            return domainObject && creatable;
+            return domainObject &&
+                domainObject.hasCapability("persistence") &&
+                creatable;
         };
 
         return PropertiesAction;

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

@@ -39,8 +39,9 @@ define(
          * @constructor
          * @implements {Action}
          */
-        function RemoveAction(navigationService, context) {
+        function RemoveAction($q, navigationService, context) {
             this.domainObject = (context || {}).domainObject;
+            this.$q = $q;
             this.navigationService = navigationService;
         }
 
@@ -50,7 +51,8 @@ define(
          *         fulfilled when the action has completed.
          */
         RemoveAction.prototype.perform = function () {
-            var navigationService = this.navigationService,
+            var $q = this.$q,
+                navigationService = this.navigationService,
                 domainObject = this.domainObject;
             /*
              * Check whether an object ID matches the ID of the object being
@@ -69,6 +71,15 @@ define(
                 model.composition = model.composition.filter(isNotObject);
             }
 
+            /*
+             * Invoke persistence on a domain object. This will be called upon
+             * the removed object's parent (as its composition will have changed.)
+             */
+            function doPersist(domainObj) {
+                var persistence = domainObj.getCapability('persistence');
+                return persistence && persistence.persist();
+            }
+
             /*
              * Checks current object and ascendants of current
              * object with object being removed, if the current
@@ -108,10 +119,15 @@ define(
                 // navigates to existing object up tree
                 checkObjectNavigation(object, parent);
 
-                return parent.useCapability('mutation', doMutate);
+                return $q.when(
+                    parent.useCapability('mutation', doMutate)
+                ).then(function () {
+                    return doPersist(parent);
+                });
             }
 
-            return removeFromContext(domainObject);
+            return $q.when(domainObject)
+                .then(removeFromContext);
         };
 
         // Object needs to have a parent for Remove to be applicable

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

@@ -171,9 +171,7 @@ define([
 
             function finishEditing(clonedObject) {
                 return domainObject.getCapability("editor").finish()
-                    .then(function () {
-                        return fetchObject(clonedObject.getId());
-                    });
+                    .then(resolveWith(clonedObject));
             }
 
             function onFailure() {

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

@@ -81,10 +81,6 @@ define(
             return this.persistenceCapability.getSpace();
         };
 
-        TransactionalPersistenceCapability.prototype.persisted = function () {
-            return this.persistenceCapability.persisted();
-        };
-
         return TransactionalPersistenceCapability;
     }
 );

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

@@ -61,12 +61,6 @@ define(
                 $scope.otherEditActions = $scope.action ?
                         $scope.action.getActions(OTHERS_ACTION_CONTEXT) :
                         [];
-
-                // Required because Angular does not allow 'bind'
-                // in expressions.
-                $scope.actionPerformer = function (action) {
-                    return action.perform.bind(action);
-                };
             }
 
             // Update set of actions whenever the action capability

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

@@ -50,13 +50,17 @@ define(
             this.listenHandle = undefined;
 
             // Mutate and persist a new version of a domain object's model.
-            function doMutate(model) {
+            function doPersist(model) {
                 var domainObject = self.domainObject;
 
                 // First, mutate; then, persist.
                 return $q.when(domainObject.useCapability("mutation", function () {
                     return model;
-                }));
+                })).then(function (result) {
+                    // Only persist when mutation was successful
+                    return result &&
+                        domainObject.getCapability("persistence").persist();
+                });
             }
 
             // Handle changes to model and/or view configuration
@@ -76,14 +80,14 @@ define(
                 ].join(" "));
 
                 // Update the configuration stored in the model, and persist.
-                if (domainObject) {
+                if (domainObject && domainObject.hasCapability("persistence")) {
                     // Configurations for specific views are stored by
                     // key in the "configuration" field of the model.
                     if (self.key && configuration) {
                         model.configuration = model.configuration || {};
                         model.configuration[self.key] = configuration;
                     }
-                    doMutate(model);
+                    doPersist(model);
                 }
             }
 

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

@@ -1,48 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-define(['./Transaction'], function (Transaction) {
-    /**
-     * A nested transaction is a transaction which takes place in the context
-     * of a larger parent transaction. It becomes part of the parent
-     * transaction when (and only when) committed.
-     * @param parent
-     * @constructor
-     * @extends {platform/commonUI/edit/services.Transaction}
-     * @memberof platform/commonUI/edit/services
-     */
-    function NestedTransaction(parent) {
-        this.parent = parent;
-        Transaction.call(this, parent.$log);
-    }
-
-    NestedTransaction.prototype = Object.create(Transaction.prototype);
-
-    NestedTransaction.prototype.commit = function () {
-        this.parent.add(
-            Transaction.prototype.commit.bind(this),
-            Transaction.prototype.cancel.bind(this)
-        );
-        return Promise.resolve(true);
-    };
-
-    return NestedTransaction;
-});

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

@@ -1,96 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-define([], function () {
-    /**
-     * A Transaction represents a set of changes that are intended to
-     * be kept or discarded as a unit.
-     * @param $log Angular's `$log` service, for logging messages
-     * @constructor
-     * @memberof platform/commonUI/edit/services
-     */
-    function Transaction($log) {
-        this.$log = $log;
-        this.callbacks = [];
-    }
-
-    /**
-     * Add a change to the current transaction, as expressed by functions
-     * to either keep or discard the change.
-     * @param {Function} commit called when the transaction is committed
-     * @param {Function} cancel called when the transaction is cancelled
-     * @returns {Function) a function which may be called to remove this
-     *          pair of callbacks from the transaction
-     */
-    Transaction.prototype.add = function (commit, cancel) {
-        var callback = { commit: commit, cancel: cancel };
-        this.callbacks.push(callback);
-        return function () {
-            this.callbacks = this.callbacks.filter(function (c) {
-                return c !== callback;
-            });
-        }.bind(this);
-    };
-
-    /**
-     * Get the number of changes in the current transaction.
-     * @returns {number} the size of the current transaction
-     */
-    Transaction.prototype.size = function () {
-        return this.callbacks.length;
-    };
-
-    /**
-     * Keep all changes associated with this transaction.
-     * @method {platform/commonUI/edit/services.Transaction#commit}
-     * @returns {Promise} a promise which will resolve when all callbacks
-     *          have been handled.
-     */
-
-    /**
-     * Discard all changes associated with this transaction.
-     * @method {platform/commonUI/edit/services.Transaction#cancel}
-     * @returns {Promise} a promise which will resolve when all callbacks
-     *          have been handled.
-     */
-
-    ['commit', 'cancel'].forEach(function (method) {
-        Transaction.prototype[method] = function () {
-            var promises = [];
-            var callback;
-
-            while (this.callbacks.length > 0) {
-                callback = this.callbacks.shift();
-                try {
-                    promises.push(callback[method]());
-                } catch (e) {
-                    this.$log
-                        .error("Error trying to " + method + " transaction.");
-                }
-            }
-
-            return Promise.all(promises);
-        };
-    });
-
-
-    return Transaction;
-});

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

@@ -21,8 +21,8 @@
  *****************************************************************************/
 /*global define*/
 define(
-    ['./Transaction', './NestedTransaction'],
-    function (Transaction, NestedTransaction) {
+    [],
+    function () {
         /**
          * Implements an application-wide transaction state. Once a
          * transaction is started, calls to
@@ -34,11 +34,13 @@ define(
          * @param $q
          * @constructor
          */
-        function TransactionService($q, $log, cacheService) {
+        function TransactionService($q, $log) {
             this.$q = $q;
             this.$log = $log;
-            this.cacheService = cacheService;
-            this.transactions = [];
+            this.transaction = false;
+
+            this.onCommits = [];
+            this.onCancels = [];
         }
 
         /**
@@ -48,18 +50,18 @@ define(
          * #cancel} are called
          */
         TransactionService.prototype.startTransaction = function () {
-            var transaction = this.isActive() ?
-                new NestedTransaction(this.transactions[0]) :
-                new Transaction(this.$log);
-
-            this.transactions.push(transaction);
+            if (this.transaction) {
+                //Log error because this is a programming error if it occurs.
+                this.$log.error("Transaction already in progress");
+            }
+            this.transaction = true;
         };
 
         /**
          * @returns {boolean} If true, indicates that a transaction is in progress
          */
         TransactionService.prototype.isActive = function () {
-            return this.transactions.length > 0;
+            return this.transaction;
         };
 
         /**
@@ -70,43 +72,52 @@ define(
          * @param onCancel A function to call on cancel
          */
         TransactionService.prototype.addToTransaction = function (onCommit, onCancel) {
-            if (this.isActive()) {
-                return this.activeTransaction().add(onCommit, onCancel);
+            if (this.transaction) {
+                this.onCommits.push(onCommit);
+                if (onCancel) {
+                    this.onCancels.push(onCancel);
+                }
             } else {
                 //Log error because this is a programming error if it occurs.
                 this.$log.error("No transaction in progress");
             }
-        };
 
-        /**
-         * Get the transaction at the top of the stack.
-         * @private
-         */
-        TransactionService.prototype.activeTransaction = function () {
-            return this.transactions[this.transactions.length - 1];
+            return function () {
+                this.onCommits = this.onCommits.filter(function (callback) {
+                    return callback !== onCommit;
+                });
+                this.onCancels = this.onCancels.filter(function (callback) {
+                    return callback !== onCancel;
+                });
+            }.bind(this);
         };
 
         /**
          * All persist calls deferred since the beginning of the transaction
-         * will be committed.  If this is the last transaction, clears the
-         * cache.
+         * will be committed.
          *
          * @returns {Promise} resolved when all persist operations have
          * completed. Will reject if any commit operations fail
          */
         TransactionService.prototype.commit = function () {
-            var transaction = this.transactions.pop();
-            if (!transaction) {
-                return Promise.reject();
+            var self = this,
+                promises = [],
+                onCommit;
+
+            while (this.onCommits.length > 0) { // ...using a while in case some onCommit adds to transaction
+                onCommit = this.onCommits.pop();
+                try { // ...also don't want to fail mid-loop...
+                    promises.push(onCommit());
+                } catch (e) {
+                    this.$log.error("Error committing transaction.");
+                }
             }
-            if (!this.isActive()) {
-                return transaction.commit()
-                    .then(function (r) {
-                        this.cacheService.flush();
-                        return r;
-                    }.bind(this));
-            }
-            return transaction.commit();
+            return this.$q.all(promises).then(function () {
+                self.transaction = false;
+
+                self.onCommits = [];
+                self.onCancels = [];
+            });
         };
 
         /**
@@ -118,17 +129,28 @@ define(
          * @returns {*}
          */
         TransactionService.prototype.cancel = function () {
-            var transaction = this.transactions.pop();
-            return transaction ? transaction.cancel() : Promise.reject();
+            var self = this,
+                results = [],
+                onCancel;
+
+            while (this.onCancels.length > 0) {
+                onCancel = this.onCancels.pop();
+                try {
+                    results.push(onCancel());
+                } catch (error) {
+                    this.$log.error("Error cancelling transaction.");
+                }
+            }
+            return this.$q.all(results).then(function () {
+                self.transaction = false;
+
+                self.onCommits = [];
+                self.onCancels = [];
+            });
         };
 
-        /**
-         * Get the size (the number of commit/cancel callbacks) of
-         * the active transaction.
-         * @returns {number} size of the active transaction
-         */
         TransactionService.prototype.size = function () {
-            return this.isActive() ? this.activeTransaction().size() : 0;
+            return this.onCommits.length;
         };
 
         return TransactionService;

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

@@ -30,6 +30,7 @@ define(
                 mockParent,
                 mockContext,
                 mockComposition,
+                mockPersistence,
                 mockActionCapability,
                 mockEditAction,
                 mockType,
@@ -67,6 +68,7 @@ define(
                 };
                 mockContext = jasmine.createSpyObj("context", ["getParent"]);
                 mockComposition = jasmine.createSpyObj("composition", ["invoke", "add"]);
+                mockPersistence = jasmine.createSpyObj("persistence", ["persist"]);
                 mockType = jasmine.createSpyObj("type", ["hasFeature", "getKey"]);
                 mockActionCapability = jasmine.createSpyObj("actionCapability", ["getActions"]);
                 mockEditAction = jasmine.createSpyObj("editAction", ["perform"]);
@@ -82,6 +84,7 @@ define(
 
                 capabilities = {
                     composition: mockComposition,
+                    persistence: mockPersistence,
                     action: mockActionCapability,
                     type: mockType
                 };
@@ -104,6 +107,11 @@ define(
                     .toHaveBeenCalledWith(mockDomainObject);
             });
 
+            it("persists changes afterward", function () {
+                action.perform();
+                expect(mockPersistence.persist).toHaveBeenCalled();
+            });
+
             it("enables edit mode for objects that have an edit action", function () {
                 mockActionCapability.getActions.andReturn([mockEditAction]);
                 action.perform();

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

@@ -43,6 +43,7 @@ define(
                         },
                         hasFeature: jasmine.createSpy('hasFeature')
                     },
+                    persistence: jasmine.createSpyObj("persistence", ["persist"]),
                     mutation: jasmine.createSpy("mutation")
                 };
                 model = {};
@@ -77,18 +78,25 @@ define(
                 action = new PropertiesAction(dialogService, context);
             });
 
+            it("persists when an action is performed", function () {
+                action.perform();
+                expect(capabilities.persistence.persist)
+                    .toHaveBeenCalled();
+            });
+
+            it("does not persist any changes upon cancel", function () {
+                input = undefined;
+                action.perform();
+                expect(capabilities.persistence.persist)
+                    .not.toHaveBeenCalled();
+            });
+
             it("mutates an object when performed", function () {
                 action.perform();
                 expect(capabilities.mutation).toHaveBeenCalled();
                 capabilities.mutation.mostRecentCall.args[0]({});
             });
 
-            it("does not muate object upon cancel", function () {
-                input = undefined;
-                action.perform();
-                expect(capabilities.mutation).not.toHaveBeenCalled();
-            });
-
             it("is only applicable when a domain object is in context", function () {
                 expect(PropertiesAction.appliesTo(context)).toBeTruthy();
                 expect(PropertiesAction.appliesTo({})).toBeFalsy();

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

@@ -37,6 +37,7 @@ define(
                 mockGrandchildContext,
                 mockRootContext,
                 mockMutation,
+                mockPersistence,
                 mockType,
                 actionContext,
                 model,
@@ -52,6 +53,8 @@ define(
             }
 
             beforeEach(function () {
+
+
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
                     ["getId", "getCapability"]
@@ -85,6 +88,7 @@ define(
                 mockGrandchildContext = jasmine.createSpyObj("context", ["getParent"]);
                 mockRootContext = jasmine.createSpyObj("context", ["getParent"]);
                 mockMutation = jasmine.createSpyObj("mutation", ["invoke"]);
+                mockPersistence = jasmine.createSpyObj("persistence", ["persist"]);
                 mockType = jasmine.createSpyObj("type", ["hasFeature"]);
                 mockNavigationService = jasmine.createSpyObj(
                     "navigationService",
@@ -105,6 +109,7 @@ define(
 
                 capabilities = {
                     mutation: mockMutation,
+                    persistence: mockPersistence,
                     type: mockType
                 };
                 model = {
@@ -113,7 +118,7 @@ define(
 
                 actionContext = { domainObject: mockDomainObject };
 
-                action = new RemoveAction(mockNavigationService, actionContext);
+                action = new RemoveAction(mockQ, mockNavigationService, actionContext);
             });
 
             it("only applies to objects with parents", function () {
@@ -149,6 +154,9 @@ define(
                 // Should have removed "test" - that was our
                 // mock domain object's id.
                 expect(result.composition).toEqual(["a", "b"]);
+
+                // Finally, should have persisted
+                expect(mockPersistence.persist).toHaveBeenCalled();
             });
 
             it("removes parent of object currently navigated to", function () {

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

@@ -30,6 +30,7 @@ define(
                 mockScope,
                 testRepresentation,
                 mockDomainObject,
+                mockPersistence,
                 mockStatusCapability,
                 mockEditorCapability,
                 mockCapabilities,
@@ -55,12 +56,15 @@ define(
                     "useCapability",
                     "hasCapability"
                 ]);
+                mockPersistence =
+                    jasmine.createSpyObj("persistence", ["persist"]);
                 mockStatusCapability =
                     jasmine.createSpyObj("statusCapability", ["listen"]);
                 mockEditorCapability =
                     jasmine.createSpyObj("editorCapability", ["isEditContextRoot"]);
 
                 mockCapabilities = {
+                    'persistence': mockPersistence,
                     'status': mockStatusCapability,
                     'editor': mockEditorCapability
                 };
@@ -92,7 +96,7 @@ define(
                 expect(representer.listenHandle).toHaveBeenCalled();
             });
 
-            it("mutates upon observed changes", function () {
+            it("mutates and persists upon observed changes", function () {
                 mockScope.model = { someKey: "some value" };
                 mockScope.configuration = { someConfiguration: "something" };
 
@@ -104,6 +108,9 @@ define(
                     jasmine.any(Function)
                 );
 
+                // ... and should have persisted the mutation
+                expect(mockPersistence.persist).toHaveBeenCalled();
+
                 // Finally, check that the provided mutation function
                 // includes both model and configuration
                 expect(

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

@@ -1,78 +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.
- *****************************************************************************/
-/*global define,describe,it,expect,beforeEach,jasmine*/
-
-define(["../../src/services/NestedTransaction"], function (NestedTransaction) {
-    var TRANSACTION_METHODS = ['add', 'commit', 'cancel', 'size'];
-
-    describe("A NestedTransaction", function () {
-        var mockTransaction,
-            nestedTransaction;
-
-        beforeEach(function () {
-            mockTransaction =
-                jasmine.createSpyObj('transaction', TRANSACTION_METHODS);
-            nestedTransaction = new NestedTransaction(mockTransaction);
-        });
-
-        it("exposes a Transaction's interface", function () {
-            TRANSACTION_METHODS.forEach(function (method) {
-                expect(nestedTransaction[method])
-                    .toEqual(jasmine.any(Function));
-            });
-        });
-
-        describe("when callbacks are added", function () {
-            var mockCommit,
-                mockCancel,
-                remove;
-
-            beforeEach(function () {
-                mockCommit = jasmine.createSpy('commit');
-                mockCancel = jasmine.createSpy('cancel');
-                remove = nestedTransaction.add(mockCommit, mockCancel);
-            });
-
-            it("does not interact with its parent transaction", function () {
-                TRANSACTION_METHODS.forEach(function (method) {
-                    expect(mockTransaction[method])
-                        .not.toHaveBeenCalled();
-                });
-            });
-
-            describe("and the transaction is committed", function () {
-                beforeEach(function () {
-                    nestedTransaction.commit();
-                });
-
-                it("adds to its parent transaction", function () {
-                    expect(mockTransaction.add).toHaveBeenCalledWith(
-                        jasmine.any(Function),
-                        jasmine.any(Function)
-                    );
-                });
-            });
-        });
-    });
-});
-
-

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

@@ -57,7 +57,8 @@ define(
 
                 transactionService.startTransaction();
                 transactionService.addToTransaction(onCommit, onCancel);
-                expect(transactionService.size()).toBe(1);
+                expect(transactionService.onCommits.length).toBe(1);
+                expect(transactionService.onCancels.length).toBe(1);
             });
 
             it("size function returns size of commit and cancel queues", function () {
@@ -84,7 +85,7 @@ define(
                 });
 
                 it("commit calls all queued commit functions", function () {
-                    expect(transactionService.size()).toBe(3);
+                    expect(transactionService.onCommits.length).toBe(3);
                     transactionService.commit();
                     onCommits.forEach(function (spy) {
                         expect(spy).toHaveBeenCalled();
@@ -94,8 +95,8 @@ define(
                 it("commit resets active state and clears queues", function () {
                     transactionService.commit();
                     expect(transactionService.isActive()).toBe(false);
-                    expect(transactionService.size()).toBe(0);
-                    expect(transactionService.size()).toBe(0);
+                    expect(transactionService.onCommits.length).toBe(0);
+                    expect(transactionService.onCancels.length).toBe(0);
                 });
 
             });
@@ -115,7 +116,7 @@ define(
                 });
 
                 it("cancel calls all queued cancel functions", function () {
-                    expect(transactionService.size()).toBe(3);
+                    expect(transactionService.onCancels.length).toBe(3);
                     transactionService.cancel();
                     onCancels.forEach(function (spy) {
                         expect(spy).toHaveBeenCalled();
@@ -125,7 +126,8 @@ define(
                 it("cancel resets active state and clears queues", function () {
                     transactionService.cancel();
                     expect(transactionService.isActive()).toBe(false);
-                    expect(transactionService.size()).toBe(0);
+                    expect(transactionService.onCommits.length).toBe(0);
+                    expect(transactionService.onCancels.length).toBe(0);
                 });
 
             });

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

@@ -1,110 +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.
- *****************************************************************************/
-/*global define,describe,it,expect,beforeEach,jasmine*/
-
-define(
-    ["../../src/services/Transaction"],
-    function (Transaction) {
-
-        describe("A Transaction", function () {
-            var mockLog,
-                transaction;
-
-            beforeEach(function () {
-                mockLog = jasmine.createSpyObj(
-                    '$log',
-                    ['warn', 'info', 'error', 'debug']
-                );
-                transaction = new Transaction(mockLog);
-            });
-
-            it("initially has a size of zero", function () {
-                expect(transaction.size()).toEqual(0);
-            });
-
-            describe("when callbacks are added", function () {
-                var mockCommit,
-                    mockCancel,
-                    remove;
-
-                beforeEach(function () {
-                    mockCommit = jasmine.createSpy('commit');
-                    mockCancel = jasmine.createSpy('cancel');
-                    remove = transaction.add(mockCommit, mockCancel);
-                });
-
-                it("reports a new size", function () {
-                    expect(transaction.size()).toEqual(1);
-                });
-
-                it("returns a function to remove those callbacks", function () {
-                    expect(remove).toEqual(jasmine.any(Function));
-                    remove();
-                    expect(transaction.size()).toEqual(0);
-                });
-
-                describe("and the transaction is committed", function () {
-                    beforeEach(function () {
-                        transaction.commit();
-                    });
-
-                    it("triggers the commit callback", function () {
-                        expect(mockCommit).toHaveBeenCalled();
-                    });
-
-                    it("does not trigger the cancel callback", function () {
-                        expect(mockCancel).not.toHaveBeenCalled();
-                    });
-                });
-
-                describe("and the transaction is cancelled", function () {
-                    beforeEach(function () {
-                        transaction.cancel();
-                    });
-
-                    it("triggers the cancel callback", function () {
-                        expect(mockCancel).toHaveBeenCalled();
-                    });
-
-                    it("does not trigger the commit callback", function () {
-                        expect(mockCommit).not.toHaveBeenCalled();
-                    });
-                });
-
-                describe("and an exception is encountered during commit", function () {
-                    beforeEach(function () {
-                        mockCommit.andCallFake(function () {
-                            throw new Error("test error");
-                        });
-                        transaction.commit();
-                    });
-
-                    it("logs an error", function () {
-                        expect(mockLog.error).toHaveBeenCalled();
-                    });
-                });
-            });
-
-        });
-    }
-);
-

platform/commonUI/formats/bundle.js

@@ -23,12 +23,10 @@
 define([
     "./src/FormatProvider",
     "./src/UTCTimeFormat",
-    "./src/DurationFormat",
     'legacyRegistry'
 ], function (
     FormatProvider,
     UTCTimeFormat,
-    DurationFormat,
     legacyRegistry
 ) {
 
@@ -50,10 +48,6 @@ define([
                 {
                     "key": "utc",
                     "implementation": UTCTimeFormat
-                },
-                {
-                    "key": "duration",
-                    "implementation": DurationFormat
                 }
             ],
             "constants": [
@@ -61,17 +55,6 @@ define([
                     "key": "DEFAULT_TIME_FORMAT",
                     "value": "utc"
                 }
-            ],
-            "licenses": [
-                {
-                    "name": "d3",
-                    "version": "3.0.0",
-                    "description": "Incorporates modified code from d3 Time Scales",
-                    "author": "Mike Bostock",
-                    "copyright": "Copyright 2010-2016 Mike Bostock. " +
-                    "All rights reserved.",
-                    "link": "https://github.com/d3/d3/blob/master/LICENSE"
-                }
             ]
         }
     });

platform/commonUI/formats/src/DurationFormat.js

@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web 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 Web 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([
-    'moment'
-], function (
-    moment
-) {
-
-    var DATE_FORMAT = "HH:mm:ss",
-        DATE_FORMATS = [
-            DATE_FORMAT
-        ];
-
-
-    /**
-     * Formatter for duration. Uses moment to produce a date from a given
-     * value, but output is formatted to display only time. Can be used for
-     * specifying a time duration. For specifying duration, it's best to
-     * specify a date of January 1, 1970, as the ms offset will equal the
-     * duration represented by the time.
-     *
-     * @implements {Format}
-     * @constructor
-     * @memberof platform/commonUI/formats
-     */
-    function DurationFormat() {
-    }
-
-    DurationFormat.prototype.format = function (value) {
-        return moment.utc(value).format(DATE_FORMAT);
-    };
-
-    DurationFormat.prototype.parse = function (text) {
-        return moment.duration(text).asMilliseconds();
-    };
-
-    DurationFormat.prototype.validate = function (text) {
-        return moment.utc(text, DATE_FORMATS).isValid();
-    };
-
-    return DurationFormat;
-});

platform/commonUI/formats/src/FormatProvider.js

@@ -58,10 +58,6 @@ define([
      * @method format
      * @memberof Format#
      * @param {number} value the numeric value to format
-     * @param {number} [threshold]  Optionally provides context to the
-     * format request, allowing for scale-appropriate formatting. This value
-     * should be the minimum unit to be represented by this format, in ms. For
-     * example, to display seconds, a threshold of 1 * 1000 should be provided.
      * @returns {string} the text representation of the value
      */
 

platform/commonUI/formats/src/UTCTimeFormat.js

@@ -34,11 +34,6 @@ define([
             "YYYY-MM-DD"
         ];
 
-    /**
-     * @typedef Scale
-     * @property {number} min the minimum scale value, in ms
-     * @property {number} max the maximum scale value, in ms
-     */
 
     /**
      * Formatter for UTC timestamps. Interprets numeric values as
@@ -51,103 +46,7 @@ define([
     function UTCTimeFormat() {
     }
 
-    /**
-     * Returns an appropriate time format based on the provided value and
-     * the threshold required.
-     * @private
-     */
-    function getScaledFormat(d) {
-        var momentified = moment.utc(d);
-        /**
-         * Uses logic from d3 Time-Scales, v3 of the API. See
-         * https://github.com/d3/d3-3.x-api-reference/blob/master/Time-Scales.md
-         *
-         * Licensed
-         */
-        return [
-            [".SSS", function (m) {
-                return m.milliseconds();
-            }],
-            [":ss", function (m) {
-                return m.seconds();
-            }],
-            ["HH:mm", function (m) {
-                return m.minutes();
-            }],
-            ["HH", function (m) {
-                return m.hours();
-            }],
-            ["ddd DD", function (m) {
-                return m.days() &&
-                    m.date() !== 1;
-            }],
-            ["MMM DD", function (m) {
-                return m.date() !== 1;
-            }],
-            ["MMMM", function (m) {
-                return m.month();
-            }],
-            ["YYYY", function () {
-                return true;
-            }]
-        ].filter(function (row) {
-            return row[1](momentified);
-        })[0][0];
-    }
-
-    /**
-     * Returns a description of the current range of the time conductor's
-     * bounds.
-     * @param timeRange
-     * @returns {*}
-     */
-    UTCTimeFormat.prototype.timeUnits = function (timeRange) {
-        var momentified = moment.duration(timeRange);
-
-        return [
-            ["Decades", function (r) {
-                return r.years() > 15;
-            }],
-            ["Years", function (r) {
-                return r.years() > 1;
-            }],
-            ["Months", function (r) {
-                return r.years() === 1 || r.months() > 1;
-            }],
-            ["Days", function (r) {
-                return r.months() === 1 || r.days() > 1;
-            }],
-            ["Hours", function (r) {
-                return r.days() === 1 || r.hours() > 1;
-            }],
-            ["Minutes", function (r) {
-                return r.hours() === 1 || r.minutes() > 1;
-            }],
-            ["Seconds", function (r) {
-                return r.minutes() === 1 || r.seconds() > 1;
-            }],
-            ["Milliseconds", function (r) {
-                return true;
-            }]
-        ].filter(function (row) {
-            return row[1](momentified);
-        })[0][0];
-    };
-
-    /**
-     *
-     * @param value
-     * @param {Scale} [scale] Optionally provides context to the
-     * format request, allowing for scale-appropriate formatting.
-     * @returns {string} the formatted date
-     */
-    UTCTimeFormat.prototype.format = function (value, scale) {
-        if (scale !== undefined) {
-            var scaledFormat = getScaledFormat(value, scale);
-            if (scaledFormat) {
-                return moment.utc(value).format(scaledFormat);
-            }
-        }
+    UTCTimeFormat.prototype.format = function (value) {
         return moment.utc(value).format(DATE_FORMAT) + "Z";
     };
 

platform/commonUI/formats/src/UTCTimeFormatSpec.js

@@ -1,83 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web 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 Web 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([
-    "./UTCTimeFormat",
-    "moment"
-], function (
-    UTCTimeFormat,
-    moment
-) {
-    describe("The UTCTimeFormat class", function () {
-        var format;
-        var scale;
-
-        beforeEach(function () {
-            format = new UTCTimeFormat();
-            scale = {min: 0, max: 0};
-        });
-
-        it("Provides an appropriately scaled time format based on the input" +
-            " time", function () {
-            var TWO_HUNDRED_MS = 200;
-            var THREE_SECONDS = 3000;
-            var FIVE_MINUTES = 5 * 60 * 1000;
-            var ONE_HOUR_TWENTY_MINS = (1 * 60 * 60 * 1000) + (20 * 60 * 1000);
-            var TEN_HOURS = (10 * 60 * 60 * 1000);
-
-            var JUNE_THIRD = moment.utc("2016-06-03", "YYYY-MM-DD");
-            var APRIL = moment.utc("2016-04", "YYYY-MM");
-            var TWENTY_SIXTEEN = moment.utc("2016", "YYYY");
-
-            expect(format.format(TWO_HUNDRED_MS, scale)).toBe(".200");
-            expect(format.format(THREE_SECONDS, scale)).toBe(":03");
-            expect(format.format(FIVE_MINUTES, scale)).toBe("00:05");
-            expect(format.format(ONE_HOUR_TWENTY_MINS, scale)).toBe("01:20");
-            expect(format.format(TEN_HOURS, scale)).toBe("10");
-
-            expect(format.format(JUNE_THIRD, scale)).toBe("Fri 03");
-            expect(format.format(APRIL, scale)).toBe("April");
-            expect(format.format(TWENTY_SIXTEEN, scale)).toBe("2016");
-        });
-
-        it("Returns appropriate time units for a given time span", function () {
-            var ONE_DAY = 1000 * 60 * 60 * 24;
-            var FIVE_DAYS = 5 * ONE_DAY;
-            var FIVE_MONTHS = 60 * ONE_DAY;
-
-            var ONE_YEAR = 365 * ONE_DAY;
-            var SEVEN_YEARS = 7 * ONE_YEAR;
-            var TWO_DECADES = 20 * ONE_YEAR;
-
-            //A span of one day should show a zoom label of "Hours"
-            expect(format.timeUnits(ONE_DAY)).toEqual("Hours");
-            //Multiple days should display "Days"
-            expect(format.timeUnits(FIVE_DAYS)).toEqual("Days");
-            expect(format.timeUnits(FIVE_MONTHS)).toEqual("Days");
-            //A span of one year should show a zoom level of "Months".
-            // Multiple years will show "Years"
-            expect(format.timeUnits(ONE_YEAR)).toEqual("Months");
-            expect(format.timeUnits(SEVEN_YEARS)).toEqual("Years");
-            expect(format.timeUnits(TWO_DECADES)).toEqual("Decades");
-        });
-    });
-});

platform/commonUI/general/bundle.js

@@ -48,7 +48,6 @@ define([
     "./src/directives/MCTSplitPane",
     "./src/directives/MCTSplitter",
     "./src/directives/MCTTree",
-    "./src/filters/ReverseFilter",
     "text!./res/templates/bottombar.html",
     "text!./res/templates/controls/action-button.html",
     "text!./res/templates/controls/input-filter.html",
@@ -97,7 +96,6 @@ define([
     MCTSplitPane,
     MCTSplitter,
     MCTTree,
-    ReverseFilter,
     bottombarTemplate,
     actionButtonTemplate,
     inputFilterTemplate,
@@ -148,8 +146,7 @@ define([
                     "depends": [
                         "stylesheets[]",
                         "$document",
-                        "THEME",
-                        "ASSETS_PATH"
+                        "THEME"
                     ]
                 },
                 {
@@ -161,7 +158,7 @@ define([
             ],
             "filters": [
                 {
-                    "implementation": ReverseFilter,
+                    "implementation": "filters/ReverseFilter.js",
                     "key": "reverse"
                 }
             ],
@@ -408,11 +405,6 @@ define([
                     "key": "THEME",
                     "value": "unspecified",
                     "priority": "fallback"
-                },
-                {
-                    "key": "ASSETS_PATH",
-                    "value": ".",
-                    "priority": "fallback"
                 }
             ],
             "containers": [

platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json

@@ -1,8 +1,8 @@
 {
   "metadata": {
     "name": "openmct-symbols-16px",
-    "lastOpened": 1481575258437,
-    "created": 1481575255265
+    "lastOpened": 1469724858940,
+    "created": 1469724856623
   },
   "iconSets": [
     {
@@ -535,50 +535,18 @@
         {
           "order": 21,
           "prevSize": 24,
-          "name": "icon-resync",
+          "name": "icon-x-in-circle",
           "id": 16,
           "code": 921654,
           "tempChar": ""
         },
-        {
-          "order": 121,
-          "id": 103,
-          "name": "icon-x-in-circle",
-          "prevSize": 24,
-          "code": 921656,
-          "tempChar": ""
-        },
-        {
-          "order": 118,
-          "id": 102,
-          "name": "icon-brightness",
-          "prevSize": 24,
-          "code": 921657,
-          "tempChar": ""
-        },
-        {
-          "order": 119,
-          "id": 104,
-          "name": "icon-contrast",
-          "prevSize": 24,
-          "code": 921664,
-          "tempChar": ""
-        },
-        {
-          "order": 120,
-          "id": 105,
-          "name": "icon-reset",
-          "prevSize": 24,
-          "code": 921655,
-          "tempChar": ""
-        },
         {
           "order": 37,
           "prevSize": 24,
           "name": "icon-activity",
           "id": 32,
           "code": 921856,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 36,
@@ -586,7 +554,7 @@
           "name": "icon-activity-mode",
           "id": 31,
           "code": 921857,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 52,
@@ -594,7 +562,7 @@
           "name": "icon-autoflow-tabular",
           "id": 47,
           "code": 921858,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 55,
@@ -602,7 +570,7 @@
           "name": "icon-clock",
           "id": 50,
           "code": 921859,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 58,
@@ -610,7 +578,7 @@
           "name": "icon-database",
           "id": 53,
           "code": 921860,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 57,
@@ -618,7 +586,7 @@
           "name": "icon-database-query",
           "id": 52,
           "code": 921861,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 17,
@@ -626,7 +594,7 @@
           "name": "icon-dataset",
           "id": 12,
           "code": 921862,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 22,
@@ -634,7 +602,7 @@
           "name": "icon-datatable",
           "id": 17,
           "code": 921863,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 59,
@@ -642,7 +610,7 @@
           "name": "icon-dictionary",
           "id": 54,
           "code": 921864,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 62,
@@ -650,7 +618,7 @@
           "name": "icon-folder",
           "id": 57,
           "code": 921865,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 66,
@@ -658,7 +626,7 @@
           "name": "icon-image",
           "id": 61,
           "code": 921872,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 68,
@@ -666,7 +634,7 @@
           "name": "icon-layout",
           "id": 63,
           "code": 921873,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 77,
@@ -674,7 +642,7 @@
           "name": "icon-object",
           "id": 72,
           "code": 921874,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 78,
@@ -682,7 +650,7 @@
           "name": "icon-object-unknown",
           "id": 73,
           "code": 921875,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 79,
@@ -690,7 +658,7 @@
           "name": "icon-packet",
           "id": 74,
           "code": 921876,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 80,
@@ -698,7 +666,7 @@
           "name": "icon-page",
           "id": 75,
           "code": 921877,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 114,
@@ -706,7 +674,7 @@
           "name": "icon-plot-overlay",
           "prevSize": 24,
           "code": 921878,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 113,
@@ -714,7 +682,7 @@
           "name": "icon-plot-stacked",
           "prevSize": 24,
           "code": 921879,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 10,
@@ -722,7 +690,7 @@
           "name": "icon-session",
           "id": 5,
           "code": 921880,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 24,
@@ -730,7 +698,7 @@
           "name": "icon-tabular",
           "id": 19,
           "code": 921881,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 7,
@@ -738,7 +706,7 @@
           "name": "icon-tabular-lad",
           "id": 2,
           "code": 921888,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 6,
@@ -746,7 +714,7 @@
           "name": "icon-tabular-lad-set",
           "id": 1,
           "code": 921889,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 8,
@@ -754,7 +722,7 @@
           "name": "icon-tabular-realtime",
           "id": 3,
           "code": 921890,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 23,
@@ -762,7 +730,7 @@
           "name": "icon-tabular-scrolling",
           "id": 18,
           "code": 921891,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 112,
@@ -770,7 +738,7 @@
           "name": "icon-telemetry",
           "id": 86,
           "code": 921892,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 90,
@@ -778,7 +746,7 @@
           "name": "icon-telemetry-panel",
           "id": 85,
           "code": 921893,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 93,
@@ -786,7 +754,7 @@
           "name": "icon-timeline",
           "id": 88,
           "code": 921894,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 116,
@@ -794,7 +762,7 @@
           "name": "icon-timer-v1.5",
           "prevSize": 24,
           "code": 921895,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 11,
@@ -802,7 +770,7 @@
           "name": "icon-topic",
           "id": 6,
           "code": 921896,
-          "tempChar": ""
+          "tempChar": ""
         },
         {
           "order": 115,
@@ -810,13 +778,13 @@
           "name": "icon-box-with-dashed-lines",
           "id": 29,
           "code": 921897,
-          "tempChar": ""
+          "tempChar": ""
         }
       ],
       "metadata": {
         "name": "openmct-symbols-16px",
         "importSize": {
-          "width": 512,
+          "width": 448,
           "height": 512
         },
         "designer": "Charles Hacskaylo",
@@ -2005,7 +1973,7 @@
         },
         {
           "paths": [
-            "M960 432v-432l-164.8 164.8c-79.8-65.2-178.8-100.8-283.2-100.8-119.6 0-232.2 46.6-316.8 131.2s-131.2 197.2-131.2 316.8 46.6 232.2 131.2 316.8c84.6 84.6 197.2 131.2 316.8 131.2s232.2-46.6 316.8-131.2c69.4-69.4 113.2-157.4 126.6-252.8h-130c-29.8 145.8-159 256-313.6 256-176.4 0-320-143.6-320-320s143.8-320 320.2-320c72 0 138.4 23.8 192 64l-176 176h432z"
+            "M1012.8 414.2v-391.6l-127.6 127.4c-96.6-96.8-225.2-150-362-150s-265.2 53.2-362 150c-96.8 96.8-150 225.2-150 362s53.2 265.4 150 362c96.8 96.8 225.2 150 362 150s265.4-53.2 362-150l-136.6-136.6c-124.2 124.2-326.4 124.2-450.8 0-124.2-124.2-124.2-326.4 0-450.8 124.2-124.2 326.4-124.2 450.8 0l-127.4 127.4h391.6z"
           ],
           "grid": 16,
           "tags": [
@@ -2013,19 +1981,9 @@
           ],
           "defaultCode": 114,
           "id": 27,
-          "attrs": [
-            {
-              "fill": "rgb(0, 161, 75)"
-            }
-          ],
-          "isMulticolor": false,
-          "isMulticolor2": false,
+          "attrs": [],
           "colorPermutations": {
-            "1161751207457516161751": [
-              {
-                "f": 1
-              }
-            ]
+            "1161751207457516161751": []
           }
         },
         {
@@ -2152,37 +2110,6 @@
             "1161751207457516161751": []
           }
         },
-        {
-          "id": 105,
-          "paths": [
-            "M795.2 164.8c-79.8-65.2-178.8-100.8-283.2-100.8-119.6 0-232.2 46.6-316.8 131.2-69.4 69.4-113.2 157.4-126.6 252.8h130c29.6-145.8 158.8-256 313.4-256 72 0 138.4 23.8 192 64l-176 176h432v-432l-164.8 164.8z",
-            "M512 832c-72 0-138.4-23.8-192-64l176-176h-432v432l164.8-164.8c79.8 65.2 178.8 100.8 283.2 100.8 119.6 0 232.2-46.6 316.8-131.2 69.4-69.4 113.2-157.4 126.6-252.8h-130c-29.6 145.8-158.8 256-313.4 256z"
-          ],
-          "attrs": [
-            {
-              "fill": "rgb(0, 161, 75)"
-            },
-            {
-              "fill": "rgb(0, 161, 75)"
-            }
-          ],
-          "isMulticolor": false,
-          "isMulticolor2": false,
-          "grid": 16,
-          "tags": [
-            "icon-resync"
-          ],
-          "colorPermutations": {
-            "1161751207457516161751": [
-              {
-                "f": 1
-              },
-              {
-                "f": 1
-              }
-            ]
-          }
-        },
         {
           "paths": [
             "M512 0c-282.8 0-512 229.2-512 512s229.2 512 512 512 512-229.2 512-512-229.2-512-512-512zM832 704l-128 128-192-192-192 192-128-128 192-192-192-192 128-128 192 192 192-192 128 128-192 192 192 192z"
@@ -2198,134 +2125,6 @@
             "1161751207457516161751": []
           }
         },
-        {
-          "id": 103,
-          "paths": [
-            "M253.414 318.061l-155.172-116.384c-50.233 66.209-85.127 146.713-97.91 234.39l191.586 30.216c8.145-56.552 29.998-106.879 62.068-149.006z",
-            "M191.98 557.717l-191.919 27.434c13.115 90.459 48.009 170.963 99.174 238.453l154.18-117.665c-31.476-41.347-53.309-91.675-61.231-146.504z",
-            "M466.283 191.98l-27.434-191.919c-90.459 13.115-170.963 48.009-238.453 99.174l117.665 154.18c41.347-31.476 91.675-53.309 146.504-61.231z",
-            "M822.323 98.242c-66.209-50.233-146.713-85.127-234.39-97.91l-30.216 191.586c56.552 8.145 106.879 29.998 149.006 62.068z",
-            "M832.020 466.283l191.919-27.434c-13.115-90.459-48.009-170.963-99.174-238.453l-154.18 117.665c31.476 41.347 53.309 91.675 61.231 146.504z",
-            "M201.677 925.758c66.209 50.233 146.713 85.127 234.39 97.91l30.216-191.586c-56.552-8.145-106.879-29.998-149.006-62.068z",
-            "M770.586 705.939l155.131 116.343c50.233-66.209 85.127-146.713 97.91-234.39l-191.586-30.216c-8.125 56.564-29.966 106.906-62.028 149.049z",
-            "M557.717 832.020l27.434 191.919c90.459-13.115 170.963-48.009 238.453-99.174l-117.665-154.18c-41.347 31.476-91.675 53.309-146.504 61.231z",
-            "M770.586 512c0 142.813-115.773 258.586-258.586 258.586s-258.586-115.773-258.586-258.586c0-142.813 115.773-258.586 258.586-258.586s258.586 115.773 258.586 258.586z"
-          ],
-          "attrs": [
-            {
-              "fill": "rgb(0, 161, 75)"
-            },
-            {
-              "fill": "rgb(0, 161, 75)"
-            },
-            {
-              "fill": "rgb(0, 161, 75)"
-            },
-            {
-              "fill": "rgb(0, 161, 75)"
-            },
-            {
-              "fill": "rgb(0, 161, 75)"
-            },
-            {
-              "fill": "rgb(0, 161, 75)"
-            },
-            {
-              "fill": "rgb(0, 161, 75)"
-            },
-            {
-              "fill": "rgb(0, 161, 75)"
-            },
-            {
-              "fill": "rgb(0, 161, 75)"
-            }
-          ],
-          "isMulticolor": false,
-          "isMulticolor2": false,
-          "grid": 16,
-          "tags": [
-            "icon-brightness"
-          ],
-          "colorPermutations": {
-            "1161751207457516161751": [
-              {
-                "f": 1
-              },
-              {
-                "f": 1
-              },
-              {
-                "f": 1
-              },
-              {
-                "f": 1
-              },
-              {
-                "f": 1
-              },
-              {
-                "f": 1
-              },
-              {
-                "f": 1
-              },
-              {
-                "f": 1
-              },
-              {
-                "f": 1
-              }
-            ]
-          }
-        },
-        {
-          "id": 102,
-          "paths": [
-            "M512 0c-282.78 0-512 229.24-512 512s229.22 512 512 512 512-229.24 512-512-229.22-512-512-512zM783.52 783.52c-69.111 69.481-164.785 112.481-270.502 112.481-0.358 0-0.716-0-1.074-0.001l0.055-768c212.070 0.010 383.982 171.929 383.982 384 0 106.034-42.977 202.031-112.462 271.52z"
-          ],
-          "attrs": [
-            {
-              "fill": "rgb(0, 161, 75)"
-            }
-          ],
-          "isMulticolor": false,
-          "isMulticolor2": false,
-          "grid": 16,
-          "tags": [
-            "icon-contrast"
-          ],
-          "colorPermutations": {
-            "1161751207457516161751": [
-              {
-                "f": 1
-              }
-            ]
-          }
-        },
-        {
-          "id": 104,
-          "paths": [
-            "M460.8 460.8l-187.8-187.8c57.2-42.8 128-68.2 204.8-68.2 188.2 0 341.6 153.2 341.6 341.4s-153.2 341.2-341.4 341.2c-165 0-302.8-117.6-334.6-273h-138.4c14.2 101.8 61 195.6 135 269.6 90.2 90.2 210.4 140 338 140s247.6-49.8 338-140 140-210.4 140-338-49.8-247.6-140-338-210.4-140-338-140c-111.4 0-217 38-302 107.6l-176-175.6v460.8h460.8z"
-          ],
-          "attrs": [
-            {
-              "fill": "rgb(0, 161, 75)"
-            }
-          ],
-          "isMulticolor": false,
-          "isMulticolor2": false,
-          "grid": 16,
-          "tags": [
-            "icon-reset"
-          ],
-          "colorPermutations": {
-            "1161751207457516161751": [
-              {
-                "f": 1
-              }
-            ]
-          }
-        },
         {
           "paths": [
             "M576 64h-256l320 320h-290.256c-44.264-76.516-126.99-128-221.744-128h-128v512h128c94.754 0 177.48-51.484 221.744-128h290.256l-320 320h256l448-448-448-448z"

platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg

@@ -65,18 +65,14 @@
 <glyph unicode="&#xe1026;" glyph-name="icon-plot-resource" d="M255.884 256c0.040 0.034 0.082 0.074 0.116 0.116v127.884c0 70.58 57.42 128 128 128h255.884c0.040 0.034 0.082 0.074 0.116 0.116v127.884c0 70.58 57.42 128 128 128h143.658c-93.832 117.038-237.98 192-399.658 192-282.77 0-512-229.23-512-512 0-67.904 13.25-132.704 37.256-192h218.628zM768.116 640c-0.040-0.034-0.082-0.074-0.116-0.116v-127.884c0-70.58-57.42-128-128-128h-255.884c-0.040-0.034-0.082-0.074-0.116-0.116v-127.884c0-70.58-57.42-128-128-128h-143.658c93.832-117.038 237.98-192 399.658-192 282.77 0 512 229.23 512 512 0 67.904-13.25 132.704-37.256 192h-218.628z" />
 <glyph unicode="&#xe1027;" glyph-name="icon-pointer-left" horiz-adv-x="512" d="M510-64l-256 512 256 512h-256l-256-512 256-512z" />
 <glyph unicode="&#xe1028;" glyph-name="icon-pointer-right" horiz-adv-x="512" d="M-2 960l256-512-256-512h256l256 512-256 512z" />
-<glyph unicode="&#xe1029;" glyph-name="icon-refresh" d="M960 528v432l-164.8-164.8c-79.8 65.2-178.8 100.8-283.2 100.8-119.6 0-232.2-46.6-316.8-131.2s-131.2-197.2-131.2-316.8 46.6-232.2 131.2-316.8c84.6-84.6 197.2-131.2 316.8-131.2s232.2 46.6 316.8 131.2c69.4 69.4 113.2 157.4 126.6 252.8h-130c-29.8-145.8-159-256-313.6-256-176.4 0-320 143.6-320 320s143.8 320 320.2 320c72 0 138.4-23.8 192-64l-176-176h432z" />
+<glyph unicode="&#xe1029;" glyph-name="icon-refresh" d="M1012.8 545.8v391.6l-127.6-127.4c-96.6 96.8-225.2 150-362 150s-265.2-53.2-362-150c-96.8-96.8-150-225.2-150-362s53.2-265.4 150-362c96.8-96.8 225.2-150 362-150s265.4 53.2 362 150l-136.6 136.6c-124.2-124.2-326.4-124.2-450.8 0-124.2 124.2-124.2 326.4 0 450.8 124.2 124.2 326.4 124.2 450.8 0l-127.4-127.4h391.6z" />
 <glyph unicode="&#xe1030;" glyph-name="icon-save" d="M192.2 384c-0.2 0-0.2 0 0 0l-0.2-448h640v447.8c0 0 0 0-0.2 0.2h-639.6zM978.8 749.2l-165.4 165.4c-25 25-74.2 45.4-109.4 45.4h-576c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128v448c0 35.2 28.8 64 64 64h640c35.2 0 64-28.8 64-64v-448c70.4 0 128 57.6 128 128v576c0 35.2-20.4 84.4-45.2 109.2zM704 704c0-35.2-28.8-64-64-64h-448c-35.2 0-64 28.8-64 64v192h320v-192h128v192h128v-192z" />
 <glyph unicode="&#xe1031;" glyph-name="icon-sine" d="M1022.294 448c-1.746 7.196-3.476 14.452-5.186 21.786-20.036 85.992-53.302 208.976-98 306.538-22.42 48.938-45.298 86.556-69.946 115.006-48.454 55.93-98.176 67.67-131.356 67.67s-82.902-11.74-131.356-67.672c-24.648-28.45-47.528-66.068-69.948-115.006-44.696-97.558-77.962-220.544-98-306.538-21.646-92.898-46.444-175.138-71.71-237.836-16.308-40.46-30.222-66.358-40.6-82.604-10.378 16.246-24.292 42.142-40.6 82.604-23.272 57.75-46.144 132.088-66.524 216.052h-197.362c1.746-7.196 3.476-14.452 5.186-21.786 20.036-85.992 53.302-208.976 98-306.538 22.42-48.938 45.298-86.556 69.946-115.006 48.454-55.932 98.176-67.672 131.356-67.672s82.902 11.74 131.356 67.672c24.648 28.45 47.528 66.068 69.948 115.006 44.696 97.558 77.962 220.544 98 306.538 21.646 92.898 46.444 175.138 71.71 237.836 16.308 40.46 30.222 66.358 40.6 82.604 10.378-16.246 24.292-42.142 40.6-82.604 23.274-57.748 46.146-132.086 66.526-216.050h197.36z" />
 <glyph unicode="&#xe1032;" glyph-name="icon-T" d="M0 960v-256h128v64h256v-704h-192v-128h640v128h-192v704h256v-64h128v256z" />
 <glyph unicode="&#xe1033;" glyph-name="icon-thumbs-strip" d="M448 578c0-35.2-28.8-64-64-64h-320c-35.2 0-64 28.8-64 64v320c0 35.2 28.8 64 64 64h320c35.2 0 64-28.8 64-64v-320zM1024 578c0-35.2-28.8-64-64-64h-320c-35.2 0-64 28.8-64 64v320c0 35.2 28.8 64 64 64h320c35.2 0 64-28.8 64-64v-320zM448 2c0-35.2-28.8-64-64-64h-320c-35.2 0-64 28.8-64 64v320c0 35.2 28.8 64 64 64h320c35.2 0 64-28.8 64-64v-320zM1024 2c0-35.2-28.8-64-64-64h-320c-35.2 0-64 28.8-64 64v320c0 35.2 28.8 64 64 64h320c35.2 0 64-28.8 64-64v-320z" />
 <glyph unicode="&#xe1034;" glyph-name="icon-two-parts-both" d="M896 960h-768c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v768c0 70.4-57.6 128-128 128zM128 832h320v-768h-320v768zM896 64h-320v768h320v-768z" />
 <glyph unicode="&#xe1035;" glyph-name="icon-two-parts-one-only" d="M896 960h-768c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v768c0 70.4-57.6 128-128 128zM896 64h-320v768h320v-768z" />
-<glyph unicode="&#xe1036;" glyph-name="icon-resync" d="M795.2 795.2c-79.8 65.2-178.8 100.8-283.2 100.8-119.6 0-232.2-46.6-316.8-131.2-69.4-69.4-113.2-157.4-126.6-252.8h130c29.6 145.8 158.8 256 313.4 256 72 0 138.4-23.8 192-64l-176-176h432v432l-164.8-164.8zM512 128c-72 0-138.4 23.8-192 64l176 176h-432v-432l164.8 164.8c79.8-65.2 178.8-100.8 283.2-100.8 119.6 0 232.2 46.6 316.8 131.2 69.4 69.4 113.2 157.4 126.6 252.8h-130c-29.6-145.8-158.8-256-313.4-256z" />
-<glyph unicode="&#xe1037;" glyph-name="icon-reset" d="M460.8 499.2l-187.8 187.8c57.2 42.8 128 68.2 204.8 68.2 188.2 0 341.6-153.2 341.6-341.4s-153.2-341.2-341.4-341.2c-165 0-302.8 117.6-334.6 273h-138.4c14.2-101.8 61-195.6 135-269.6 90.2-90.2 210.4-140 338-140s247.6 49.8 338 140 140 210.4 140 338-49.8 247.6-140 338-210.4 140-338 140c-111.4 0-217-38-302-107.6l-176 175.6v-460.8h460.8z" />
-<glyph unicode="&#xe1038;" glyph-name="icon-x-in-circle" d="M512 960c-282.8 0-512-229.2-512-512s229.2-512 512-512 512 229.2 512 512-229.2 512-512 512zM832 256l-128-128-192 192-192-192-128 128 192 192-192 192 128 128 192-192 192 192 128-128-192-192 192-192z" />
-<glyph unicode="&#xe1039;" glyph-name="icon-brightness" d="M253.414 641.939l-155.172 116.384c-50.233-66.209-85.127-146.713-97.91-234.39l191.586-30.216c8.145 56.552 29.998 106.879 62.068 149.006zM191.98 402.283l-191.919-27.434c13.115-90.459 48.009-170.963 99.174-238.453l154.18 117.665c-31.476 41.347-53.309 91.675-61.231 146.504zM466.283 768.020l-27.434 191.919c-90.459-13.115-170.963-48.009-238.453-99.174l117.665-154.18c41.347 31.476 91.675 53.309 146.504 61.231zM822.323 861.758c-66.209 50.233-146.713 85.127-234.39 97.91l-30.216-191.586c56.552-8.145 106.879-29.998 149.006-62.068zM832.020 493.717l191.919 27.434c-13.115 90.459-48.009 170.963-99.174 238.453l-154.18-117.665c31.476-41.347 53.309-91.675 61.231-146.504zM201.677 34.242c66.209-50.233 146.713-85.127 234.39-97.91l30.216 191.586c-56.552 8.145-106.879 29.998-149.006 62.068zM770.586 254.061l155.131-116.343c50.233 66.209 85.127 146.713 97.91 234.39l-191.586 30.216c-8.125-56.564-29.966-106.906-62.028-149.049zM557.717 127.98l27.434-191.919c90.459 13.115 170.963 48.009 238.453 99.174l-117.665 154.18c-41.347-31.476-91.675-53.309-146.504-61.231zM770.586 448c0-142.813-115.773-258.586-258.586-258.586s-258.586 115.773-258.586 258.586c0 142.813 115.773 258.586 258.586 258.586s258.586-115.773 258.586-258.586z" />
-<glyph unicode="&#xe1040;" glyph-name="icon-contrast" d="M512 960c-282.78 0-512-229.24-512-512s229.22-512 512-512 512 229.24 512 512-229.22 512-512 512zM783.52 176.48c-69.111-69.481-164.785-112.481-270.502-112.481-0.358 0-0.716 0-1.074 0.001l0.055 768c212.070-0.010 383.982-171.929 383.982-384 0-106.034-42.977-202.031-112.462-271.52z" />
+<glyph unicode="&#xe1036;" glyph-name="icon-x-in-circle" d="M512 960c-282.8 0-512-229.2-512-512s229.2-512 512-512 512 229.2 512 512-229.2 512-512 512zM832 256l-128-128-192 192-192-192-128 128 192 192-192 192 128 128 192-192 192 192 128-128-192-192 192-192z" />
 <glyph unicode="&#xe1100;" glyph-name="icon-activity" d="M576 896h-256l320-320h-290.256c-44.264 76.516-126.99 128-221.744 128h-128v-512h128c94.754 0 177.48 51.484 221.744 128h290.256l-320-320h256l448 448-448 448z" />
 <glyph unicode="&#xe1101;" glyph-name="icon-activity-mode" d="M512 960c-214.866 0-398.786-132.372-474.744-320h90.744c56.86 0 107.938-24.724 143.094-64h240.906l-192 192h256l320-320-320-320h-256l192 192h-240.906c-35.156-39.276-86.234-64-143.094-64h-90.744c75.958-187.628 259.878-320 474.744-320 282.77 0 512 229.23 512 512s-229.23 512-512 512z" />
 <glyph unicode="&#xe1102;" glyph-name="icon-autoflow-tabular" d="M192 960c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h64v1024h-64zM384 960h256v-1024h-256v1024zM832 960h-64v-704h256v512c0 105.6-86.4 192-192 192z" />

platform/commonUI/general/res/sass/_animations.scss

@@ -1,91 +0,0 @@
-@include keyframes(rotation) {
-    100% { @include transform(rotate(360deg)); }
-}
-
-@include keyframes(rotation-centered) {
-    0%   { @include transform(translate(-50%, -50%) rotate(0deg)); }
-    100% { @include transform(translate(-50%, -50%) rotate(360deg)); }
-}
-
-@include keyframes(clock-hands) {
-    0% { @include transform(translate(-50%, -50%) rotate(0deg)); }
-    100% { @include transform(translate(-50%, -50%) rotate(360deg));  }
-}
-
-@include keyframes(clock-hands-sticky) {
-    0% {
-        @include transform(translate(-50%, -50%) rotate(0deg));
-    }
-    7% {
-        @include transform(translate(-50%, -50%) rotate(0deg));
-    }
-    8% {
-        @include transform(translate(-50%, -50%) rotate(30deg));
-    }
-    15% {
-        @include transform(translate(-50%, -50%) rotate(30deg));
-    }
-    16% {
-        @include transform(translate(-50%, -50%) rotate(60deg));
-    }
-    24% {
-        @include transform(translate(-50%, -50%) rotate(60deg));
-    }
-    25% {
-        @include transform(translate(-50%, -50%) rotate(90deg));
-    }
-    32% {
-        @include transform(translate(-50%, -50%) rotate(90deg));
-    }
-    33% {
-        @include transform(translate(-50%, -50%) rotate(120deg));
-    }
-    40% {
-        @include transform(translate(-50%, -50%) rotate(120deg));
-    }
-    41% {
-        @include transform(translate(-50%, -50%) rotate(150deg));
-    }
-    49% {
-        @include transform(translate(-50%, -50%) rotate(150deg));
-    }
-    50% {
-        @include transform(translate(-50%, -50%) rotate(180deg));
-    }
-    57% {
-        @include transform(translate(-50%, -50%) rotate(180deg));
-    }
-    58% {
-        @include transform(translate(-50%, -50%) rotate(210deg));
-    }
-    65% {
-        @include transform(translate(-50%, -50%) rotate(210deg));
-    }
-    66% {
-        @include transform(translate(-50%, -50%) rotate(240deg));
-    }
-    74% {
-        @include transform(translate(-50%, -50%) rotate(240deg));
-    }
-    75% {
-        @include transform(translate(-50%, -50%) rotate(270deg));
-    }
-    82% {
-        @include transform(translate(-50%, -50%) rotate(270deg));
-    }
-    83% {
-        @include transform(translate(-50%, -50%) rotate(300deg));
-    }
-    90% {
-        @include transform(translate(-50%, -50%) rotate(300deg));
-    }
-    91% {
-        @include transform(translate(-50%, -50%) rotate(330deg));
-    }
-    99% {
-        @include transform(translate(-50%, -50%) rotate(330deg));
-    }
-    100% {
-        @include transform(translate(-50%, -50%) rotate(360deg));
-    }
-}

platform/commonUI/general/res/sass/_archetypes.scss

@@ -108,9 +108,6 @@
         &.grows {
             @include flex(1 1 auto);
         }
-        &.contents-align-right {
-            text-align: right;
-        }
     }
     .flex-container {
         // Apply to wrapping elements, mct-includes, etc.

platform/commonUI/general/res/sass/_constants.scss

@@ -49,6 +49,7 @@ $uePaneMiniTabFontSize: 8px;
 $uePaneMiniTabCollapsedW: 18px;
 $ueEditLeftPaneW: 75%;
 $treeSearchInputBarH: 25px;
+$ueTimeControlH: (33px, 18px, 20px);
 /*************** Panes */
 $ueBrowseLeftPaneTreeMinW: 150px;
 $ueBrowseLeftPaneTreeMaxW: 35%;
@@ -78,7 +79,7 @@ $treeContextTriggerW: 20px;
 /*************** Tabular */
 $tabularHeaderH: 22px;
 $tabularTdPadLR: $itemPadLR;
-$tabularTdPadTB: 2px;
+$tabularTdPadTB: 3px;
 /*************** Imagery */
 $imageMainControlBarH: 25px;
 $imageThumbsD: 120px;
@@ -99,7 +100,7 @@ $plotXBarH: 32px;
 $plotLegendH: 20px;
 $plotSwatchD: 8px;
 // 1: Top, 2: right, 3: bottom, 4: left
-$plotDisplayArea: ($plotLegendH + $interiorMargin, 0, $plotXBarH, $plotYBarW);
+$plotDisplayArea: ($plotLegendH + $interiorMargin, 0, $plotXBarH + $interiorMargin, $plotYBarW);
 /* min plot height is based on user testing to find minimum useful height */
 $plotMinH: 95px;
 /*************** Bubbles */
@@ -111,7 +112,6 @@ $bubbleMaxW: 300px;
 $reqSymbolW: 15px;
 $reqSymbolM: $interiorMargin * 2;
 $reqSymbolFontSize: 0.75em;
-$inputTextP: 3px 5px;
 /*************** Wait Spinner Defaults */
 $waitSpinnerD: 32px;
 $waitSpinnerTreeD: 20px;

platform/commonUI/general/res/sass/_data-status.scss

@@ -4,3 +4,4 @@
 		@include s-stale();
 	}
 }
+

platform/commonUI/general/res/sass/_effects.scss

@@ -39,20 +39,20 @@
     @include pulse($animName: pulse-subtle, $dur: 500ms, $opacity0: 0.7);
 }
 
-@mixin animTo($animName, $propName, $propValStart, $propValEnd, $dur: 500ms, $delay: 0, $dir: normal, $count: 1) {
+@mixin animTo($animName, $propName, $propValStart, $propValEnd, $dur: 500ms, $delay: 0) {
     @include keyframes($animName) {
         from { #{propName}: $propValStart; }
         to { #{$propName}: $propValEnd; }
     }
-    @include animToParams($animName, $dur: $dur, $delay: $delay, $dir: $dir, $count: $count)
+    @include animToParams($animName, $dur: 500ms, $delay: 0)
 }
 
-@mixin animToParams($animName, $dur: 500ms, $delay: 0, $dir: normal, $count: 1) {
+@mixin animToParams($animName, $dur: 500ms, $delay: 0) {
     @include animation-name($animName);
     @include animation-duration($dur);
     @include animation-delay($delay);
     @include animation-fill-mode(both);
-    @include animation-direction($dir);
-    @include animation-iteration-count($count);
+    @include animation-direction(normal);
+    @include animation-iteration-count(1);
     @include animation-timing-function(ease-in-out);
 }

platform/commonUI/general/res/sass/_global.scss

@@ -21,18 +21,18 @@
  *****************************************************************************/
 /************************** FONTS */
 @font-face {
-    /*
+	/*
     * Use https://icomoon.io/app with icomoon-project-openmct-symbols-16px.json
     * to generate font files
     */
-    font-family: 'symbolsfont';
-    src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.eot');
-    src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.eot?#iefix') format('embedded-opentype'),
-    url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.woff') format('woff'),
-    url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.ttf') format('truetype'),
-    url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.svg') format('svg');
-    font-weight: normal;
-    font-style: normal;
+	font-family: 'symbolsfont';
+	src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.eot');
+	src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.eot?#iefix') format('embedded-opentype'),
+	url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.woff') format('woff'),
+	url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.ttf') format('truetype'),
+	url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.svg') format('svg');
+	font-weight: normal;
+	font-style: normal;
 }
 
 @font-face {
@@ -52,53 +52,53 @@
 
 /************************** HTML ENTITIES */
 a {
-    color: $colorA;
-    cursor: pointer;
-    text-decoration: none;
-    &:hover {
-        color: $colorAHov;
-    }
+	color: $colorA;
+	cursor: pointer;
+	text-decoration: none;
+	&:hover {
+		color: $colorAHov;
+	}
 }
 
 body, html {
-    -webkit-font-smoothing: subpixel-antialiased;
-    background-color: $colorBodyBg;
-    color: $colorBodyFg;
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    font-size: 100%;
-    font-weight: 200;
-    height: 100%;
-    width: 100%;
+	-webkit-font-smoothing: subpixel-antialiased;
+	background-color: $colorBodyBg;
+	color: $colorBodyFg;
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 100%;
+	font-weight: 200;
+	height: 100%;
+	width: 100%;
 }
 
 em {
-    font-style: normal;
+	font-style: normal;
 }
 
 input, textarea {
-    font-family: Helvetica, Arial, sans-serif;
+	font-family: Helvetica, Arial, sans-serif;
 }
 
 input[type="text"],
 input[type="search"] {
-    vertical-align: baseline;
-    padding: $inputTextP;
+	vertical-align: baseline;
+	padding: 3px 5px;
 }
 
 h1, h2, h3 {
-    margin: 0;
+	margin: 0;
 }
 
 h1 {
-    font-size: 1.7em;
-    font-weight: normal !important;
-    line-height: 120%;
-    margin-bottom: 20px;
-    margin-top: 0;
+	font-size: 1.7em;
+	font-weight: normal !important;
+	line-height: 120%;
+	margin-bottom: 20px;
+	margin-top: 0;
 }
 
 p {
-    margin-bottom: $interiorMarginLg;
+	margin-bottom: $interiorMarginLg;
 }
 
 ol, ul {
@@ -108,30 +108,30 @@ ol, ul {
 }
 
 mct-container {
-    display: block;
+	display: block;
 }
 
 .abs {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    height: auto;
-    width: auto;
+	position: absolute;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	height: auto;
+	width: auto;
 }
 
 .code {
-    font-family: "Lucida Console", monospace;
-    font-size: 0.7em;
-    line-height: 150%;
-    white-space: pre;
+	font-family: "Lucida Console", monospace;
+	font-size: 0.7em;
+	line-height: 150%;
+	white-space: pre;
 }
 
 .codehilite {
-    @extend .code;
-    background-color: rgba($colorBodyFg, 0.1);
-    padding: 1em;
+	@extend .code;
+	background-color: rgba($colorBodyFg, 0.1);
+	padding: 1em;
 }
 
 .disabled,
@@ -141,41 +141,12 @@ a.disabled {
     cursor: default !important;
 }
 
-.s-status-missing {
-    // Labels. Expects .s-status-missing to be applied to mct-representation that contains
-    // .t-object-label
-    .t-object-label .t-item-icon:before {
-        content: $glyph-icon-object-unknown;
-    }
-
-    // Item, grid item. Expects .s-status-missing to be applied to mct-representation that contains .item.grid-item
-    .item .t-item-icon-glyph:before {
-        content: $glyph-icon-object-unknown;
-    }
-
-    // Object header. Expects .s-status-missing to be applied to mct-representation.object-header
-    &.object-header {
-        .type-icon:before {
-            content: $glyph-icon-object-unknown;
-        }
-    }
-
-    // Tree item. Expects .s-status-missing to be applied to .tree-item,
-    // and mct-representation.search-item
-    &.tree-item,
-    &.search-item {
-        > .rep-object-label .t-item-icon:before {
-            content: $glyph-icon-object-unknown;
-        }
-    }
-}
-
 .align-right {
-    text-align: right;
+	text-align: right;
 }
 
 .centered {
-    text-align: center;
+	text-align: center;
 }
 
 .ellipsis {
@@ -184,42 +155,24 @@ a.disabled {
 
 .scrolling,
 .scroll {
-    overflow: auto;
+	overflow: auto;
 }
 
 .vscroll {
-    overflow-y: auto;
-}
-
-.slidable {
-    cursor: move; // Fallback
-    cursor: grab;
-    cursor: -moz-grab;
-    cursor: -webkit-grab;
-    &.horz {
-        cursor: col-resize;
-    }
-    &.vert {
-        cursor: row-resize;
-    }
+	overflow-y: auto;
 }
 
 .no-margin {
-    margin: 0;
+	margin: 0;
 }
 
 .ds {
-    box-shadow: rgba(#000, 0.7) 0 4px 10px 2px;
+	box-shadow: rgba(#000, 0.7) 0 4px 10px 2px;
 }
 
 .hide,
 .hidden {
-    display: none !important;
-}
-
-.hide-nice {
-    opacity: 0;
-    pointer-events: none;
+	display: none !important;
 }
 
 .off {
@@ -233,7 +186,7 @@ a.disabled {
 }
 
 .sep {
-    color: rgba(#fff, 0.2);
+	color: rgba(#fff, 0.2);
 }
 
 .test-stripes {

platform/commonUI/general/res/sass/_glyphs.scss

@@ -40,6 +40,7 @@ $glyph-icon-brackets: '\e929';
 $glyph-icon-arrows-out: '\e1000';
 $glyph-icon-arrows-right-left: '\e1001';
 $glyph-icon-arrows-up-down: '\e1002';
+$glyph-icon-box-with-dashed-lines: '';
 $glyph-icon-bullet: '\e1004';
 $glyph-icon-calendar: '\e1005';
 $glyph-icon-chain-links: '\e1006';
@@ -72,11 +73,7 @@ $glyph-icon-T: '\e1032';
 $glyph-icon-thumbs-strip: '\e1033';
 $glyph-icon-two-parts-both: '\e1034';
 $glyph-icon-two-parts-one-only: '\e1035';
-$glyph-icon-resync: '\e1036';
-$glyph-icon-x-in-circle: '\e1038';
-$glyph-icon-brightness: '\e1039';
-$glyph-icon-contrast: '\e1040';
-$glyph-icon-reset: '\e1037';
+$glyph-icon-x-in-circle: '\e1036';
 $glyph-icon-activity: '\e1100';
 $glyph-icon-activity-mode: '\e1101';
 $glyph-icon-autoflow-tabular: '\e1102';
@@ -176,10 +173,6 @@ $glyph-icon-box-with-dashed-lines: '\e1129';
 .icon-two-parts-both {  @include glyph($glyph-icon-two-parts-both); }
 .icon-two-parts-one-only {  @include glyph($glyph-icon-two-parts-one-only); }
 .icon-x-in-circle {  @include glyph($glyph-icon-x-in-circle); }
-.icon-brightness {  @include glyph($glyph-icon-brightness); }
-.icon-contrast {  @include glyph($glyph-icon-contrast); }
-.icon-reset {  @include glyph($glyph-icon-reset); }
-.icon-resync {  @include glyph($glyph-icon-resync); }
 .icon-activity {  @include glyph($glyph-icon-activity); }
 .icon-activity-mode {  @include glyph($glyph-icon-activity-mode); }
 .icon-autoflow-tabular {  @include glyph($glyph-icon-autoflow-tabular); }
@@ -216,4 +209,4 @@ $glyph-icon-box-with-dashed-lines: '\e1129';
 .icon-eye-open-12px {  @include glyph($glyph-icon-eye-open,'symbolsfont-12px'); }
 .icon-collapse-pane-left-12px {  @include glyph($glyph-icon-collapse-pane-left,'symbolsfont-12px'); }
 .icon-collapse-pane-right-12px {  @include glyph($glyph-icon-collapse-pane-right,'symbolsfont-12px'); }
-.icon-folder-12px {  @include glyph($glyph-icon-folder,'symbolsfont-12px'); }
+.icon-folder-12px {  @include glyph($glyph-icon-folder,'symbolsfont-12px'); }

platform/commonUI/general/res/sass/_icons.scss

@@ -30,7 +30,6 @@
 
 .ui-symbol {
     font-family: 'symbolsfont';
-    -webkit-font-smoothing: antialiased;
 }
 
 .ui-symbol.icon {
@@ -71,21 +70,10 @@
     line-height: inherit;
     position: relative;
     &.l-icon-link {
-        &:after {
-            color: $colorIconLink;
-            content: $glyph-icon-link;
-            height: auto; width: auto;
-            position: absolute;
-            left: 0; top: 0; right: 0; bottom: 20%;
-            @include transform-origin(bottom left);
-            @include transform(scale(0.3));
-            z-index: 2;
-        }
-
-/*        .t-item-icon-glyph {
+        .t-item-icon-glyph {
             &:after {
                 color: $colorIconLink;
-                content: '\e921'; //$glyph-icon-link;
+                content: $glyph-icon-link;
                 height: auto; width: auto;
                 position: absolute;
                 left: 0; top: 0; right: 0; bottom: 20%;
@@ -93,6 +81,6 @@
                 @include transform(scale(0.3));
                 z-index: 2;
             }
-        }*/
+        }
     }
 }

platform/commonUI/general/res/sass/_main.scss

@@ -20,9 +20,8 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 @import "effects";
-@import "glyphs";
-@import "animations";
 @import "global";
+@import "glyphs";
 @import "archetypes";
 @import "about";
 @import "text";
@@ -42,6 +41,7 @@
 @import "controls/lists";
 @import "controls/menus";
 @import "controls/messages";
+@import "controls/time-controller";
 @import "mobile/controls/menus";
 
 /********************************* FORMS */

platform/commonUI/general/res/sass/_mixins.scss

@@ -185,15 +185,21 @@
 }
 
 @mixin sliderTrack($bg: $scrollbarTrackColorBg) {
+    //$b: 1px solid lighten($bg, 30%);
     border-radius: 2px;
     box-sizing: border-box;
     @include boxIncised(0.7);
     background-color: $bg;
+    //border-bottom: $b;
+    //border-right: $b;
 }
 
 @mixin controlGrippy($b, $direction: horizontal, $w: 1px, $style: dotted) {
+    //&:before {
+    //@include trans-prop-nice("border-color", 25ms);
     content: '';
     display: block;
+    //height: auto;
     pointer-events: none;
     position: absolute;
     z-index: 2;
@@ -268,6 +274,16 @@
     text-shadow: rgba(black, $sVal) 0 3px 7px;
 }
 
+@function pullForward($c, $p: 20%) {
+    // For dark interfaces, lighter things come forward
+    @return lighten($c, $p);
+}
+
+@function pushBack($c, $p: 20%) {
+    // For dark interfaces, darker things move back
+    @return darken($c, $p);
+}
+
 @function percentToDecimal($p) {
 	@return $p / 100%;
 }
@@ -288,6 +304,7 @@
 	border-radius: $controlCr;
 	box-sizing: border-box;
 	color: $fg;
+	//display: inline-block;
 }
 
 @mixin btnBase($bg: $colorBtnBg, $bgHov: $colorBtnBgHov, $fg: $colorBtnFg, $fgHov: $colorBtnFgHov, $ic: $colorBtnIcon, $icHov: $colorBtnIconHov) {
@@ -363,13 +380,14 @@
     }
 }
 
-@mixin cursorGrab() {
-    cursor: grab;
-    cursor: -webkit-grab;
-    &:active {
-        cursor: grabbing;
-        cursor: -webkit-grabbing;
-    }
+@mixin webkitProp($name, $val) {
+	#{$name}: #{$val};
+	-webkit-#{$name}: #{$val};
+}
+
+@mixin webkitVal($name, $val) {
+	#{$name}: #{$val};
+	#{$name}: -webkit-#{$val};
 }
 
 @mixin verticalCenter {
@@ -391,14 +409,6 @@
     white-space: nowrap;
 }
 
-@mixin reverseEllipsis() {
-    direction: rtl;
-    unicode-bidi:bidi-override;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-}
-
 @mixin scrollH($showBar: auto) {
     overflow-x: $showBar;
     overflow-y: hidden;

platform/commonUI/general/res/sass/controls/_buttons.scss

@@ -104,17 +104,9 @@ body.desktop .mini-tab-icon {
     }
 }
 
-@mixin btnSetButtonFirst() {
-    @include border-left-radius($controlCr);
-    margin-left: 0;
-}
-
-@mixin btnSetButtonLast() {
-    @include border-right-radius($controlCr);
-}
-
 .l-btn-set {
     // Buttons that have a very tight conceptual grouping - no internal space between them.
+    // Structure: .btn-set > mct-representation class=first|last > .s-button
     font-size: 0; // Remove space between s-button elements due to white space in markup
 
     .s-button {
@@ -122,16 +114,20 @@ body.desktop .mini-tab-icon {
         margin-left: 1px;
     }
 
-    > .s-button {
-        // Styles for .s-button as immediate descendants in .l-btn-set
-        &:first-child { @include btnSetButtonFirst(); }
-        &:last-child { @include btnSetButtonLast(); }
+    .first {
+        .s-button,
+        &.s-button {
+            @include border-left-radius($controlCr);
+            margin-left: 0;
+        }
     }
 
-    // Must use following due to DOM structure of action buttons,
-    // which have structure like .l-btn-set > mct-representation class=first|last > .s-button
-    .first > .s-button { @include btnSetButtonFirst(); }
-    .last > .s-button { @include btnSetButtonLast(); }
+    .last {
+        .s-button,
+        &.s-button {
+            @include border-right-radius($controlCr);
+        }
+    }
 }
 
 .paused {

platform/commonUI/general/res/sass/controls/_controls.scss

@@ -122,21 +122,13 @@
     // Default position is upper right
     $p: $interiorMargin;
     position: absolute;
-    top: $p; right: $p; bottom: auto;
-    text-align: right;
+    top: $p;
+    right: $p;
     z-index: 5;
 }
 
 .s-local-controls {
-    @include trans-prop-nice(opacity);
     font-size: 0.7rem;
-    &.s-wrapper-transluc {
-        // Semi-opaque wrapper to visually distinguish a control
-        // from the background
-        background: rgba($colorTransLucBg, 0.7);
-        box-sizing: border-box;
-        border-radius: $controlCr;
-    }
 }
 
 /******************************************************** CUSTOM CHECKBOXES */
@@ -304,6 +296,8 @@ input[type="search"] {
     .title-label {
         color: $colorObjHdrTxt;
         @include ellipsize();
+        @include webkitProp(flex, '0 1 auto');
+        padding-right: 0.35em; // For context arrow. Done with em's so pad is relative to the scale of the text.
     }
 
     .context-available-w {
@@ -314,10 +308,6 @@ input[type="search"] {
         font-size: 0.7em;
         @include flex(0 0 1);
     }
-
-    .t-object-alert {
-        display: none;
-    }
 }
 
 /******************************************************** PROGRESS BAR */
@@ -451,63 +441,6 @@ input[type="search"] {
     }
 }
 
-@mixin sliderKnob() {
-    $h: 16px;
-    cursor: pointer;
-    width: floor($h/1.75);
-    height: $h;
-    margin-top: 1 + floor($h/2) * -1;
-    @include btnSubtle(pullForward($colorBtnBg, 10%));
-    //border-radius: 50% !important;
-}
-
-@mixin sliderKnobRound() {
-    $h: 12px;
-    cursor: pointer;
-    width: $h;
-    height: $h;
-    margin-top: 1 + floor($h/2) * -1;
-    @include btnSubtle(pullForward($colorBtnBg, 20%));
-    border-radius: 50% !important;
-}
-
-input[type="range"] {
-    // HTML5 range inputs
-
-    -webkit-appearance: none; /* Hides the slider so that custom slider can be made */
-    background: transparent; /* Otherwise white in Chrome */
-    &:focus {
-        outline: none; /* Removes the blue border. */
-    }
-
-    // Thumb
-    &::-webkit-slider-thumb {
-        -webkit-appearance: none;
-        @include sliderKnobRound();
-    }
-    &::-moz-range-thumb {
-        border: none;
-        @include sliderKnobRound();
-    }
-    &::-ms-thumb {
-        border: none;
-        @include sliderKnobRound();
-    }
-
-    // Track
-    &::-webkit-slider-runnable-track {
-        width: 100%;
-        height: 3px;
-        @include sliderTrack();
-    }
-
-    &::-moz-range-track {
-        width: 100%;
-        height: 3px;
-        @include sliderTrack();
-    }
-}
-
 /******************************************************** DATETIME PICKER */
 .l-datetime-picker {
     $r1H: 15px;
@@ -661,4 +594,3 @@ body.desktop {
         background: $scrollbarTrackColorBg;
     }
 }
-

platform/commonUI/general/res/sass/controls/_menus.scss

@@ -178,7 +178,7 @@
 	}
 	.pane {
 		box-sizing: border-box;
-		&.menu-items {
+		&.left {
 			border-right: 1px solid pullForward($colorMenuBg, 10%);
 			left: 0;
 			padding-right: $interiorMargin;
@@ -194,53 +194,38 @@
 				}
 			}
 		}
-		&.menu-item-description {
+		&.right {
 			left: auto;
 			right: 0;
 			padding: $interiorMargin * 5;
 			width: $prw;
-            .desc-area {
-                &.icon {
-                    color: $colorCreateMenuLgIcon;
-                    font-size: 8em;
-                    margin-bottom: $interiorMargin * 3;
-                    position: relative;
-                    text-align: center;
-                }
-                &.title {
-                    color: $colorCreateMenuText;
-                    font-size: 1.2em;
-                    margin-bottom: $interiorMargin * 2;
-                }
-                &.description {
-                    color: pushBack($colorCreateMenuText, 20%);
-                    font-size: 0.8em;
-                    line-height: 1.5em;
-                }
-            }
 		}
 	}
-
-    &.mini {
-        width: 400px;
-        height: 300px;
-        .pane {
-            &.menu-items {
-                font-size: 0.8em;
-            }
-            &.menu-item-description {
-                padding: $interiorMargin * 3;
-                .desc-area {
-                    &.icon {
-                        font-size: 4em;
-                    }
-                    &.title {
-                        font-size: 1em;
-                    }
-                }
-            }
-        }
-    }
+	.menu-item-description {
+		.desc-area {
+			&.icon {
+				$h: 150px;
+				color: $colorCreateMenuLgIcon;
+				position: relative;
+				font-size: 8em;
+				left: 0;
+				height: $h;
+				line-height: $h;
+				margin-bottom: $interiorMargin * 5;
+				text-align: center;
+			}
+			&.title {
+				color: $colorCreateMenuText;
+				font-size: 1.2em;
+				margin-bottom: 0.5em;
+			}
+			&.description {
+				color: $colorCreateMenuText;
+				font-size: 0.8em;
+				line-height: 1.5em;
+			}
+		}
+	}
 }
 .context-menu {
 	font-size: 0.80rem;
@@ -273,12 +258,7 @@
 
 .btn-bar.right .menu,
 .menus-to-left .menu {
-        z-index: 79;
 	left: auto;
 	right: 0;
 	width: auto;
 }
-
-.menus-up .menu {
-    bottom: $btnStdH; top: auto;
-}

platform/commonUI/general/res/sass/controls/_messages.scss

@@ -345,29 +345,3 @@ body.desktop .t-message-single {
 body.desktop .t-message-list {
     .message-contents .l-message { margin-right: $interiorMarginLg; }
 }
-
-// Alert elements in views
-.s-unsynced {
-    $c: $colorPausedBg;
-    border: 1px solid $c;
-    @include animTo($animName: pulsePaused, $propName: border-color, $propValStart: rgba($c, 0.8), $propValEnd: rgba($c, 0.5), $dur: $animPausedPulseDur, $dir: alternate, $count: infinite);
-}
-
-.s-status-timeconductor-unsynced {
-    // Plot areas
-    .gl-plot .gl-plot-display-area {
-        @extend .s-unsynced;
-    }
-
-    // Object headers
-    .object-header {
-        .t-object-alert {
-            display: inline;
-            &.t-alert-unsynced {
-                @extend .icon-alert-triangle;
-                color: $colorPausedBg;
-            }
-        }
-    }
-}
-

platform/commonUI/general/res/sass/controls/_time-controller.scss

@@ -0,0 +1,266 @@
+@mixin toiLineHovEffects() {
+	&:before,
+	&:after {
+		background-color: $timeControllerToiLineColorHov;
+	}
+}
+
+.l-time-controller {
+	$minW: 500px;
+	$knobHOffset: 0px;
+	$knobM: ($sliderKnobW + $knobHOffset) * -1;
+	$rangeValPad: $interiorMargin;
+	$rangeValOffset: $sliderKnobW + $interiorMargin;
+	$timeRangeSliderLROffset: 150px + ($sliderKnobW * 2);
+	$r1H: nth($ueTimeControlH,1); // Not currently used
+	$r2H: nth($ueTimeControlH,2);
+	$r3H: nth($ueTimeControlH,3);
+
+    min-width: $minW;
+    font-size: 0.8rem;
+
+	.l-time-range-inputs-holder,
+	.l-time-range-slider-holder,
+	.l-time-range-ticks-holder
+	{
+		box-sizing: border-box;
+        position: relative;
+        &:not(:first-child) {
+            margin-top: $interiorMargin;
+        }
+	}
+	.l-time-range-slider,
+	.l-time-range-ticks {
+		@include absPosDefault(0, visible);
+		left: $timeRangeSliderLROffset; right: $timeRangeSliderLROffset;
+	}
+
+	.l-time-range-inputs-holder {
+		border-top: 1px solid $colorInteriorBorder;
+        padding-top: $interiorMargin;
+        &.l-flex-row,
+        .l-flex-row {
+            @include align-items(center);
+            .flex-elem {
+                height: auto;
+                line-height: normal;
+            }
+        }
+		.type-icon {
+			font-size: 120%;
+			vertical-align: middle;
+		}
+		.l-time-range-input-w,
+		.l-time-range-inputs-elem {
+			margin-right: $interiorMargin;
+			.lbl {
+				color: $colorPlotLabelFg;
+			}
+			.ui-symbol.icon {
+				font-size: 11px;
+			}
+		}
+        .l-time-range-input-w {
+            // Wraps a datetime text input field
+            position: relative;
+            input[type="text"] {
+                width: 200px;
+                &.picker-icon {
+                    padding-right: 20px;
+                }
+            }
+            .icon-calendar {
+                position: absolute;
+                right: 5px;
+                top: 5px;
+            }
+        }
+	}
+
+	.l-time-range-slider-holder {
+		height: $r2H;
+		.range-holder {
+			box-shadow: none;
+			background: none;
+			border: none;
+			.range {
+				.toi-line {
+					$myC: $timeControllerToiLineColor;
+					$myW: 8px;
+					@include transform(translateX(50%));
+					position: absolute;
+					top: 0; right: 0; bottom: 0px; left: auto;
+					width: $myW;
+					height: auto;
+					z-index: 2;
+					&:before {
+						// Vert line
+                        background-color: $myC;
+                        position: absolute;
+                        content: "";
+						top: 0; right: auto; bottom: -10px; left: floor($myW/2) - 1;
+						width: 1px;
+					}
+				}
+				&:hover .toi-line {
+					@include toiLineHovEffects;
+				}
+			}
+		}
+		&:not(:active) {
+			.knob,
+			.range {
+				@include transition-property(left, right);
+				@include transition-duration(500ms);
+				@include transition-timing-function(ease-in-out);
+			}
+		}
+	}
+
+	.l-time-range-ticks-holder {
+		height: $r3H;
+		.l-time-range-ticks {
+			border-top: 1px solid $colorTick;
+			.tick {
+				background-color: $colorTick;
+				border:none;
+				height: 5px;
+				width: 1px;
+				margin-left: -1px;
+				position: absolute;
+				&:first-child {
+					margin-left: 0;
+				}
+				.l-time-range-tick-label {
+					@include webkitProp(transform, translateX(-50%));
+					color: $colorPlotLabelFg;
+					display: inline-block;
+					font-size: 0.7rem;
+					position: absolute;
+					top: 5px;
+					white-space: nowrap;
+					z-index: 2;
+				}
+			}
+		}
+	}
+
+	.knob {
+		z-index: 2;
+        &:before {
+            $mTB: 2px;
+            $grippyW: 3px;
+            $mLR: ($sliderKnobW - $grippyW)/2;
+            @include bgStripes($c: pullForward($sliderColorKnob, 20%), $a: 1, $bgsize: 4px, $angle: 0deg);
+            content: '';
+            display: block;
+            position: absolute;
+            top: $mTB; right: $mLR; bottom: $mTB; left: $mLR;
+        }
+		.range-value {
+			@include trans-prop-nice-fade(.25s);
+            font-size: 0.7rem;
+			position: absolute;
+			height: $r2H;
+			line-height: $r2H;
+            white-space: nowrap;
+            z-index: 1;
+		}
+		&:hover {
+            .range-value {
+                color: $sliderColorKnobHov;
+            }
+		}
+		&.knob-l {
+			margin-left: $knobM;
+			.range-value {
+				text-align: right;
+				right: $rangeValOffset;
+			}
+		}
+		&.knob-r {
+			margin-right: $knobM;
+			.range-value {
+				left: $rangeValOffset;
+			}
+			&:hover + .range-holder .range .toi-line {
+				@include toiLineHovEffects;
+			}
+		}
+	}
+
+	.l-time-domain-selector {
+		position: absolute;
+		right: 0px;
+		top: $interiorMargin;
+	}
+
+}
+
+.s-time-range-val {
+	border-radius: $controlCr;
+	background-color: $colorInputBg;
+	padding: 1px 1px 0 $interiorMargin;
+}
+
+/******************************************************************** MOBILE */
+
+@include phoneandtablet {
+    .l-time-controller {
+        min-width: 0;
+        .l-time-range-slider-holder,
+        .l-time-range-ticks-holder {
+            display: none;
+        }
+    }
+}
+
+@include phone {
+    .l-time-controller {
+        .l-time-range-inputs-holder {
+            &.l-flex-row,
+            .l-flex-row {
+                @include align-items(flex-start);
+            }
+            .l-time-range-inputs-elem {
+                &.type-icon {
+                    margin-top: 3px;
+                }
+            }
+            .t-inputs-w {
+                @include flex-direction(column);
+                .l-time-range-input-w:not(:first-child) {
+                    &:not(:first-child) {
+                        margin-top: $interiorMargin;
+                    }
+                    margin-right: 0;
+                }
+                .l-time-range-inputs-elem {
+                    &.lbl { display: none; }
+                }
+            }
+        }
+    }
+}
+
+@include phonePortrait {
+    .l-time-controller {
+        .l-time-range-inputs-holder {
+            .t-inputs-w {
+                @include flex(1 1 auto);
+                padding-top: 25px; // Make room for the ever lovin' Time Domain Selector
+                .flex-elem {
+                    @include flex(1 1 auto);
+                    width: 100%;
+                }
+                input[type="text"] {
+                    width: 100%;
+                }
+            }
+        }
+    }
+    .l-time-domain-selector {
+        right: auto;
+        left: 20px;
+    }
+}

platform/commonUI/general/res/sass/features/_imagery.scss

@@ -1,6 +1,5 @@
 .l-image-main-wrapper,
-.l-image-thumbs-wrapper,
-.image-main {
+.l-image-thumbs-wrapper {
 	@include absPosDefault(0, false);
 }
 
@@ -33,7 +32,7 @@
 
 /*************************************** MAIN IMAGE */
 
-.image-main,
+.l-image-main,
 .l-image-thumb-item .l-thumb {
 	background-size: contain;
 	background-position: center;
@@ -75,7 +74,7 @@
 .s-image-main {
 	border: 1px solid transparent;
 	&.paused {
-		@extend .s-unsynced;
+		border-color: $colorPausedBg;
 	}
 }
 
@@ -135,54 +134,6 @@
 	}
 }
 
-/*************************************** LOCAL CONTROLS */
-.l-local-controls {
-    max-width: 200px;
-    width: 35%;
-    input[type="range"] {
-        display: block;
-        width: 100%;
-        &:not(:first-child) {
-            margin-top: $interiorMarginLg;
-        }
-
-        &:before {
-            margin-right: $interiorMarginSm;
-        }
-    }
-
-    .t-reset-btn-holder {
-        $bc: $scrollbarTrackColorBg;
-        &:before,
-        &:after {
-            border-right: 1px solid $bc;
-            content:'';
-            display: block;
-            width: 5px;
-            height: 4px;
-        }
-
-        &:before {
-            border-top: 1px solid $bc;
-            margin-bottom: 2px;
-        }
-
-        &:after {
-            border-bottom: 1px solid $bc;
-            margin-top: 2px;
-        }
-    }
-
-    &.s-wrapper-transluc {
-        left: auto;
-        padding: $interiorMargin $interiorMarginLg;
-    }
-
-    &.l-flex-row {
-        align-items: center;
-    }
-}
-
 /*************************************** WHEN IN FRAME */
 .frame .t-imagery {
 	.l-image-main-wrapper {

platform/commonUI/general/res/sass/helpers/_wait-spinner.scss

@@ -19,6 +19,15 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+@include keyframes(rotation) {
+    100% { @include transform(rotate(360deg)); }
+}
+
+@include keyframes(rotation-centered) {
+    0%   { @include transform(translate(-50%, -50%) rotate(0deg)); }
+    100% { @include transform(translate(-50%, -50%) rotate(360deg)); }
+}
+
 @mixin  spinner($b: 5px, $c: $colorKey) {
     @include transform-origin(center);
     @include animation-name(rotation-centered);

platform/commonUI/general/res/sass/lists/_tabular.scss

@@ -51,9 +51,13 @@ table {
 
 	tbody, .tbody {
 		display: table-row-group;
+		tr, .tr {
+			&:hover {
+				background: rgba($colorTabBodyFg, 0.1);
+			}
+		}
 	}
 	tr, .tr {
-        border-top: 1px solid $colorTabBorder;
 		display: table-row;
 		&:first-child .td {
 			border-top: none;
@@ -67,12 +71,11 @@ table {
 		}
 		th, .th, td, .td {
 			display: table-cell;
-            font-size: 0.7rem;
 		}
 		th, .th {
 			border-left: 1px solid $colorTabHeaderBorder;
 			color: $colorTabHeaderFg;
-			padding: $tabularTdPadTB $tabularTdPadLR;
+			padding: $tabularTdPadLR $tabularTdPadLR;
 			white-space: nowrap;
 			vertical-align: middle; // This is crucial to hiding f**king 4px height injected by browser by default
 			&:first-child {
@@ -96,6 +99,7 @@ table {
 			}
 		}
 		td, .td {
+			border-bottom: 1px solid $colorTabBorder;
 			min-width: 20px;
 			color: $colorTelemFresh;
 			padding: $tabularTdPadTB $tabularTdPadLR;

platform/commonUI/general/res/sass/plots/_plots-main.scss

@@ -46,42 +46,18 @@
         }
     }
 
-    .gl-plot-wrapper-display-area-and-x-axis {
-        // Holds the plot area and the X-axis only
-        position: absolute;
-        top: nth($plotDisplayArea, 1);
-        right: nth($plotDisplayArea, 2);
-        bottom: 0;
-        left: nth($plotDisplayArea, 4);
-
-        .gl-plot-display-area {
-            //@include test(yellow);
-            @if $colorPlotBg != none {
-                background-color: $colorPlotBg;
-            }
-            position: absolute;
-            top: 0;
-            right: 0;
-            bottom: nth($plotDisplayArea, 3);
-            left: 0;
-            cursor: crosshair;
-            border: 1px solid $colorPlotAreaBorder;
-        }
-
-        .gl-plot-axis-area.gl-plot-x {
-            //@include test(green);
-            top: auto;
-            right: 0;
-            bottom: 0;
-            left: 0;
-            height: $plotXBarH;
-            width: auto;
-            overflow: hidden;
-        }
-    }
-
 	.gl-plot-axis-area {
+        //@include test();
 		position: absolute;
+		&.gl-plot-x {
+			top: auto;
+			right: 0;
+			bottom: $interiorMargin;
+			left: $plotYBarW;
+			height: $plotXBarH;
+			width: auto;
+			overflow: hidden;
+		}
 		&.gl-plot-y {
 			top: $plotLegendH + $interiorMargin;
 			right: auto;
@@ -108,6 +84,19 @@
 		}
 	}
 
+	.gl-plot-display-area {
+		@if $colorPlotBg != none {
+			background-color: $colorPlotBg;
+		}
+		position: absolute;
+		top: nth($plotDisplayArea, 1);
+		right: nth($plotDisplayArea, 2);
+		bottom: nth($plotDisplayArea, 3);
+		left: nth($plotDisplayArea, 4);
+		cursor: crosshair;
+		border: 1px solid $colorPlotAreaBorder;
+	}
+
 	.gl-plot-label,
 	.l-plot-label {
 		color: $colorPlotLabelFg;
@@ -276,9 +265,13 @@
 
 .gl-plot-tick,
 .tick-label {
-    @include reverseEllipsis();
+    direction: rtl;
+    unicode-bidi:bidi-override;
 	font-size: 0.7rem;
 	position: absolute;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
 	&.gl-plot-x-tick-label,
 	&.tick-label-x {
 		right: auto;

platform/commonUI/general/res/sass/user-environ/_layout.scss

@@ -128,7 +128,7 @@
         line-height: $ueTopBarH;
     }
 
-    .t-object.primary-pane {
+    .primary-pane {
         // Need to lift up this pane to ensure that 'collapsed' panes don't block user interactions
         z-index: 4;
     }
@@ -212,8 +212,6 @@ body.desktop .pane .mini-tab-icon.toggle-pane {
         .holder-object {
             top: $bodyMargin;
             bottom: $interiorMargin;
-            // Clip element that have min-widths
-            overflow: hidden;
         }
         .holder-inspector {
             top: $bodyMargin;

platform/commonUI/general/res/templates/controls/datetime-field.html

@@ -23,8 +23,6 @@
     <input type="text"
            ng-model="textValue"
            ng-blur="restoreTextValue(); ngBlur()"
-           ng-mouseup="ngMouseup()"
-           ng-disabled="ngDisabled"
            ng-class="{
                         error: textInvalid ||
                             (structure.validate &&

platform/commonUI/general/src/StyleSheetLoader.js

@@ -37,10 +37,8 @@ define(
          * @param {object[]} stylesheets stylesheet extension definitions
          * @param $document Angular's jqLite-wrapped document element
          * @param {string} activeTheme the theme in use
-         * @param {string} [assetPath] the directory relative to which
-         *        stylesheets will be found
          */
-        function StyleSheetLoader(stylesheets, $document, activeTheme, assetPath) {
+        function StyleSheetLoader(stylesheets, $document, activeTheme) {
             var head = $document.find('head'),
                 document = $document[0];
 
@@ -49,7 +47,6 @@ define(
                 // Create a link element, and construct full path
                 var link = document.createElement('link'),
                     path = [
-                        assetPath,
                         stylesheet.bundle.path,
                         stylesheet.bundle.resources,
                         stylesheet.stylesheetUrl
@@ -71,8 +68,6 @@ define(
                     stylesheet.theme === activeTheme;
             }
 
-            assetPath = assetPath || ".";
-
             // Add all stylesheets from extensions
             stylesheets.filter(matchesTheme).forEach(addStyleSheet);
         }

platform/commonUI/general/test/StyleSheetLoaderSpec.js

@@ -69,7 +69,7 @@ define(
 
             it("adjusts link locations", function () {
                 expect(mockElement.setAttribute)
-                    .toHaveBeenCalledWith('href', "./a/b/c/d.css");
+                    .toHaveBeenCalledWith('href', "a/b/c/d.css");
             });
 
             describe("for themed stylesheets", function () {
@@ -95,13 +95,12 @@ define(
 
                 it("includes matching themes", function () {
                     expect(mockElement.setAttribute)
-                        .toHaveBeenCalledWith('href', "./a/b/c/themed.css");
+                        .toHaveBeenCalledWith('href', "a/b/c/themed.css");
                 });
 
                 it("excludes mismatching themes", function () {
                     expect(mockElement.setAttribute)
-                        .not
-                        .toHaveBeenCalledWith('href', "./a/b/c/bad-theme.css");
+                        .not.toHaveBeenCalledWith('href', "a/b/c/bad-theme.css");
                 });
             });
 

platform/commonUI/notification/res/notification-indicator.html

@@ -1,9 +1,9 @@
 <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-<a ng-click="showNotificationsList()" ng-show="notifications.length > 0" class="status block"
+<span ng-show="notifications.length > 0" class="status block"
       ng-class="highest.severity"
       ng-controller="NotificationIndicatorController">
     <span class="status-indicator icon-bell"></span><span class="label">
-      {{notifications.length}} Notifications
+        <a ng-click="showNotificationsList()">{{notifications.length}}
+            Notifications</a>
     </span><span class="count">{{notifications.length}}</span>
-
-</a>
+</span>

platform/commonUI/notification/src/NotificationService.js

@@ -61,7 +61,7 @@ define(
          * @property {boolean} [unknownProgress] a boolean indicating that the
          * progress of the underlying task is unknown. This will result in a
          * visually distinct progress bar.
-         * @property {boolean} [autoDismiss] If truthy, dialog will
+         * @property {boolean | number} [autoDismiss] If truthy, dialog will
          * be automatically minimized or dismissed (depending on severity).
          * Additionally, if the provided value is a number, it will be used
          * as the delay period before being dismissed.
@@ -109,18 +109,18 @@ define(
          * @memberof platform/commonUI/notification
          * @constructor
          * @param $timeout the Angular $timeout service
-         * @param defaultAutoDismissTimeout The period of time that an
+         * @param DEFAULT_AUTO_DISMISS The period of time that an
          * auto-dismissed message will be displayed for.
-         * @param minimizeAnimationTimeout When notifications are minimized, a brief
+         * @param MINIMIZE_TIMEOUT When notifications are minimized, a brief
          * animation is shown. This animation requires some time to execute,
          * so a timeout is required before the notification is hidden
          */
-        function NotificationService($timeout, topic, defaultAutoDismissTimeout, minimizeAnimationTimeout) {
+        function NotificationService($timeout, topic, DEFAULT_AUTO_DISMISS, MINIMIZE_TIMEOUT) {
             this.notifications = [];
             this.$timeout = $timeout;
             this.highest = { severity: "info" };
-            this.AUTO_DISMISS_TIMEOUT = defaultAutoDismissTimeout;
-            this.MINIMIZE_ANIMATION_TIMEOUT = minimizeAnimationTimeout;
+            this.DEFAULT_AUTO_DISMISS = DEFAULT_AUTO_DISMISS;
+            this.MINIMIZE_TIMEOUT = MINIMIZE_TIMEOUT;
             this.topic = topic;
 
             /*
@@ -162,7 +162,7 @@ define(
                 // in order to allow the minimize animation to run through.
                 service.$timeout(function () {
                     service.setActiveNotification(service.selectNextNotification());
-                }, service.MINIMIZE_ANIMATION_TIMEOUT);
+                }, service.MINIMIZE_TIMEOUT);
             }
         };
 
@@ -208,16 +208,11 @@ define(
          * @private
          */
         NotificationService.prototype.dismissOrMinimize = function (notification) {
-            var model = notification.model;
-            if (model.severity === "info") {
-                if (model.autoDismiss === false) {
-                    notification.minimize();
-                } else {
-                    notification.dismiss();
-                }
-            } else {
-                notification.minimize();
-            }
+
+            //For now minimize everything, and have discussion around which
+            //kind of messages should or should not be in the minimized
+            //notifications list
+            notification.minimize();
         };
 
         /**
@@ -231,9 +226,7 @@ define(
         /**
          * A convenience method for info notifications. Notifications
          * created via this method will be auto-dismissed after a default
-         * wait period unless explicitly forbidden by the caller through
-         * the {autoDismiss} property on the {NotificationModel}, in which
-         * case the notification will be minimized after the wait.
+         * wait period
          * @param {NotificationModel | string} message either a string for
          * the title of the notification message, or a {@link NotificationModel}
          * defining the options notification to display
@@ -242,6 +235,7 @@ define(
          */
         NotificationService.prototype.info = function (message) {
             var notificationModel = typeof message === "string" ? {title: message} : message;
+            notificationModel.autoDismiss = notificationModel.autoDismiss || true;
             notificationModel.severity = "info";
             return this.notify(notificationModel);
         };
@@ -312,29 +306,28 @@ define(
                 activeNotification = self.active.notification,
                 topic = this.topic();
 
-            notificationModel.severity = notificationModel.severity || "info";
-
             notification = {
                 model: notificationModel,
-
                 minimize: function () {
                     self.minimize(self, notification);
                 },
-
                 dismiss: function () {
                     self.dismiss(self, notification);
                     topic.notify();
                 },
-
                 dismissOrMinimize: function () {
                     self.dismissOrMinimize(notification);
                 },
-
                 onDismiss: function (callback) {
                     topic.listen(callback);
                 }
             };
 
+            notificationModel.severity = notificationModel.severity || "info";
+            if (notificationModel.autoDismiss === true) {
+                notificationModel.autoDismiss = this.DEFAULT_AUTO_DISMISS;
+            }
+
             //Notifications support a 'dismissable' attribute. This is a
             // convenience to support adding a 'dismiss' option to the
             // notification for the common case of dismissing a
@@ -373,39 +366,38 @@ define(
                  */
                 this.active.timeout = this.$timeout(function () {
                     activeNotification.dismissOrMinimize();
-                }, this.AUTO_DISMISS_TIMEOUT);
+                }, this.DEFAULT_AUTO_DISMISS);
             }
 
             return notification;
+
         };
 
         /**
          * Used internally by the NotificationService
          * @private
          */
-        NotificationService.prototype.setActiveNotification = function (notification) {
-            var shouldAutoDismiss;
-            this.active.notification = notification;
+        NotificationService.prototype.setActiveNotification =
+            function (notification) {
+                var timeout;
 
-            if (!notification) {
-                delete this.active.timeout;
-                return;
-            }
+                this.active.notification = notification;
+                /*
+                If autoDismiss has been specified, OR there are other
+                 notifications queued for display, setup a timeout to
+                  dismiss the dialog.
+                 */
+                if (notification && (notification.model.autoDismiss ||
+                    this.selectNextNotification())) {
 
-            if (notification.model.severity === "info") {
-                shouldAutoDismiss = true;
-            } else {
-                shouldAutoDismiss = notification.model.autoDismiss;
-            }
-
-            if (shouldAutoDismiss || this.selectNextNotification()) {
-                this.active.timeout = this.$timeout(function () {
-                    notification.dismissOrMinimize();
-                }, this.AUTO_DISMISS_TIMEOUT);
-            } else {
-                delete this.active.timeout;
-            }
-        };
+                    timeout = notification.model.autoDismiss || this.DEFAULT_AUTO_DISMISS;
+                    this.active.timeout = this.$timeout(function () {
+                        notification.dismissOrMinimize();
+                    }, timeout);
+                } else {
+                    delete this.active.timeout;
+                }
+            };
 
         /**
          * Used internally by the NotificationService

platform/commonUI/notification/test/NotificationServiceSpec.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global describe,it,expect,beforeEach,jasmine*/
 
 define(
     ['../src/NotificationService'],
@@ -30,16 +29,11 @@ define(
                 mockTimeout,
                 mockAutoDismiss,
                 mockMinimizeTimeout,
+                successModel,
                 mockTopicFunction,
                 mockTopicObject,
-                infoModel,
-                alertModel,
                 errorModel;
 
-            function elapseTimeout() {
-                mockTimeout.mostRecentCall.args[0]();
-            }
-
             beforeEach(function () {
                 mockTimeout = jasmine.createSpy("$timeout");
                 mockTopicFunction = jasmine.createSpy("topic");
@@ -47,189 +41,153 @@ define(
                 mockTopicFunction.andReturn(mockTopicObject);
 
                 mockAutoDismiss = mockMinimizeTimeout = 1000;
-                notificationService = new NotificationService(mockTimeout, mockTopicFunction, mockAutoDismiss, mockMinimizeTimeout);
-
-                infoModel = {
-                    title: "Mock Info Notification",
+                notificationService = new NotificationService(
+                    mockTimeout, mockTopicFunction, mockAutoDismiss, mockMinimizeTimeout);
+                successModel = {
+                    title: "Mock Success Notification",
                     severity: "info"
                 };
-
-                alertModel = {
-                    title: "Mock Alert Notification",
-                    severity: "alert"
-                };
-
                 errorModel = {
                     title: "Mock Error Notification",
                     severity: "error"
                 };
             });
 
+            it("gets a new success notification, making" +
+                " the notification active", function () {
+                var activeNotification;
+                notificationService.notify(successModel);
+                activeNotification = notificationService.getActiveNotification();
+                expect(activeNotification.model).toBe(successModel);
+            });
+
             it("notifies listeners on dismissal of notification", function () {
-                var dismissListener = jasmine.createSpy("ondismiss");
-                var notification = notificationService.notify(infoModel);
+                var notification,
+                    dismissListener = jasmine.createSpy("ondismiss");
+                notification = notificationService.notify(successModel);
                 notification.onDismiss(dismissListener);
                 expect(mockTopicObject.listen).toHaveBeenCalled();
                 notification.dismiss();
                 expect(mockTopicObject.notify).toHaveBeenCalled();
                 mockTopicObject.listen.mostRecentCall.args[0]();
                 expect(dismissListener).toHaveBeenCalled();
+
             });
 
-            it("dismisses a notification when the notification's dismiss method is used", function () {
-                var notification = notificationService.info(infoModel);
-                notification.dismiss();
-                expect(notificationService.getActiveNotification()).toBeUndefined();
-                expect(notificationService.notifications.length).toEqual(0);
+            it("allows specification of an info notification given just a" +
+                " title, making the notification active", function () {
+                var activeNotification,
+                    notificationTitle = "Test info notification";
+                notificationService.info(notificationTitle);
+                activeNotification = notificationService.getActiveNotification();
+                expect(activeNotification.model.title).toBe(notificationTitle);
+                expect(activeNotification.model.severity).toBe("info");
             });
 
-            it("minimizes a notification when the notification's minimize method is used", function () {
-                var notification = notificationService.info(infoModel);
+            it("gets a new success notification with" +
+                " numerical auto-dismiss specified. ", function () {
+                var activeNotification;
+                successModel.autoDismiss = 1000;
+                notificationService.notify(successModel);
+                activeNotification = notificationService.getActiveNotification();
+                expect(activeNotification.model).toBe(successModel);
+                mockTimeout.mostRecentCall.args[0]();
+                expect(mockTimeout.calls.length).toBe(2);
+                mockTimeout.mostRecentCall.args[0]();
+                activeNotification = notificationService.getActiveNotification();
+                expect(activeNotification).toBeUndefined();
+            });
+
+            it("gets a new notification with" +
+                " boolean auto-dismiss specified. ", function () {
+                var activeNotification;
+                successModel.autoDismiss = true;
+                notificationService.notify(successModel);
+                activeNotification = notificationService.getActiveNotification();
+                expect(activeNotification.model).toBe(successModel);
+                mockTimeout.mostRecentCall.args[0]();
+                expect(mockTimeout.calls.length).toBe(2);
+                mockTimeout.mostRecentCall.args[0]();
+                activeNotification = notificationService.getActiveNotification();
+                expect(activeNotification).toBeUndefined();
+            });
+
+            it("allows minimization of notifications", function () {
+                var notification,
+                    activeNotification;
+
+                successModel.autoDismiss = false;
+                notification = notificationService.notify(successModel);
+
+                activeNotification = notificationService.getActiveNotification();
+                expect(activeNotification.model).toBe(successModel);
                 notification.minimize();
-                elapseTimeout(); // needed for the minimize animation timeout
-                expect(notificationService.getActiveNotification()).toBeUndefined();
-                expect(notificationService.notifications.length).toEqual(1);
-                expect(notificationService.notifications[0]).toEqual(notification);
+                mockTimeout.mostRecentCall.args[0]();
+                activeNotification = notificationService.getActiveNotification();
+                expect(activeNotification).toBeUndefined();
+                expect(notificationService.notifications.length).toBe(1);
             });
 
-            describe("when receiving info notifications", function () {
-                it("minimizes info notifications if the caller disables auto-dismiss", function () {
-                    infoModel.autoDismiss = false;
-                    var notification = notificationService.info(infoModel);
-                    elapseTimeout();
-                    // 2nd elapse for the minimize animation timeout
-                    elapseTimeout();
-                    expect(notificationService.getActiveNotification()).toBeUndefined();
-                    expect(notificationService.notifications.length).toEqual(1);
-                    expect(notificationService.notifications[0]).toEqual(notification);
-                });
+            it("allows dismissal of notifications", function () {
+                var notification,
+                    activeNotification;
 
-                it("dismisses info notifications if the caller ignores auto-dismiss", function () {
-                    notificationService.info(infoModel);
-                    elapseTimeout();
-                    expect(notificationService.getActiveNotification()).toBeUndefined();
-                    expect(notificationService.notifications.length).toEqual(0);
-                });
+                successModel.autoDismiss = false;
+                notification = notificationService.notify(successModel);
 
-                it("dismisses info notifications if the caller requests auto-dismiss", function () {
-                    infoModel.autoDismiss = true;
-                    notificationService.info(infoModel);
-                    elapseTimeout();
-                    expect(notificationService.getActiveNotification()).toBeUndefined();
-                    expect(notificationService.notifications.length).toEqual(0);
-                });
+                activeNotification = notificationService.getActiveNotification();
+                expect(activeNotification.model).toBe(successModel);
+                notification.dismiss();
+                activeNotification = notificationService.getActiveNotification();
+                expect(activeNotification).toBeUndefined();
+                expect(notificationService.notifications.length).toBe(0);
             });
 
-            describe("when receiving alert notifications", function () {
-                it("minimizes alert notifications if the caller enables auto-dismiss", function () {
-                    alertModel.autoDismiss = true;
-                    var notification = notificationService.alert(alertModel);
-                    elapseTimeout();
-                    elapseTimeout();
-                    expect(notificationService.getActiveNotification()).toBeUndefined();
-                    expect(notificationService.notifications.length).toEqual(1);
-                    expect(notificationService.notifications[0]).toEqual(notification);
-                });
-
-                it("keeps alert notifications active if the caller disables auto-dismiss", function () {
-                    mockTimeout.andCallFake(function (callback, time) {
-                        callback();
-                    });
-                    alertModel.autoDismiss = false;
-                    var notification = notificationService.alert(alertModel);
-                    expect(notificationService.getActiveNotification()).toEqual(notification);
-                    expect(notificationService.notifications.length).toEqual(1);
-                    expect(notificationService.notifications[0]).toEqual(notification);
-                });
-
-                it("keeps alert notifications active if the caller ignores auto-dismiss", function () {
-                    mockTimeout.andCallFake(function (callback, time) {
-                        callback();
-                    });
-                    var notification = notificationService.alert(alertModel);
-                    expect(notificationService.getActiveNotification()).toEqual(notification);
-                    expect(notificationService.notifications.length).toEqual(1);
-                    expect(notificationService.notifications[0]).toEqual(notification);
-                });
-            });
-
-            describe("when receiving error notifications", function () {
-                it("minimizes error notifications if the caller enables auto-dismiss", function () {
-                    errorModel.autoDismiss = true;
-                    var notification = notificationService.error(errorModel);
-                    elapseTimeout();
-                    elapseTimeout();
-                    expect(notificationService.getActiveNotification()).toBeUndefined();
-                    expect(notificationService.notifications.length).toEqual(1);
-                    expect(notificationService.notifications[0]).toEqual(notification);
-                });
-
-                it("keeps error notifications active if the caller disables auto-dismiss", function () {
-                    mockTimeout.andCallFake(function (callback, time) {
-                        callback();
-                    });
-                    errorModel.autoDismiss = false;
-                    var notification = notificationService.error(errorModel);
-                    expect(notificationService.getActiveNotification()).toEqual(notification);
-                    expect(notificationService.notifications.length).toEqual(1);
-                    expect(notificationService.notifications[0]).toEqual(notification);
-                });
-
-                it("keeps error notifications active if the caller ignores auto-dismiss", function () {
-                    mockTimeout.andCallFake(function (callback, time) {
-                        callback();
-                    });
-                    var notification = notificationService.error(errorModel);
-                    expect(notificationService.getActiveNotification()).toEqual(notification);
-                    expect(notificationService.notifications.length).toEqual(1);
-                    expect(notificationService.notifications[0]).toEqual(notification);
-                });
-            });
-
-            describe("when called with multiple notifications", function () {
-                it("auto-dismisses the previously active notification, making the new notification active", function () {
+            describe(" gets called with multiple notifications", function () {
+                it("auto-dismisses the previously active notification, making" +
+                    " the new notification active", function () {
                     var activeNotification;
-                    infoModel.autoDismiss = false;
                     //First pre-load with a info message
-                    notificationService.notify(infoModel);
-                    activeNotification = notificationService.getActiveNotification();
+                    notificationService.notify(successModel);
+                    activeNotification =
+                        notificationService.getActiveNotification();
                     //Initially expect the active notification to be info
-                    expect(activeNotification.model).toBe(infoModel);
+                    expect(activeNotification.model).toBe(successModel);
                     //Then notify of an error
                     notificationService.notify(errorModel);
                     //But it should be auto-dismissed and replaced with the
                     // error notification
-                    elapseTimeout();
+                    mockTimeout.mostRecentCall.args[0]();
                     //Two timeouts, one is to force minimization after
                     // displaying the message for a minimum period, the
                     // second is to allow minimization animation to take place.
-                    elapseTimeout();
+                    mockTimeout.mostRecentCall.args[0]();
                     activeNotification = notificationService.getActiveNotification();
                     expect(activeNotification.model).toBe(errorModel);
                 });
-
                 it("auto-minimizes an active error notification", function () {
                     var activeNotification;
                     //First pre-load with an error message
                     notificationService.notify(errorModel);
                     //Then notify of info
-                    notificationService.notify(infoModel);
+                    notificationService.notify(successModel);
                     expect(notificationService.notifications.length).toEqual(2);
                     //Mock the auto-minimize
-                    elapseTimeout();
+                    mockTimeout.mostRecentCall.args[0]();
                     //Two timeouts, one is to force minimization after
                     // displaying the message for a minimum period, the
                     // second is to allow minimization animation to take place.
-                    elapseTimeout();
+                    mockTimeout.mostRecentCall.args[0]();
                     //Previous error message should be minimized, not
                     // dismissed
                     expect(notificationService.notifications.length).toEqual(2);
-                    activeNotification = notificationService.getActiveNotification();
-                    expect(activeNotification.model).toBe(infoModel);
+                    activeNotification =
+                        notificationService.getActiveNotification();
+                    expect(activeNotification.model).toBe(successModel);
                     expect(errorModel.minimized).toEqual(true);
                 });
-
-                it("auto-minimizes errors when a number of them arrive in short succession", function () {
+                it("auto-minimizes errors when a number of them arrive in" +
+                    " short succession ", function () {
                     var activeNotification,
                         error2 = {
                             title: "Second Mock Error Notification",
@@ -247,27 +205,30 @@ define(
                     notificationService.notify(error3);
                     expect(notificationService.notifications.length).toEqual(3);
                     //Mock the auto-minimize
-                    elapseTimeout();
+                    mockTimeout.mostRecentCall.args[0]();
                     //Two timeouts, one is to force minimization after
                     // displaying the message for a minimum period, the
                     // second is to allow minimization animation to take place.
-                    elapseTimeout();
+                    mockTimeout.mostRecentCall.args[0]();
                     //Previous error message should be minimized, not
                     // dismissed
                     expect(notificationService.notifications.length).toEqual(3);
-                    activeNotification = notificationService.getActiveNotification();
+                    activeNotification =
+                        notificationService.getActiveNotification();
                     expect(activeNotification.model).toBe(error2);
                     expect(errorModel.minimized).toEqual(true);
 
                     //Mock the second auto-minimize
-                    elapseTimeout();
+                    mockTimeout.mostRecentCall.args[0]();
                     //Two timeouts, one is to force minimization after
                     // displaying the message for a minimum period, the
                     // second is to allow minimization animation to take place.
-                    elapseTimeout();
-                    activeNotification = notificationService.getActiveNotification();
+                    mockTimeout.mostRecentCall.args[0]();
+                    activeNotification =
+                        notificationService.getActiveNotification();
                     expect(activeNotification.model).toBe(error3);
                     expect(error2.minimized).toEqual(true);
+
                 });
             });
         });

platform/commonUI/themes/espresso/res/sass/_constants.scss

@@ -50,7 +50,6 @@ $sliderKnobW: 15px;
 $sliderKnobR: 2px;
 $timeControllerToiLineColor: #00c2ff;
 $timeControllerToiLineColorHov: #fff;
-$colorTransLucBg: #666; // Used as a visual blocking element over variable backgrounds, like imagery
 
 // General Colors
 $colorAlt1: #ffc700;
@@ -62,7 +61,7 @@ $colorCreateBtn: $colorKey;
 $colorGridLines: rgba(#fff, 0.05);
 $colorInvokeMenu: #fff;
 $colorObjHdrTxt: $colorBodyFg;
-$colorObjHdrIc: lighten($colorObjHdrTxt, 20%);
+$colorObjHdrIc: pullForward($colorObjHdrTxt, 20%);
 $colorTick: rgba(white, 0.2);
 $colorSelectableSelectedPrimary: $colorKey;
 $colorSelectableSelectedSecondary: pushBack($colorSelectableSelectedPrimary, 20%);
@@ -117,7 +116,6 @@ $colorProgressBarAmt: $colorKey;
 $progressBarHOverlay: 15px;
 $progressBarStripeW: 20px;
 $shdwStatusIc: rgba(black, 0.4) 0 1px 2px;
-$animPausedPulseDur: 500ms;
 
 // Selects
 $colorSelectBg: $colorBtnBg;
@@ -158,11 +156,11 @@ $shdwItemText: rgba(black, 0.1) 0 1px 2px;
 $colorItemBgSelected: $colorKey;
 
 // Tabular
-$colorTabBorder: pullForward($colorBodyBg, 5%);
+$colorTabBorder: pullForward($colorBodyBg, 10%);
 $colorTabBodyBg: darken($colorBodyBg, 10%);
 $colorTabBodyFg: lighten($colorTabBodyBg, 40%);
-$colorTabHeaderBg: rgba(white, 0.1);
-$colorTabHeaderFg: $colorBodyFg;
+$colorTabHeaderBg: rgba(white, 0.1); // lighten($colorBodyBg, 10%);
+$colorTabHeaderFg: $colorBodyFg; //lighten($colorTabHeaderBg, 40%);
 $colorTabHeaderBorder: $colorBodyBg;
 
 // Plot

platform/commonUI/themes/snow/res/sass/_constants.scss

@@ -50,7 +50,6 @@ $sliderKnobW: 15px;
 $sliderKnobR: 2px;
 $timeControllerToiLineColor: $colorBodyFg;
 $timeControllerToiLineColorHov: #0052b5;
-$colorTransLucBg: #666; // Used as a visual blocking element over variable backgrounds, like imagery
 
 // General Colors
 $colorAlt1: #776ba2;
@@ -62,7 +61,7 @@ $colorCreateBtn: $colorKey;
 $colorGridLines: rgba(#000, 0.05);
 $colorInvokeMenu: #fff;
 $colorObjHdrTxt: $colorBodyFg;
-$colorObjHdrIc: lighten($colorObjHdrTxt, 30%);
+$colorObjHdrIc: pushBack($colorObjHdrTxt, 30%);
 $colorTick: rgba(black, 0.2);
 $colorSelectableSelectedPrimary: $colorKey;
 $colorSelectableSelectedSecondary: pushBack($colorSelectableSelectedPrimary, 20%);
@@ -117,7 +116,6 @@ $colorProgressBarAmt: #0a0;
 $progressBarHOverlay: 15px;
 $progressBarStripeW: 20px;
 $shdwStatusIc: rgba(white, 0.8) 0 0px 5px;
-$animPausedPulseDur: 1s;
 
 // Selects
 $colorSelectBg: $colorBtnBg;

platform/core/bundle.js

@@ -24,6 +24,7 @@ define([
     "./src/objects/DomainObjectProvider",
     "./src/capabilities/CoreCapabilityProvider",
     "./src/models/StaticModelProvider",
+    "./src/models/RootModelProvider",
     "./src/models/ModelAggregator",
     "./src/models/ModelCacheService",
     "./src/models/PersistedModelProvider",
@@ -45,7 +46,6 @@ define([
     "./src/capabilities/MutationCapability",
     "./src/capabilities/DelegationCapability",
     "./src/capabilities/InstantiationCapability",
-    "./src/runs/TransactingMutationListener",
     "./src/services/Now",
     "./src/services/Throttle",
     "./src/services/Topic",
@@ -56,6 +56,7 @@ define([
     DomainObjectProvider,
     CoreCapabilityProvider,
     StaticModelProvider,
+    RootModelProvider,
     ModelAggregator,
     ModelCacheService,
     PersistedModelProvider,
@@ -77,7 +78,6 @@ define([
     MutationCapability,
     DelegationCapability,
     InstantiationCapability,
-    TransactingMutationListener,
     Now,
     Throttle,
     Topic,
@@ -150,6 +150,16 @@ define([
                         "$log"
                     ]
                 },
+                {
+                    "provides": "modelService",
+                    "type": "provider",
+                    "implementation": RootModelProvider,
+                    "depends": [
+                        "roots[]",
+                        "$q",
+                        "$log"
+                    ]
+                },
                 {
                     "provides": "modelService",
                     "type": "aggregator",
@@ -397,10 +407,14 @@ define([
                     ]
                 }
             ],
-            "runs": [
+            "roots": [
                 {
-                    "implementation": TransactingMutationListener,
-                    "depends": ["topic", "transactionService", "cacheService"]
+                    "id": "mine",
+                    "model": {
+                        "name": "My Items",
+                        "type": "folder",
+                        "composition": []
+                    }
                 }
             ],
             "constants": [

platform/core/src/capabilities/CompositionCapability.js

@@ -49,7 +49,8 @@ define(
         }
 
         /**
-         * Add a domain object to the composition of this domain object.
+         * Add a domain object to the composition of the field.
+         * This mutates but does not persist the modified object.
          *
          * If no index is given, this is added to the end of the composition.
          *

platform/core/src/capabilities/InstantiationCapability.js

@@ -68,13 +68,7 @@ define(
             this.instantiateFn = this.instantiateFn ||
                 this.$injector.get("instantiate");
 
-            var newObject = this.instantiateFn(model, id);
-
-            this.contextualizeFn = this.contextualizeFn ||
-                this.$injector.get("contextualize");
-
-
-            return this.contextualizeFn(newObject, this.domainObject);
+            return this.instantiateFn(model, id);
         };
 
         /**

platform/core/src/capabilities/PersistenceCapability.js

@@ -113,16 +113,11 @@ define(
                 domainObject = this.domainObject,
                 model = domainObject.getModel(),
                 modified = model.modified,
-                persisted = model.persisted,
                 persistenceService = this.persistenceService,
-                persistenceFn = persisted !== undefined ?
+                persistenceFn = model.persisted !== undefined ?
                     this.persistenceService.updateObject :
                     this.persistenceService.createObject;
 
-            if (persisted !== undefined && persisted === modified) {
-                return this.$q.when(true);
-            }
-
             // Update persistence timestamp...
             domainObject.useCapability("mutation", function (m) {
                 m.persisted = modified;
@@ -183,15 +178,6 @@ define(
         };
 
 
-        /**
-         * Check if this domain object has been persisted at some
-         * point.
-         * @returns {boolean} true if the object has been persisted
-         */
-        PersistenceCapability.prototype.persisted = function () {
-            return this.domainObject.getModel().persisted !== undefined;
-        };
-
         /**
          * Get the key for this domain object in the given space.
          *

platform/core/src/models/CachingModelDecorator.js

@@ -38,25 +38,75 @@ define(
             this.modelService = modelService;
         }
 
-        CachingModelDecorator.prototype.getModels = function (ids) {
-            var loadFromCache = ids.filter(function cached(id) {
-                    return this.cacheService.has(id);
-                }, this),
-                loadFromService = ids.filter(function notCached(id) {
-                    return !this.cacheService.has(id);
-                }, this);
+        // Fast-resolving promise
+        function fastPromise(value) {
+            return (value || {}).then ? value : {
+                then: function (callback) {
+                    return fastPromise(callback(value));
+                }
+            };
+        }
 
-            if (!loadFromCache.length) {
-                return this.modelService.getModels(loadFromService);
+        CachingModelDecorator.prototype.getModels = function (ids) {
+            var cacheService = this.cacheService,
+                neededIds = ids.filter(function notCached(id) {
+                    return !cacheService.has(id);
+                });
+
+            // Update the cached instance of a model to a new value.
+            // We update in-place to ensure there is only ever one instance
+            // of any given model exposed by the modelService as a whole.
+            function updateModel(id, model) {
+                var oldModel = cacheService.get(id);
+
+                // Same object instance is a possibility, so don't copy
+                if (oldModel === model) {
+                    return model;
+                }
+
+                // If we'd previously cached an undefined value, or are now
+                // seeing undefined, replace the item in the cache entirely.
+                if (oldModel === undefined || model === undefined) {
+                    cacheService.put(id, model);
+                    return model;
+                }
+
+                // Otherwise, empty out the old model...
+                Object.keys(oldModel).forEach(function (k) {
+                    delete oldModel[k];
+                });
+
+                // ...and replace it with the contents of the new model.
+                Object.keys(model).forEach(function (k) {
+                    oldModel[k] = model[k];
+                });
+
+                return oldModel;
             }
 
-            return this.modelService.getModels(loadFromService)
-                .then(function (modelResults) {
-                    loadFromCache.forEach(function (id) {
-                        modelResults[id] = this.cacheService.get(id);
-                    }, this);
-                    return modelResults;
-                }.bind(this));
+            // Store the provided models in our cache
+            function cacheAll(models) {
+                Object.keys(models).forEach(function (id) {
+                    var model = cacheService.has(id) ?
+                        updateModel(id, models[id]) : models[id];
+                    cacheService.put(id, model);
+                });
+            }
+
+            // Expose the cache (for promise chaining)
+            function giveCache() {
+                return cacheService.all();
+            }
+
+            // Look up if we have unknown IDs
+            if (neededIds.length > 0) {
+                return this.modelService.getModels(neededIds)
+                    .then(cacheAll)
+                    .then(giveCache);
+            }
+
+            // Otherwise, just expose the cache directly
+            return fastPromise(cacheService.all());
         };
 
         return CachingModelDecorator;

platform/core/src/models/ModelCacheService.js

@@ -77,9 +77,5 @@ define([], function () {
         return this.cache;
     };
 
-    ModelCacheService.prototype.flush = function () {
-        this.cache = {};
-    };
-
     return ModelCacheService;
 });

platform/core/src/models/RootModelProvider.js

@@ -0,0 +1,79 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2016, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * Module defining RootModelProvider. Created by vwoeltje on 11/7/14.
+ */
+define(
+    ['./StaticModelProvider'],
+    function (StaticModelProvider) {
+
+        /**
+         * Provides the root object (id = "ROOT"), which is the top-level
+         * domain object shown when the application is started, from which all
+         * other domain objects are reached.
+         *
+         * The root model provider works as the static model provider,
+         * except that it aggregates roots[] instead of models[], and
+         * exposes them all as composition of the root object ROOT,
+         * whose model is also provided by this service.
+         *
+         * @memberof platform/core
+         * @constructor
+         * @implements {ModelService}
+         * @param {Array} roots all `roots[]` extensions
+         * @param $q Angular's $q, for promises
+         * @param $log Angular's $log, for logging
+         */
+        function RootModelProvider(roots, $q, $log) {
+            // Pull out identifiers to used as ROOT's
+            var ids = roots.map(function (root) {
+                return root.id;
+            });
+
+            // Assign an initial location to root models
+            roots.forEach(function (root) {
+                if (!root.model) {
+                    root.model = {};
+                }
+                root.model.location = 'ROOT';
+            });
+
+            this.baseProvider = new StaticModelProvider(roots, $q, $log);
+            this.rootModel = {
+                name: "The root object",
+                type: "root",
+                composition: ids
+            };
+        }
+
+        RootModelProvider.prototype.getModels = function (ids) {
+            var rootModel = this.rootModel;
+            return this.baseProvider.getModels(ids).then(function (models) {
+                models.ROOT = rootModel;
+                return models;
+            });
+        };
+
+        return RootModelProvider;
+    }
+);

platform/core/src/runs/TransactingMutationListener.js

@@ -1,59 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web 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 Web 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 () {
-
-    /**
-     * Listens for mutation on domain objects and triggers persistence when
-     * it occurs.
-     * @param {Topic} topic the `topic` service; used to listen for mutation
-     * @memberof platform/core
-     */
-    function TransactingMutationListener(
-        topic,
-        transactionService,
-        cacheService
-    ) {
-        var mutationTopic = topic('mutation');
-        mutationTopic.listen(function (domainObject) {
-            var persistence = domainObject.getCapability('persistence');
-            var wasActive = transactionService.isActive();
-            cacheService.put(domainObject.getId(), domainObject.getModel());
-
-            if (!wasActive) {
-                transactionService.startTransaction();
-            }
-
-            transactionService.addToTransaction(
-                persistence.persist.bind(persistence),
-                persistence.refresh.bind(persistence)
-            );
-
-            if (!wasActive) {
-                transactionService.commit();
-            }
-        });
-    }
-
-    return TransactingMutationListener;
-});

platform/core/src/services/Topic.js

@@ -67,7 +67,6 @@ define(
                                 listener(message);
                             } catch (e) {
                                 $log.error(ERROR_PREFIX + e.message);
-                                $log.error(e);
                             }
                         });
                     }

platform/core/test/capabilities/InstantiationCapabilitySpec.js

@@ -28,7 +28,6 @@ define(
             var mockInjector,
                 mockIdentifierService,
                 mockInstantiate,
-                mockContextualize,
                 mockIdentifier,
                 mockNow,
                 mockDomainObject,
@@ -37,7 +36,6 @@ define(
             beforeEach(function () {
                 mockInjector = jasmine.createSpyObj("$injector", ["get"]);
                 mockInstantiate = jasmine.createSpy("instantiate");
-                mockContextualize = jasmine.createSpy("contextualize");
                 mockIdentifierService = jasmine.createSpyObj(
                     'identifierService',
                     ['parse', 'generate']
@@ -52,10 +50,8 @@ define(
                 );
 
                 mockInjector.get.andCallFake(function (key) {
-                    return {
-                        'instantiate': mockInstantiate,
-                        'contextualize': mockContextualize
-                    }[key];
+                    return key === 'instantiate' ?
+                            mockInstantiate : undefined;
                 });
                 mockIdentifierService.parse.andReturn(mockIdentifier);
                 mockIdentifierService.generate.andReturn("some-id");
@@ -76,7 +72,7 @@ define(
                 expect(instantiation.invoke).toBe(instantiation.instantiate);
             });
 
-            it("uses instantiate and contextualize to create domain objects", function () {
+            it("uses the instantiate service to create domain objects", function () {
                 var mockDomainObj = jasmine.createSpyObj('domainObject', [
                     'getId',
                     'getModel',
@@ -85,9 +81,6 @@ define(
                     'hasCapability'
                 ]), testModel = { someKey: "some value" };
                 mockInstantiate.andReturn(mockDomainObj);
-                mockContextualize.andCallFake(function (x) {
-                    return x;
-                });
                 expect(instantiation.instantiate(testModel))
                     .toBe(mockDomainObj);
                 expect(mockInstantiate)
@@ -95,8 +88,6 @@ define(
                         someKey: "some value",
                         modified: mockNow()
                     }, jasmine.any(String));
-                expect(mockContextualize)
-                    .toHaveBeenCalledWith(mockDomainObj, mockDomainObject);
             });
 
         });

platform/core/test/models/CachingModelDecoratorSpec.js

@@ -27,7 +27,7 @@ define(
     ],
     function (CachingModelDecorator, ModelCacheService) {
 
-        xdescribe("The caching model decorator", function () {
+        describe("The caching model decorator", function () {
             var mockModelService,
                 mockCallback,
                 testModels,

platform/core/test/models/RootModelProviderSpec.js

@@ -0,0 +1,105 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/**
+ * RootModelProviderSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    ["../../src/models/RootModelProvider"],
+    function (RootModelProvider) {
+
+        describe("The root model provider", function () {
+            var roots = [
+                    {
+                        "id": "a",
+                        "model": {
+                            "name": "Thing A",
+                            "someProperty": "Some Value A"
+                        }
+                    },
+                    {
+                        "id": "b",
+                        "model": {
+                            "name": "Thing B",
+                            "someProperty": "Some Value B"
+                        }
+                    }
+                ],
+                captured,
+                mockLog,
+                mockQ,
+                provider;
+
+            function mockPromise(value) {
+                return {
+                    then: function (callback) {
+                        return mockPromise(callback(value));
+                    }
+                };
+            }
+
+            function capture(value) {
+                captured = value;
+            }
+
+
+            beforeEach(function () {
+                mockQ = { when: mockPromise };
+                mockLog = jasmine.createSpyObj("$log", ["error", "warn", "info", "debug"]);
+                provider = new RootModelProvider(roots, mockQ, mockLog);
+            });
+
+            it("provides models from extension declarations", function () {
+                // Verify that we got the promise as the return value
+                provider.getModels(["a", "b"]).then(capture);
+
+                // Verify that the promise has the desired models
+                expect(captured.a.name).toEqual("Thing A");
+                expect(captured.a.someProperty).toEqual("Some Value A");
+                expect(captured.b.name).toEqual("Thing B");
+                expect(captured.b.someProperty).toEqual("Some Value B");
+            });
+
+            it("provides models with a location", function () {
+                provider.getModels(["a", "b"]).then(capture);
+                expect(captured.a.location).toBe('ROOT');
+                expect(captured.b.location).toBe('ROOT');
+            });
+
+
+            it("does not provide models which are not in extension declarations", function () {
+                provider.getModels(["c"]).then(capture);
+
+                // Verify that the promise has the desired models
+                expect(captured.c).toBeUndefined();
+            });
+
+            it("provides a ROOT object with roots in its composition", function () {
+                provider.getModels(["ROOT"]).then(capture);
+
+                expect(captured.ROOT).toBeDefined();
+                expect(captured.ROOT.composition).toEqual(["a", "b"]);
+            });
+
+        });
+    }
+);

platform/core/test/runs/TransactingMutationListenerSpec.js

@@ -1,120 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    ["../../src/runs/TransactingMutationListener"],
-    function (TransactingMutationListener) {
-
-        xdescribe("TransactingMutationListener", function () {
-            var mockTopic,
-                mockMutationTopic,
-                mockTransactionService,
-                mockDomainObject,
-                mockPersistence;
-
-            beforeEach(function () {
-                mockTopic = jasmine.createSpy('topic');
-                mockMutationTopic =
-                    jasmine.createSpyObj('mutation', ['listen']);
-                mockTransactionService =
-                    jasmine.createSpyObj('transactionService', [
-                        'isActive',
-                        'startTransaction',
-                        'addToTransaction',
-                        'commit'
-                    ]);
-                mockDomainObject = jasmine.createSpyObj(
-                    'domainObject',
-                    ['getId', 'getCapability', 'getModel']
-                );
-                mockPersistence = jasmine.createSpyObj(
-                    'persistence',
-                    ['persist', 'refresh', 'persisted']
-                );
-
-                mockTopic.andCallFake(function (t) {
-                    return (t === 'mutation') && mockMutationTopic;
-                });
-
-                mockDomainObject.getCapability.andCallFake(function (c) {
-                    return (c === 'persistence') && mockPersistence;
-                });
-
-                mockPersistence.persisted.andReturn(true);
-
-                return new TransactingMutationListener(
-                    mockTopic,
-                    mockTransactionService
-                );
-            });
-
-            it("listens for mutation", function () {
-                expect(mockMutationTopic.listen)
-                    .toHaveBeenCalledWith(jasmine.any(Function));
-            });
-
-            [false, true].forEach(function (isActive) {
-                var verb = isActive ? "is" : "isn't";
-
-                function onlyWhenInactive(expectation) {
-                    return isActive ? expectation.not : expectation;
-                }
-
-                describe("when a transaction " + verb + " active", function () {
-                    var innerVerb = isActive ? "does" : "doesn't";
-
-                    beforeEach(function () {
-                        mockTransactionService.isActive.andReturn(isActive);
-                    });
-
-                    describe("and mutation occurs", function () {
-                        beforeEach(function () {
-                            mockMutationTopic.listen.mostRecentCall
-                                .args[0](mockDomainObject);
-                        });
-
-
-                        it(innerVerb + " start a new transaction", function () {
-                            onlyWhenInactive(
-                                expect(mockTransactionService.startTransaction)
-                            ).toHaveBeenCalled();
-                        });
-
-                        it("adds to the active transaction", function () {
-                            expect(mockTransactionService.addToTransaction)
-                                .toHaveBeenCalledWith(
-                                jasmine.any(Function),
-                                jasmine.any(Function)
-                            );
-                        });
-
-                        it(innerVerb + " immediately commit", function () {
-                            onlyWhenInactive(
-                                expect(mockTransactionService.commit)
-                            ).toHaveBeenCalled();
-                        });
-                    });
-                });
-            });
-        });
-    }
-);