Remove sizing row for objects when removed

Fixes #2105

.circleci/config.yml

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

.eslintrc.js

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

.jscsrc

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

.jshintrc

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

API.md

@@ -48,10 +48,6 @@
     - [The Time Conductor](#the-time-conductor)
       - [Time Conductor Configuration](#time-conductor-configuration)
       - [Example conductor configuration](#example-conductor-configuration)
-  - [Indicators](#indicators)
-    - [The URL Status Indicator](#the-url-status-indicator)
-    - [Creating a Simple Indicator](#creating-a-simple-indicator)
-    - [Custom Indicators](#custom-indicators)
   - [Included Plugins](#included-plugins)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -692,7 +688,7 @@ openmct.time.timeSystem(utcTimeSystem, bounds);
 Setting the active time system will trigger a [`'timeSystem'`](#time-events) 
 event.  If you supplied bounds, a [`'bounds'`](#time-events) event will be triggered afterwards with your newly supplied bounds.
 
-#### Time Bounds
+### Time Bounds
 
 The TimeAPI provides a getter/setter for querying and setting time bounds. Time 
 bounds are simply an object with a `start` and an end `end` attribute.
@@ -981,72 +977,6 @@ openmct.install(openmct.plugins.Conductor({
 }));
 ```
 
-## Indicators
-
-Indicators are small widgets that reside at the bottom of the screen and are visible from 
-every screen in Open MCT. They can be used to convey system state using an icon and text.
-Typically an indicator will display an icon (customizable with a CSS class) that will 
-reveal additional information when the mouse cursor is hovered over it.
-
-### The URL Status Indicator
-
-A common use case for indicators is to convey the state of some external system such as a 
-persistence backend or HTTP server. So long as this system is accessible via HTTP request, 
-Open MCT provides a general purpose indicator to show whether the server is available and 
-returing a 2xx status code. The URL Status Indicator is made available as a default plugin. See
-[Included Plugins](#included-plugins) below for details on how to install and configure the 
-URL Status Indicator.
-
-### Creating a Simple Indicator
-
-A simple indicator with an icon and some text can be created and added with minimal code. An indicator 
-of this type exposes functions for customizing the text, icon, and style of the indicator.
-
-eg.
-``` javascript
-var myIndicator = openmct.indicators.simpleIndicator();
-myIndicator.text("Hello World!");
-openmct.indicators.add(myIndicator);
-```
-
-This will create a new indicator and add it to the bottom of the screen in Open MCT.
-By default, the indicator will appear as an information icon. Hovering over the icon will
-reveal the text set via the call to `.text()`. The Indicator object returned by the API 
-call exposes a number of functions for customizing the content and appearance of the indicator:
-
-* `.text([text])`: Gets or sets the text shown when the user hovers over the indicator.
-Accepts an __optional__ `string` argument that, if provided, will be used to set the text. 
-Hovering over the indicator will expand it to its full size, revealing this text alongside 
-the icon. Returns the currently set text as a `string`.
-* `.description([description])`: Gets or sets the indicator's description. Accepts an 
-__optional__ `string` argument that, if provided, will be used to set the text. The description 
-allows for more detail to be provided in a tooltip when the user hovers over the indicator. 
-Returns the currently set text as a `string`.
-* `.iconClass([className])`: Gets or sets the CSS class used to define the icon. Accepts an __optional__ 
-`string` parameter to be used to set the class applied to the indicator. Any of 
-[the built-in glyphs](https://nasa.github.io/openmct/style-guide/#/browse/styleguide:home/glyphs?view=styleguide.glyphs) 
-may be used here, or a custom CSS class can be provided. Returns the currently defined CSS 
-class as a `string`.
-* `.statusClass([className])`: Gets or sets the CSS class used to determine status. Accepts an __optional __
-`string` parameter to be used to set a status class applied to the indicator. May be used to apply 
-different colors to indicate status.
-
-### Custom Indicators
-
-A completely custom indicator can be added by simple providing a DOM element to place alongside other indicators.
-
-``` javascript
-    var domNode = document.createElement('div');
-    domNode.innerText = new Date().toString();
-    setInterval(function () {
-        domNode.innerText = new Date().toString();
-    }, 1000);
-
-    openmct.indicators.add({
-        element: domNode
-    });
-```
-
 ## Included Plugins
 
 Open MCT is packaged along with a few general-purpose plugins:
@@ -1070,18 +1000,18 @@ openmct.install(openmct.plugins.CouchDB('http://localhost:9200'))
 * `openmct.plugins.Espresso` and `openmct.plugins.Snow` are two different
   themes (dark and light) available for Open MCT. Note that at least one
   of these themes must be installed for Open MCT to appear correctly.
-* `openmct.plugins.URLIndicator` adds an indicator which shows the
+* `openmct.plugins.URLIndicatorPlugin` adds an indicator which shows the
 availability of a URL with the following options: 
   - `url` : URL to indicate the status of
-  - `iconClass`: Icon to show in the status bar, defaults to `icon-database`, [list of all icons](https://nasa.github.io/openmct/style-guide/#/browse/styleguide:home?view=items)
+  - `cssClass`: Icon to show in the status bar, defaults to `icon-database`, [list of all icons](https://nasa.github.io/openmct/style-guide/#/browse/styleguide:home?view=items)
   - `interval`: Interval between checking the connection, defaults to `10000`
   - `label` Name showing up as text in the status bar, defaults to url
 ```javascript
-openmct.install(openmct.plugins.URLIndicator({
+openmct.install(openmct.plugins.URLIndicatorPlugin({
-  url: 'http://localhost:8080',
+  url: 'http://google.com',
-    iconClass: 'check',
+  cssClass: 'check',
   interval: 10000,
-    label: 'Localhost'
+  label: 'Google'
  })
 );
 ```

README.md

@@ -84,6 +84,7 @@ Documentation will be generated in `target/docs`.
 ## Deploying Open MCT
 
 Open MCT is built using [`npm`](http://npmjs.com/)
+and [`gulp`](http://gulpjs.com/).
 
 To build Open MCT for deployment:
 
@@ -93,13 +94,32 @@ This will compile and minify JavaScript sources, as well as copy over assets.
 The contents of the `dist` folder will contain a runnable Open MCT
 instance (e.g. by starting an HTTP server in that directory), including:
 
-* `openmct.js` - Open MCT source code.
+* A `main.js` file containing Open MCT source code.
-* `openmct.css` - Basic styles to load to prevent a FOUC.
+* Various assets in the `example` and `platform` directories.
-* `index.html`, an example to run Open MCT in the basic configuration.
+* An `index.html` that runs Open MCT in its default configuration.
+
+Additional `gulp` tasks are defined in [the gulpfile](gulpfile.js).
+
+## Bundles
+
+A bundle is a group of software components (including source code, declared
+as AMD modules, as well as resources such as images and HTML templates)
+that is intended to be added or removed as a single unit. A plug-in for
+Open MCT will be expressed as a bundle; platform components are also
+expressed as bundles.
+
+A bundle is also just a directory which contains a file `bundle.json`,
+which declares its contents.
+
+The file `bundles.json` (note the plural), at the top level of the
+repository, is a JSON file containing an array of all bundles (expressed as
+directory names) to include in a running instance of Open MCT. Adding or
+removing paths from this list will add or remove bundles from the running
+application.
 
 ## Tests
 
-Tests are written for [Jasmine 3](http://jasmine.github.io/)
+Tests are written for [Jasmine 1.3](http://jasmine.github.io/1.3/introduction.html)
 and run by [Karma](http://karma-runner.github.io). To run:
 
 `npm test`

app.js

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

bower.json

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

circle.yml

@@ -0,0 +1,27 @@
+machine:
+  node:
+    version: 8.11.0
+
+dependencies:
+  pre:
+    - npm install -g npm@latest
+
+deployment:
+  production:
+    branch: master
+    commands:
+        - npm install canvas nomnoml
+        - ./build-docs.sh
+  openmctweb-staging-deux:
+    branch: mobile
+    heroku:
+      appname: openmctweb-staging-deux
+test:
+  post:
+    - gulp lint
+    - gulp checkstyle
+
+general:
+  branches:
+    ignore:
+      - gh-pages

example/builtins/README.md

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

example/builtins/bundle.js

@@ -0,0 +1,74 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define*/
+
+define([
+    "./src/ExampleController",
+    "./src/ExampleDirective",
+    "./src/ExampleService",
+    'legacyRegistry'
+], function (
+    ExampleController,
+    ExampleDirective,
+    ExampleService,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/builtins", {
+        "name": "Angular Built-ins Example",
+        "description": "Example showing how to declare extensions with built-in support from Angular.",
+        "sources": "src",
+        "extensions": {
+            "controllers": [
+                {
+                    "key": "ExampleController",
+                    "implementation": ExampleController,
+                    "depends": [
+                        "$scope",
+                        "exampleService"
+                    ]
+                }
+            ],
+            "directives": [
+                {
+                    "key": "exampleDirective",
+                    "implementation": ExampleDirective,
+                    "depends": [
+                        "examples[]"
+                    ]
+                }
+            ],
+            "routes": [
+                {
+                    "templateUrl": "templates/example.html"
+                }
+            ],
+            "services": [
+                {
+                    "key": "exampleService",
+                    "implementation": ExampleService
+                }
+            ]
+        }
+    });
+});

example/builtins/res/templates/example.html

@@ -0,0 +1,24 @@
+<!--
+ Open MCT, Copyright (c) 2014-2017, United States Government
+ as represented by the Administrator of the National Aeronautics and Space
+ Administration. All rights reserved.
+
+ Open MCT is licensed under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+ Open MCT includes source code licensed under additional open source
+ licenses. See the Open Source Licenses file (LICENSES.md) included with
+ this source code distribution or the Licensing information page available
+ at runtime from the About dialog for additional information.
+-->
+<p>Hello, world! I am the default route.</p>
+<p ng-controller="ExampleController">My controller has told me: "{{phrase}}"</p>
+<span example-directive></span>

example/builtins/src/ExampleController.js

@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining ExampleController. Created by vwoeltje on 11/4/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function ExampleController($scope, exampleService) {
+            $scope.phrase = exampleService.getMessage();
+        }
+
+        return ExampleController;
+    }
+);

example/builtins/src/ExampleDirective.js

@@ -0,0 +1,66 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining ExampleDirective. Created by vwoeltje on 11/4/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        var HAS_EXTENSIONS = "A directive loaded these message from " +
+                    "example extensions.",
+            NO_EXTENSIONS = "A directive tried to load example extensions," +
+                    " but found none.",
+            MESSAGE = "I heard this from my partial constructor.";
+
+        /**
+         *
+         * @constructor
+         */
+        function ExampleDirective(examples) {
+            // Build up a template from example extensions
+            var template = examples.length > 0 ?
+                    HAS_EXTENSIONS : NO_EXTENSIONS;
+
+            template += "<ul>";
+            examples.forEach(function (E) {
+                template += "<li>";
+                if (typeof E === 'function') {
+                    template += (new E(MESSAGE)).getText();
+                } else {
+                    template += E.text;
+                }
+                template += "</li>";
+            });
+            template += "</ul>";
+
+            return {
+                template: template
+            };
+        }
+
+        return ExampleDirective;
+    }
+);

example/builtins/src/ExampleService.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -19,22 +19,28 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+/*global define,Promise*/
 
+/**
+ * Module defining ExampleService. Created by vwoeltje on 11/4/14.
+ */
 define(
     [],
     function () {
-        function MCTIndicators(openmct) {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function ExampleService() {
             return {
-                restrict: "E",
+                getMessage: function () {
-                link: function link(scope, element) {
+                    return "I heard this from a service";
-                    openmct.indicators.indicatorElements
-                        .forEach(function (indicatorElement) {
-                            element.append(indicatorElement);
-                        });
                 }
             };
         }
 
-        return MCTIndicators;
+        return ExampleService;
     }
 );

example/composite/bundle.js

@@ -0,0 +1,82 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define*/
+
+define([
+    "./src/SomeProvider",
+    "./src/SomeOtherProvider",
+    "./src/SomeDecorator",
+    "./src/SomeOtherDecorator",
+    "./src/SomeAggregator",
+    "./src/SomeOtherExample",
+    'legacyRegistry'
+], function (
+    SomeProvider,
+    SomeOtherProvider,
+    SomeDecorator,
+    SomeOtherDecorator,
+    SomeAggregator,
+    SomeOtherExample,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/composite", {
+        "extensions": {
+            "components": [
+                {
+                    "implementation": SomeProvider,
+                    "provides": "someService",
+                    "type": "provider"
+                },
+                {
+                    "implementation": SomeOtherProvider,
+                    "provides": "someService",
+                    "type": "provider"
+                },
+                {
+                    "implementation": SomeDecorator,
+                    "provides": "someService",
+                    "type": "decorator"
+                },
+                {
+                    "implementation": SomeOtherDecorator,
+                    "provides": "someService",
+                    "type": "decorator"
+                },
+                {
+                    "implementation": SomeAggregator,
+                    "provides": "someService",
+                    "type": "aggregator"
+                }
+            ],
+            "examples": [
+                {
+                    "implementation": SomeOtherExample,
+                    "depends": [
+                        "someService"
+                    ]
+                }
+            ]
+        }
+    });
+});

example/composite/src/SomeAggregator.js

@@ -0,0 +1,50 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining SomeAggregator. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeAggregator(someProviders) {
+            return {
+                getMessages: function () {
+                    return someProviders.map(function (provider) {
+                        return provider.getMessages();
+                    }).reduce(function (a, b) {
+                        return a.concat(b);
+                    }, []);
+                }
+            };
+        }
+
+        return SomeAggregator;
+    }
+);

example/composite/src/SomeDecorator.js

@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining SomeDecorator. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeDecorator(someProvider) {
+            return {
+                getMessages: function () {
+                    return someProvider.getMessages().map(function (msg) {
+                        return msg.toLocaleUpperCase();
+                    });
+                }
+            };
+        }
+
+        return SomeDecorator;
+    }
+);

example/composite/src/SomeOtherDecorator.js

@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining SomeOtherDecorator. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeOtherDecorator(someProvider) {
+            return {
+                getMessages: function () {
+                    return someProvider.getMessages().map(function (msg) {
+                        return msg + "...";
+                    });
+                }
+            };
+        }
+
+        return SomeOtherDecorator;
+    }
+);

example/composite/src/SomeOtherExample.js

@@ -0,0 +1,46 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining SomeOtherExample. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeOtherExample(someService) {
+            return {
+                getText: function () {
+                    return someService.getMessages().join(" | ");
+                }
+            };
+        }
+
+        return SomeOtherExample;
+    }
+);

example/composite/src/SomeOtherProvider.js

@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining SomeOtherProvider. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeOtherProvider() {
+            return {
+                getMessages: function () {
+                    return [
+                        "I am a message from some other provider."
+                    ];
+                }
+            };
+        }
+
+        return SomeOtherProvider;
+    }
+);

example/composite/src/SomeProvider.js

@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining SomeProvider. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeProvider() {
+            return {
+                getMessages: function () {
+                    return [
+                        "I am a message from some provider."
+                    ];
+                }
+            };
+        }
+
+        return SomeProvider;
+    }
+);

example/eventGenerator/src/EventTelemetry.js

@@ -27,11 +27,12 @@
  * Modified by shale on 06/23/2015. 
  */
 define(
-    ['../data/transcript.json'],
+    ['text!../data/transcript.json'],
-    function (messages) {
+    function (transcript) {
         "use strict";
 
-        var firstObservedTime = Date.now();
+        var firstObservedTime = Date.now(),
+            messages = JSON.parse(transcript);
         
         function EventTelemetry(request, interval) {
 

example/extensions/bundle.js

@@ -0,0 +1,51 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define*/
+
+define([
+    "./src/SomeExample",
+    'legacyRegistry'
+], function (
+    SomeExample,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/extensions", {
+        "name": "Custom Extensions Examples",
+        "description": "Example showing how to declare custom extensions.",
+        "sources": "src",
+        "extensions": {
+            "examples": [
+                {
+                    "text": "I came from example/extensions"
+                },
+                {
+                    "implementation": SomeExample,
+                    "depends": [
+                        "exampleService"
+                    ]
+                }
+            ]
+        }
+    });
+});

example/extensions/src/SomeExample.js

@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+/**
+ * Module defining SomeExample. Created by vwoeltje on 11/5/14.
+ */
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         *
+         * @constructor
+         */
+        function SomeExample(exampleService, message) {
+            return {
+                getText: function () {
+                    return [
+                        '"',
+                        exampleService.getMessage(),
+                        '" and "',
+                        message,
+                        '"'
+                    ].join("");
+                }
+            };
+        }
+
+        return SomeExample;
+    }
+);

example/generator/WorkerInterface.js

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 define([
-    'raw-loader!./generatorWorker.js',
+    'text!./generatorWorker.js',
     'uuid'
 ], function (
     workerText,

example/identity/bundle.js

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

example/identity/src/ExampleIdentityService.js

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

example/notifications/res/dialog-launch.html

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

example/notifications/res/notification-launch.html

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

example/simpleVuePlugin/HelloWorld.vue

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

example/simpleVuePlugin/plugin.js

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

example/styleguide/bundle.js

@@ -1,26 +1,10 @@
 define([
     "./src/ExampleStyleGuideModelProvider",
     "./src/MCTExample",
-    "./res/templates/intro.html",
-    "./res/templates/standards.html",
-    "./res/templates/colors.html",
-    "./res/templates/status.html",
-    "./res/templates/glyphs.html",
-    "./res/templates/controls.html",
-    "./res/templates/input.html",
-    "./res/templates/menus.html",
     'legacyRegistry'
 ], function (
     ExampleStyleGuideModelProvider,
     MCTExample,
-    introTemplate,
-    standardsTemplate,
-    colorsTemplate,
-    statusTemplate,
-    glyphsTemplate,
-    controlsTemplate,
-    inputTemplate,
-    menusTemplate,
     legacyRegistry
 ) {
     legacyRegistry.register("example/styleguide", {
@@ -39,14 +23,14 @@ define([
                 { "key": "styleguide.menus", "name": "Menus", "cssClass": "icon-page", "description": "Context menus, dropdowns" }
             ],
             "views": [
-                { "key": "styleguide.intro", "type": "styleguide.intro", "template": introTemplate, "editable": false },
+                { "key": "styleguide.intro", "type": "styleguide.intro", "templateUrl": "templates/intro.html", "editable": false },
-                { "key": "styleguide.standards", "type": "styleguide.standards", "template": standardsTemplate, "editable": false },
+                { "key": "styleguide.standards", "type": "styleguide.standards", "templateUrl": "templates/standards.html", "editable": false },
-                { "key": "styleguide.colors", "type": "styleguide.colors", "template": colorsTemplate, "editable": false },
+                { "key": "styleguide.colors", "type": "styleguide.colors", "templateUrl": "templates/colors.html", "editable": false },
-                { "key": "styleguide.status", "type": "styleguide.status", "template": statusTemplate, "editable": false },
+                { "key": "styleguide.status", "type": "styleguide.status", "templateUrl": "templates/status.html", "editable": false },
-                { "key": "styleguide.glyphs", "type": "styleguide.glyphs", "template": glyphsTemplate, "editable": false },
+                { "key": "styleguide.glyphs", "type": "styleguide.glyphs", "templateUrl": "templates/glyphs.html", "editable": false },
-                { "key": "styleguide.controls", "type": "styleguide.controls", "template": controlsTemplate, "editable": false },
+                { "key": "styleguide.controls", "type": "styleguide.controls", "templateUrl": "templates/controls.html", "editable": false },
-                { "key": "styleguide.input", "type": "styleguide.input", "template": inputTemplate, "editable": false },
+                { "key": "styleguide.input", "type": "styleguide.input", "templateUrl": "templates/input.html", "editable": false },
-                { "key": "styleguide.menus", "type": "styleguide.menus", "template": menusTemplate, "editable": false }
+                { "key": "styleguide.menus", "type": "styleguide.menus", "templateUrl": "templates/menus.html", "editable": false }
             ],
             "roots": [
                 {
@@ -101,6 +85,16 @@ define([
                         "$q"
                     ]
                 }
+            ],
+            "stylesheets": [
+                {
+                    "stylesheetUrl": "css/style-guide-espresso.css",
+                    "theme": "espresso"
+                },
+                {
+                    "stylesheetUrl": "css/style-guide-snow.css",
+                    "theme": "snow"
+                }
             ]
         }
     });

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

@@ -58,10 +58,7 @@
         position: relative;
     }
 
-    .w-mct-example {
+    .w-mct-example > div { margin-bottom: $interiorMarginLg; }
-        color: #ccc;
-        > div { margin-bottom: $interiorMarginLg; }
-    }
 
     code,
     pre {

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

@@ -20,6 +20,12 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 @import "bourbon";
+@import "../../../../platform/commonUI/general/res/sass/constants";
+@import "../../../../platform/commonUI/general/res/sass/mixins";
+@import "../../../../platform/commonUI/themes/espresso/res/sass/constants";
+@import "../../../../platform/commonUI/themes/espresso/res/sass/mixins";
+@import "../../../../platform/commonUI/general/res/sass/glyphs";
+@import "../../../../platform/commonUI/general/res/sass/icons";
 
 // Thematic constants
 $colorCode: rgba(black, 0.2);

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

@@ -20,6 +20,12 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 @import "bourbon";
+@import "../../../../platform/commonUI/general/res/sass/constants";
+@import "../../../../platform/commonUI/general/res/sass/mixins";
+@import "../../../../platform/commonUI/themes/snow/res/sass/constants";
+@import "../../../../platform/commonUI/themes/snow/res/sass/mixins";
+@import "../../../../platform/commonUI/general/res/sass/glyphs";
+@import "../../../../platform/commonUI/general/res/sass/icons";
 
 // Thematic constants
 $colorCode: rgba(black, 0.1);

example/styleguide/res/templates/intro.html

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

example/styleguide/res/templates/status.html

@@ -20,12 +20,12 @@
  at runtime from the About dialog for additional information.
 -->
 <style>
-    .w-mct-example div[class*="s-status"],
-    .w-mct-example span[class*="s-status"],
     .w-mct-example div[class*="s-limit"],
+    .w-mct-example div[class*="s-status"],
+    .w-mct-example div[class*="s-unsynced"],
     .w-mct-example span[class*="s-limit"] {
-        border-radius: 3px;
+        border-radius: 4px;
-        padding: 2px 5px;
+        padding: 3px 7px;
     }
     .w-mct-example table {
         width: 100%;
@@ -36,12 +36,65 @@
     <h1>Status Indication</h1>
 
     <div class="l-section">
-        <h2>Status Classes</h2>
+        <h2>Overview</h2>
+        <p>Many elements in Open MCT need to articulate a dynamic status; Open MCT provides the following styles and conventions to handle this:</p>
+        <ul>
+            <li><strong>Limits</strong>: when telemetry values exceed minimum or maximum values, they can be violating limits. Limit styles include both color and iconography; color is used to indicate severity while icons are used to indicate direction, upper or lower.</li>
+            <li><strong>Status</strong>: Open MCT also provides a number or built-in Status styles allowing telemetry or other displayed information to be visually classified by type. Common uses for these classes are to visually denote event records.</li>
+            <li><strong>Synchronization</strong>: When the system is displaying real-time data, it is very important that displays clearly indicate when they are not doing so, such as when a plot if frozen while panning or zooming. Open MCT provides a style for this.</li>
+        </ul>
+    </div>
+
+    <div class="l-section">
+        <h2>Limits</h2>
         <div class="cols cols1-1">
             <div class="col">
-                <p>Status classes allow any block or inline-block element to be decorated in order to articulate a
+                <p>Limit CSS classes can be applied to any block or inline element. Open MCT limit classes set color and optionally an icon, but don't effect other properties. Yellow and red limit classes can be used as is, or allow the application of any custom icon available in Open MCT's glyphs library. &quot;Level&quot; limit classes - upper and lower - always use an icon in addition to a color; Open MCT doesn't support level limits without color.</p>
-                    status. Provided classes include color-only and color plus icon; custom icons can easily be
+                <ul>
-                    employed by using a color-only status class in combination with an <a class="link" href="#/browse/styleguide:home/glyphs?tc.mode=local&tc.timeSystem=utc&tc.startDelta=1800000&tc.endDelta=0&view=styleguide.glyphs">glyph</a>.</p>
+                    <li>Color only</li>
+                    <ul>
+                        <li><code>s-limit-yellow</code>: A yellow limit.</li>
+                        <li><code>s-limit-red</code>: A red limit.</li>
+                    </ul>
+                    <li>Color and icon</li>
+                    <ul>
+                        <li><code>s-limit-yellow-icon</code>: A yellow limit with icon.</li>
+                        <li><code>s-limit-red-icon</code>: A red limit with icon.</li>
+                    </ul>
+                    <li>Upper and lower limit indicators. Must be used with a color limit class to be visible.</li>
+                    <ul>
+                        <li><code>s-limit-upr</code>: Upper limit.
+                        </li>
+                        <li><code>s-limit-lwr</code>: Lower limit.
+                        </li>
+                    </ul>
+                </ul>
+            </div>
+<mct-example><div class="s-limit-yellow">Yellow limit</div>
+<div class="s-limit-red">Red limit</div>
+<div class="s-limit-yellow-icon">Yellow limit with icon</div>
+<div class="s-limit-red-icon">Red limit with icon</div>
+<div class="s-limit-yellow s-limit-lwr">Lower yellow limit</div>
+<div class="s-limit-red s-limit-upr">Upper red limit</div>
+<div class="s-limit-red icon-bell">Red Limit with a custom icon</div>
+<div>Some text with an <span class="s-limit-yellow-icon">inline element</span> showing a yellow limit.</div>
+
+<!-- Limits applied in a table -->
+<table>
+    <tr class='header'><td>Name</td><td>Value 1</td><td>Value 2</td></tr>
+    <tr><td>ENG_PWR 4991</td><td>7.023</td><td class="s-limit-yellow s-limit-upr">70.23</td></tr>
+    <tr><td>ENG_PWR 4992</td><td>49.784</td><td class="s-limit-red s-limit-lwr">-121.22</td></tr>
+    <tr><td>ENG_PWR 4993</td><td class="s-limit-yellow icon-bell">0.451</td><td>1.007</td></tr>
+</table>
+</mct-example>
+        </div>
+    </div>
+
+    <div class="l-section">
+        <h2>Status</h2>
+        <div class="cols cols1-1">
+            <div class="col">
+                <p>Classes here can be applied to elements as needed.</p>
                 <ul>
                     <li>Color only</li>
                     <ul>
@@ -53,174 +106,36 @@
                     </ul>
                     <li>Color and icon</li>
                     <ul>
-                        <li><code>s-status-icon-warning-hi</code></li>
+                        <li><code>s-status-warning-hi-icon</code></li>
-                        <li><code>s-status-icon-warning-lo</code></li>
+                        <li><code>s-status-warning-lo-icon</code></li>
-                        <li><code>s-status-icon-diagnostic</code></li>
+                        <li><code>s-status-diagnostic-icon</code></li>
-                        <li><code>s-status-icon-info</code></li>
+                        <li><code>s-status-info-icon</code></li>
-                        <li><code>s-status-icon-ok</code></li>
+                        <li><code>s-status-ok-icon</code></li>
                     </ul>
                 </ul>
             </div>
-<mct-example><!-- Color alone examples -->
+<mct-example><div class="s-status-warning-hi">WARNING HI</div>
-<div class="s-status-warning-hi">WARNING HI</div>
 <div class="s-status-warning-lo">WARNING LOW</div>
 <div class="s-status-diagnostic">DIAGNOSTIC</div>
 <div class="s-status-info">INFO</div>
 <div class="s-status-ok">OK</div>
-
+<div class="s-status-warning-hi-icon">WARNING HI with icon</div>
-<!-- Color and icon examples -->
+<div class="s-status-warning-lo-icon">WARNING LOW with icon</div>
-<div class="s-status-icon-warning-hi">WARNING HI with icon</div>
+<div class="s-status-diagnostic-icon">DIAGNOSTIC with icon</div>
-<div class="s-status-icon-warning-lo">WARNING LOW with icon</div>
+<div class="s-status-info-icon">INFO with icon</div>
-<div class="s-status-icon-diagnostic">DIAGNOSTIC with icon</div>
+<div class="s-status-ok-icon">OK with icon</div>
-<div class="s-status-icon-info">INFO with icon</div>
+<div class="s-status-warning-hi icon-gear">WARNING HI with custom icon</div>
-<div class="s-status-icon-ok">OK with icon</div>
-<div class="s-status-warning-hi icon-alert-triangle">WARNING HI with custom icon</div>
-<div>Some text with an <span class="s-status-icon-diagnostic">inline element</span> showing a Diagnostic status.</div>
 </mct-example>
         </div>
     </div>
 
     <div class="l-section">
-        <h2>Limit Classes</h2>
+        <h2>Synchronization</h2>
         <div class="cols cols1-1">
             <div class="col">
-                <p>Limit classes are a specialized form of status, specifically meant to be applied to telemetry
+                <p>When the system is operating in real-time streaming mode, it is important for views that display real-time data to clearly articulate when they are not, such as when a user zooms or pans a plot view, freezing that view. In that case, the CSS class <code>s-unsynced</code> should be applied to that view.</p>
-                    displays to indicate that a limit threshold has been violated. Open MCT provides both severity
-                    and direction classes; severity (yellow and red) can be used alone or in combination
-                    with direction (upper or lower). Direction classes cannot be used on their own.</p>
-                <p>Like Status classes, Limits can be used as color-only, or color plus icon. Custom icons can
-                be applied in the same fashion as described above.</p>
-                <ul>
-                    <li>Severity color alone</li>
-                    <ul>
-                        <li><code>s-limit-yellow</code>: A yellow limit.</li>
-                        <li><code>s-limit-red</code>: A red limit.</li>
-                    </ul>
-                    <li>Severity color and icon</li>
-                    <ul>
-                        <li><code>s-limit-icon-yellow</code>: A yellow limit with icon.</li>
-                        <li><code>s-limit-icon-red</code>: A red limit with icon.</li>
-                    </ul>
-                    <li>Direction indicators. MUST be used with a &quot;color alone&quot; limit class. See
-                    examples for more.</li>
-                    <ul>
-                        <li><code>s-limit-upr</code>: Upper limit.</li>
-                        <li><code>s-limit-lwr</code>: Lower limit.</li>
-                    </ul>
-                </ul>
-            </div>
-<mct-example><!-- Color alone examples -->
-<div class="s-limit-yellow">Yellow limit</div>
-<div class="s-limit-red">Red limit</div>
-
-<!-- Color and icon examples -->
-<div class="s-limit-icon-yellow">Yellow limit with icon</div>
-<div class="s-limit-icon-red">Red limit with icon</div>
-<div class="s-limit-red icon-alert-rect">Red Limit with a custom icon</div>
-<div>Some text with an <span class="s-limit-icon-yellow">inline element</span> showing a yellow limit.</div>
-
-<!-- Severity and direction examples -->
-<div class="s-limit-yellow s-limit-lwr">Lower yellow limit</div>
-<div class="s-limit-red s-limit-upr">Upper red limit</div>
-
-<!-- Limits applied in a table -->
-<table>
-    <tr class='header'><td>Name</td><td>Value 1</td><td>Value 2</td></tr>
-    <tr><td>ENG_PWR 4991</td><td>7.023</td><td class="s-limit-yellow s-limit-upr">70.23</td></tr>
-    <tr><td>ENG_PWR 4992</td><td>49.784</td><td class="s-limit-red s-limit-lwr">-121.22</td></tr>
-    <tr><td>ENG_PWR 4993</td><td class="s-limit-yellow icon-alert-triangle">0.451</td><td>1.007</td></tr>
-</table>
-</mct-example>
-        </div>
-    </div>
-
-    <div class="l-section">
-        <h2>Status Bar Indicators</h2>
-        <div class="cols cols1-1">
-            <div class="col">
-                <p>Indicators are small iconic notification elements that appear in the Status Bar area of
-                    the application at the window's bottom. Indicators should be used to articulate the state of a
-                    system and optionally provide gestures related to that system. They use a combination of icon and
-                    color to identify themselves and articulate a state respectively.</p>
-                <h3>Recommendations</h3>
-                <ul>
-                    <li><strong>Keep the icon consistent</strong>. The icon is the principal identifier of the system and is a valuable
-                        recall aid for the user. Don't change the icon as a system's state changes, use color and
-                        text for that purpose.</li>
-                    <li><strong>Don't use the same icon more than once</strong>. Select meaningful and distinct icons so the user
-                        will be able to quickly identify what they're looking for.</li>
-                </ul>
-
-                <h3>States</h3>
-                <ul>
-                    <li><strong>Disabled</strong>: The system is not available to the user.</li>
-                    <li><strong>Off / Available</strong>: The system is accessible to the user but is not currently
-                        &quot;On&quot; or has not been configured. If the Indicator directly provides gestures
-                        related to the system, such as opening a configuration dialog box, then use
-                        &quot;Available&quot;; if the user must act elsewhere or the system isn't user-controllable,
-                        use &quot;Off&quot;.</li>
-                    <li><strong>On</strong>: The system is enabled or configured; it is having an effect on the larger application.</li>
-                    <li><strong>Alert / Error</strong>: There has been a problem with the system. Generally, &quot;Alert&quot;
-                        should be used to call attention to an issue that isn't critical, while  &quot;Error&quot;
-                        should be used to call attention to a problem that the user should really be aware of or do
-                        something about.</li>
-                </ul>
-
-                <h3>Structure</h3>
-                <p>Indicators consist of a <code>.ls-indicator</code>
-                    wrapper element with <code>.icon-*</code> classes for the type of thing they represent and
-                    <code>.s-status-*</code> classes to articulate the current state. Title attributes should be used
-                    to provide more verbose information about the thing and/or its status.</p>
-                <p>The wrapper encloses a <code>.label</code> element that is displayed on hover. This element should
-                    include a brief statement of the current status, and can also include clickable elements
-                    as <code>&lt;a&gt;</code> tags. An optional <code>.count</code> element can be included to display
-                    information such as a number of messages.</p>
-                <p>Icon classes are as defined on the
-                    <a class="link" href="#/browse/styleguide:home/glyphs?tc.mode=local&tc.timeSystem=utc&tc.startDelta=1800000&tc.endDelta=0&view=styleguide.glyphs">
-                        Glyphs page</a>. Status classes applicable to Indicators are as follows:</p>
-                <ul>
-                    <li><code>s-status-disabled</code></li>
-                    <li><code>s-status-off</code></li>
-                    <li><code>s-status-available</code></li>
-                    <li><code>s-status-on</code></li>
-                    <li><code>s-status-alert</code></li>
-                    <li><code>s-status-error</code></li>
-                </ul>
-            </div>
-<mct-example><div class="s-ue-bottom-bar status-holder s-status-bar">
-    <span class="ls-indicator icon-database s-status-disabled" title="The system is currently disabled.">
-        <span class="label">System not enabled.</span>
-    </span>
-</div>
-
-<div class="s-ue-bottom-bar status-holder s-status-bar">
-    <span class="ls-indicator icon-database s-status-available" title="Configure data connection.">
-        <span class="label">Data connection available
-            <a class="icon-gear">Configure</a>
-        </span>
-    </span>
-</div>
-
-<div class="s-ue-bottom-bar status-holder s-status-bar">
-    <span class="ls-indicator icon-database s-status-on" title="Data connected.">
-        <span class="label">Connected to Skynet
-            <a class="icon-gear">Change</a>
-            <a>Disconnect</a>
-        </span>
-    </span>
-</div>
-
-<div class="s-ue-bottom-bar status-holder s-status-bar">
-    <span class="ls-indicator icon-database s-status-alert" title="System is self-aware.">
-        <span class="label">Skynet at Turing Level 5</span>
-    </span>
-    <span class="ls-indicator icon-bell s-status-error" title="You have alerts.">
-        <span class="label">
-            <a class="icon-alert-triangle">View Alerts</a>
-        </span>
-        <span class="count">495</span>
-    </span>
             </div>
+<mct-example><div class="s-unsynced">This element is unsynced</div>
 </mct-example>
         </div>
     </div>

example/styleguide/src/MCTExample.js

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

example/taxonomy/bundle.js

@@ -0,0 +1,68 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define*/
+
+define([
+    "./src/ExampleTaxonomyModelProvider",
+    'legacyRegistry'
+], function (
+    ExampleTaxonomyModelProvider,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/taxonomy", {
+        "name": "Example taxonomy",
+        "description": "Example illustrating the addition of a static top-level hierarchy",
+        "extensions": {
+            "roots": [
+                {
+                    "id": "exampleTaxonomy"
+                }
+            ],
+            "models": [
+                {
+                    "id": "exampleTaxonomy",
+                    "model": {
+                        "type": "folder",
+                        "name": "Stub Subsystems",
+                        "composition": [
+                            "examplePacket0",
+                            "examplePacket1",
+                            "examplePacket2"
+                        ]
+                    }
+                }
+            ],
+            "components": [
+                {
+                    "provides": "modelService",
+                    "type": "provider",
+                    "implementation": ExampleTaxonomyModelProvider,
+                    "depends": [
+                        "$q"
+                    ]
+                }
+            ]
+        }
+    });
+});

example/taxonomy/src/ExampleTaxonomyModelProvider.js

@@ -0,0 +1,69 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define*/
+
+define(
+    [],
+    function () {
+        "use strict";
+
+        function ExampleTaxonomyModelProvider($q) {
+            var models = {},
+                packetId,
+                telemetryId,
+                i,
+                j;
+
+            // Add some "subsystems"
+            for (i = 0; i < 3; i += 1) {
+                packetId = "examplePacket" + i;
+
+                models[packetId] = {
+                    name: "Stub Subsystem " + (i + 1),
+                    type: "telemetry.panel",
+                    composition: []
+                };
+
+                // Add some "telemetry points"
+                for (j = 0; j < 100 * (i + 1); j += 1) {
+                    telemetryId = "exampleTelemetry" + j;
+                    models[telemetryId] = {
+                        name: "SWG" + i + "." + j,
+                        type: "generator",
+                        telemetry: {
+                            period: 10 + i + j
+                        }
+                    };
+                    models[packetId].composition.push(telemetryId);
+                }
+            }
+
+            return {
+                getModels: function () {
+                    return $q.when(models);
+                }
+            };
+        }
+
+        return ExampleTaxonomyModelProvider;
+    }
+);

example/worker/README.md

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

example/worker/bundle.js

@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define*/
+
+define([
+    "./src/FibonacciIndicator",
+    'legacyRegistry'
+], function (
+    FibonacciIndicator,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/worker", {
+        "extensions": {
+            "indicators": [
+                {
+                    "implementation": FibonacciIndicator,
+                    "depends": [
+                        "workerService",
+                        "$rootScope"
+                    ]
+                }
+            ],
+            "workers": [
+                {
+                    "key": "example.fibonacci",
+                    "scriptUrl": "FibonacciWorker.js"
+                }
+            ]
+        }
+    });
+});

example/worker/src/FibonacciIndicator.js

@@ -0,0 +1,67 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define*/
+
+define(
+    [],
+    function () {
+        "use strict";
+
+        /**
+         * Displays Fibonacci numbers in the status area.
+         * @constructor
+         */
+        function FibonacciIndicator(workerService, $rootScope) {
+            var latest,
+                counter = 0,
+                worker = workerService.run('example.fibonacci');
+
+            function requestNext() {
+                worker.postMessage([counter]);
+                counter += 1;
+            }
+
+            function handleResponse(event) {
+                latest = event.data;
+                $rootScope.$apply();
+                requestNext();
+            }
+
+            worker.onmessage = handleResponse;
+            requestNext();
+
+            return {
+                getCssClass: function () {
+                    return "icon-object-unknown";
+                },
+                getText: function () {
+                    return latest;
+                },
+                getDescription: function () {
+                    return "";
+                }
+            };
+        }
+
+        return FibonacciIndicator;
+    }
+);

example/worker/src/FibonacciWorker.js

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

gulpfile.js

@@ -0,0 +1,182 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/*global require,__dirname*/
+
+require("v8-compile-cache");
+
+var gulp = require('gulp'),
+    sourcemaps = require('gulp-sourcemaps'),
+    path = require('path'),
+    fs = require('fs'),
+    git = require('git-rev-sync'),
+    moment = require('moment'),
+    project = require('./package.json'),
+    _ = require('lodash'),
+    paths = {
+        main: 'openmct.js',
+        dist: 'dist',
+        reports: 'dist/reports',
+        scss: ['./platform/**/*.scss', './example/**/*.scss'],
+        assets: [
+            './{example,platform}/**/*.{css,css.map,png,svg,ico,woff,eot,ttf}'
+        ],
+        scripts: [ 'openmct.js', 'platform/**/*.js', 'src/**/*.js' ],
+        specs: [ 'platform/**/*Spec.js', 'src/**/*Spec.js' ],
+    },
+    options = {
+        requirejsOptimize: {
+            name: 'bower_components/almond/almond.js',
+            include: paths.main.replace('.js', ''),
+            wrap: {
+                start: (function () {
+                    var buildVariables = {
+                        version: project.version,
+                        timestamp: moment.utc(Date.now()).format(),
+                        revision: fs.existsSync('.git') ? git.long() : 'Unknown',
+                        branch: fs.existsSync('.git') ? git.branch() : 'Unknown'
+                    };
+                    return fs.readFileSync("src/start.frag", 'utf-8')
+                        .replace(/@@(\w+)/g, function (match, key) {
+                            return buildVariables[key];
+                        });;
+                }()),
+                endFile: "src/end.frag"
+            },
+            optimize: 'uglify2',
+            uglify2: { output: { comments: /@preserve/ } },
+            mainConfigFile: paths.main,
+            wrapShim: true
+        },
+        karma: {
+            configFile: path.resolve(__dirname, 'karma.conf.js'),
+            singleRun: true
+        },
+        sass: {
+            sourceComments: true
+        }
+    };
+
+if (process.env.NODE_ENV === 'development') {
+    options.requirejsOptimize.optimize = 'none';
+}
+
+
+gulp.task('scripts', function () {
+    var requirejsOptimize = require('gulp-requirejs-optimize');
+
+    return gulp.src(paths.main)
+        .pipe(sourcemaps.init())
+        .pipe(requirejsOptimize(options.requirejsOptimize))
+        .pipe(sourcemaps.write('.'))
+        .pipe(gulp.dest(paths.dist));
+});
+
+gulp.task('test', function (done) {
+    var karma = require('karma');
+    new karma.Server(options.karma, done).start();
+});
+
+gulp.task('stylesheets', function () {
+    var sass = require('gulp-sass');
+    var rename = require('gulp-rename');
+    var bourbon = require('node-bourbon');
+    options.sass.includePaths = bourbon.includePaths;
+
+    return gulp.src(paths.scss, {base: '.'})
+        .pipe(sourcemaps.init())
+        .pipe(sass(options.sass).on('error', sass.logError))
+        .pipe(rename(function (file) {
+            file.dirname =
+                file.dirname.replace(path.sep + 'sass', path.sep + 'css');
+            return file;
+        }))
+        .pipe(sourcemaps.write('.'))
+        .pipe(gulp.dest(__dirname));
+});
+
+gulp.task('lint', function () {
+    var jshint = require('gulp-jshint');
+    var merge = require('merge-stream');
+
+    var nonspecs = paths.specs.map(function (glob) {
+            return "!" + glob;
+        }),
+        scriptLint = gulp.src(paths.scripts.concat(nonspecs))
+            .pipe(jshint()),
+        specLint = gulp.src(paths.specs)
+            .pipe(jshint({ jasmine: true }));
+
+    return merge(scriptLint, specLint)
+        .pipe(jshint.reporter('gulp-jshint-html-reporter', {
+            filename: paths.reports + '/lint/jshint-report.html',
+            createMissingFolders : true
+        }))
+        .pipe(jshint.reporter('default'))
+        .pipe(jshint.reporter('fail'));
+});
+
+gulp.task('checkstyle', function () {
+    var jscs = require('gulp-jscs');
+    var mkdirp = require('mkdirp');
+    var reportName = 'jscs-html-report.html';
+    var reportPath = path.resolve(paths.reports, 'checkstyle', reportName);
+    var moveReport = fs.rename.bind(fs, reportName, reportPath, _.noop);
+
+    mkdirp.sync(path.resolve(paths.reports, 'checkstyle'));
+
+    return gulp.src(paths.scripts)
+        .pipe(jscs())
+        .pipe(jscs.reporter())
+        .pipe(jscs.reporter('jscs-html-reporter')).on('finish', moveReport)
+        .pipe(jscs.reporter('fail'));
+});
+
+gulp.task('fixstyle', function () {
+    var jscs = require('gulp-jscs');
+
+    return gulp.src(paths.scripts, { base: '.' })
+        .pipe(jscs({ fix: true }))
+        .pipe(gulp.dest('.'));
+});
+
+gulp.task('assets', ['stylesheets'], function () {
+    return gulp.src(paths.assets)
+        .pipe(gulp.dest(paths.dist));
+});
+
+gulp.task('watch', function () {
+    return gulp.watch(paths.scss, ['stylesheets', 'assets']);
+});
+
+gulp.task('serve', function () {
+    console.log('Running development server with all defaults');
+    var app = require('./app.js');
+});
+
+gulp.task('develop', ['serve', 'stylesheets', 'watch']);
+
+gulp.task('install', [ 'assets', 'scripts' ]);
+
+gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]);
+
+gulp.task('build', [ 'verify', 'install' ]);

index.html

@@ -26,17 +26,11 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no">
         <meta name="apple-mobile-web-app-capable" content="yes">
         <title></title>
-        <script src="dist/openmct.js"></script>
+        <script src="bower_components/requirejs/require.js"> </script>
-        <link rel="stylesheet" href="dist/openmct.css">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96">
-        <link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16">
-        <link rel="shortcut icon" href="dist/favicons/favicon.ico">
-    </head>
-    <body>
-    </body>
         <script>
             var THIRTY_MINUTES = 30 * 60 * 1000;
+
+            require(['openmct', './src/plugins/telemetryTable/plugin'], function (openmct, TelemetryTablePlugin) {
                 [
                     'example/eventGenerator',
                     'example/styleguide'
@@ -45,6 +39,7 @@
                 );
                 openmct.install(openmct.plugins.MyItems());
                 openmct.install(openmct.plugins.LocalStorage());
+                openmct.install(openmct.plugins.Espresso());
                 openmct.install(openmct.plugins.Generator());
                 openmct.install(openmct.plugins.ExampleImagery());
                 openmct.install(openmct.plugins.UTCTimeSystem());
@@ -75,8 +70,22 @@
                 }));
                 openmct.install(openmct.plugins.SummaryWidget());
                 openmct.install(openmct.plugins.Notebook());
+                openmct.install(TelemetryTablePlugin());
                 openmct.time.clock('local', {start: -THIRTY_MINUTES, end: 0});
                 openmct.time.timeSystem('utc');
                 openmct.start();
+            });
         </script>
+        <link rel="stylesheet" href="platform/commonUI/general/res/css/startup-base.css">
+        <link rel="stylesheet" href="platform/commonUI/general/res/css/openmct.css">
+        <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-32x32.png" sizes="32x32">
+        <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-96x96.png" sizes="96x96">
+        <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-16x16.png" sizes="16x16">
+        <link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico">
+    </head>
+    <body>
+        <div class="l-splash-holder s-splash-holder">
+            <div class="l-splash s-splash"></div>
+        </div>
+    </body>
 </html>

karma.conf.js

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

notes.md

@@ -0,0 +1,68 @@
+* Delete old table
+* Update new table type and test backward compatibility.
+* re-evaluate TableConfiguration object. Name doesn't make sense right now, and some duplicated code for configuration handling in components.
+* Rebase over refactor branch
+* Move css to new table location
+* Test (see list of issues below)
+* Push WIP PR
+
+* [X] Remove column sizing rows on object removal (should be trivial since tracking by object ID already).
+* [X] Look at optimizing styles in telemetry-table-row
+   - Right now profiling does not highlight this as a bottleneck?
+* [X] Add title to table cells
+* [X] Add elipses for overflow on table cells
+* [X] On entry, filter boxes need to remove magnifying glass.
+* [X] auto-scroll
+* [X] Show / hide columns (ie. table configuration)
+* [X] Why aren't limits being applied until I scroll or do something?
+* [X] Handle window resizing
+* [X] Fix memory leaks
+* [X] Remove isFromObject and hasColumn from TelemetryTableRow
+* [X] Remove format caching
+* [X] Add filtering
+    * If the new filter string starts with the old filter string, filter based on the list of previously filtered results, not the base list.
+    * Add the clear filter button
+* [X] Cache formatted values for "just in time" formatting. I think cache on row. Opportunity to cache on column to benefit from multiple rows with the same value, but memory management becomes a problem then as cache could grow infinitely if the table is left to run.
+* [X] Do some more testing with multiple objects. Not working properly right now.
+* [X] Rows not being removed when object removed from composition
+* [X] Subscribe to realtime data
+* [X] Column widths should be done on receipt of FIRST DATA, not on receipt of historical data.
+* [X] Filter subscription data
+* [X] Export
+* [X] Add loading spinner
+* [X] in 'mounted', should not be necessary to bind to 'this'.
+* [X] Stop Vue from decorating EVERYTHING (but especially the telemetry collection)
+* [X] Need minimum width on tables. Provided by calcTableWidthPx in MCTTableController
+* [X] Limits
+
+* Benchmark - loading 1 million rows
+    - Old tables: ~90s
+    - New tables: ~11s
+* 1 million rows in 11 secs vs 90s
+
+To Test
+* Multiple instances of tables
+* Make sure time columns are being correctly merged
+* Test with MSL data sources
+* Test with tutorial data sources
+* Behavior at different widths.
+* Short tables
+* Test with bounds / clock / time system changes.
+* Memory leaks
+
+Post WIP PR
+* Fix jitter on auto-scroll
+* Look at scroll-x again. Sounded like there might be some subtlety missing there (something to do with small columns?).
+* Split TelemetryTableComponent into more components. It's too large now.
+* Performance
+    * Don't wrap row on load, do it on scroll.
+    * On batch insert, check bounds once, rather than on each insert.
+* See if sticky headers can be simplified (eg. can we combine headers table with content table?)
+* Default sort behavior, and sticking to the bottom for realtime numerical
+* Look at setting top on tbody, instead of each tr
+* Replace all "mct-table" classes
+* Consider making the sizing row a separate component. Encapsulate all sizing logic in there.
+* consider making the header table a separate component.
+* Test where no time column present (what will it sort by)
+
+* [X] Optimization - don't both sorting filtered rows initially, just copy over values from bounded row collection which have already been sorted. 

openmct.js

@@ -19,19 +19,102 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global module,BUILD_CONSTANTS*/
+/*global requirejs,BUILD_CONSTANTS*/
 
-const matcher = /\/openmct.js$/;
+requirejs.config({
-if (document.currentScript) {
+    "paths": {
-    let src = document.currentScript.src;
+        "legacyRegistry": "src/legacyRegistry",
-    if (src && matcher.test(src)) {
+        "angular": "bower_components/angular/angular.min",
-        // eslint-disable-next-line no-undef
+        "angular-route": "bower_components/angular-route/angular-route.min",
-        __webpack_public_path__ = src.replace(matcher, '') + '/';
+        "csv": "bower_components/comma-separated-values/csv.min",
+        "EventEmitter": "bower_components/eventemitter3/index",
+        "es6-promise": "bower_components/es6-promise/es6-promise.min",
+        "moment": "bower_components/moment/moment",
+        "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format",
+        "moment-timezone": "bower_components/moment-timezone/builds/moment-timezone-with-data",
+        "saveAs": "bower_components/file-saver/FileSaver.min",
+        "screenfull": "bower_components/screenfull/dist/screenfull.min",
+        "text": "bower_components/text/text",
+        "uuid": "bower_components/node-uuid/uuid",
+        "vue": "node_modules/vue/dist/vue.min",
+        "zepto": "bower_components/zepto/zepto.min",
+        "lodash": "bower_components/lodash/lodash",
+        "d3-selection": "node_modules/d3-selection/dist/d3-selection.min",
+        "d3-scale": "node_modules/d3-scale/build/d3-scale.min",
+        "d3-axis": "node_modules/d3-axis/build/d3-axis.min",
+        "d3-array": "node_modules/d3-array/build/d3-array.min",
+        "d3-collection": "node_modules/d3-collection/build/d3-collection.min",
+        "d3-color": "node_modules/d3-color/build/d3-color.min",
+        "d3-format": "node_modules/d3-format/build/d3-format.min",
+        "d3-interpolate": "node_modules/d3-interpolate/build/d3-interpolate.min",
+        "d3-time": "node_modules/d3-time/build/d3-time.min",
+        "d3-time-format": "node_modules/d3-time-format/build/d3-time-format.min",
+        "html2canvas": "node_modules/html2canvas/dist/html2canvas.min",
+        "painterro": "node_modules/painterro/build/painterro.min",
+        "printj": "node_modules/printj/dist/printj.min"
+    },
+    "shim": {
+        "angular": {
+            "exports": "angular"
+        },
+        "angular-route": {
+            "deps": ["angular"]
+        },
+        "EventEmitter": {
+            "exports": "EventEmitter"
+        },
+        "moment-duration-format": {
+            "deps": ["moment"]
+        },
+        "painterro": {
+            "exports": "Painterro"
+        },
+        "saveAs": {
+            "exports": "saveAs"
+        },
+        "screenfull": {
+            "exports": "screenfull"
+        },
+        "zepto": {
+            "exports": "Zepto"
+        },
+        "lodash": {
+            "exports": "lodash"
+        },
+        "d3-selection": {
+            "exports": "d3-selection"
+        },
+        "d3-scale": {
+            "deps": ["d3-array", "d3-collection", "d3-color", "d3-format", "d3-interpolate", "d3-time", "d3-time-format"],
+            "exports": "d3-scale"
+        },
+        "d3-axis": {
+            "exports": "d3-axis"
+        },
+        "dom-to-image": {
+            "exports": "domtoimage"
         }
     }
+});
 
-const MCT = require('./src/MCT');
+define([
-
+    './platform/framework/src/Main',
+    './src/defaultRegistry',
+    './src/MCT',
+    './src/plugins/buildInfo/plugin'
+], function (Main, defaultRegistry, MCT, buildInfo) {
     var openmct = new MCT();
 
-module.exports = openmct;
+    openmct.legacyRegistry = defaultRegistry;
+    openmct.install(openmct.plugins.Plot());
+
+    if (typeof BUILD_CONSTANTS !== 'undefined') {
+        openmct.install(buildInfo(BUILD_CONSTANTS));
+    }
+
+    openmct.on('start', function () {
+        return new Main().run(defaultRegistry);
+    });
+
+    return openmct;
+});

package.json

@@ -2,15 +2,7 @@
   "name": "openmct",
   "version": "0.14.0-SNAPSHOT",
   "description": "The Open MCT core platform",
-  "dependencies": {},
+  "dependencies": {
-  "devDependencies": {
-    "angular": "1.4.14",
-    "angular-route": "1.4.14",
-    "babel-eslint": "8.2.6",
-    "comma-separated-values": "^3.6.4",
-    "concurrently": "^3.6.1",
-    "copy-webpack-plugin": "^4.5.2",
-    "css-loader": "^1.0.0",
     "d3-array": "1.2.x",
     "d3-axis": "1.0.x",
     "d3-collection": "1.0.x",
@@ -21,70 +13,57 @@
     "d3-selection": "1.3.x",
     "d3-time": "1.0.x",
     "d3-time-format": "2.1.x",
-    "eslint": "5.2.0",
-    "eventemitter3": "^1.2.0",
-    "exports-loader": "^0.7.0",
     "express": "^4.13.1",
-    "fast-sass-loader": "^1.4.5",
+    "minimist": "^1.1.1",
-    "file-loader": "^1.1.11",
+    "painterro": "^0.2.65",
-    "file-saver": "^1.3.8",
+    "request": "^2.69.0",
+    "vue": "^2.5.6"
+  },
+  "devDependencies": {
+    "bower": "^1.7.7",
     "git-rev-sync": "^1.4.0",
     "glob": ">= 3.0.0",
-    "html-loader": "^0.5.5",
+    "gulp": "^3.9.1",
+    "gulp-jscs": "^3.0.2",
+    "gulp-jshint": "^2.0.0",
+    "gulp-jshint-html-reporter": "^0.1.3",
+    "gulp-rename": "^1.2.2",
+    "gulp-requirejs-optimize": "^0.3.1",
+    "gulp-sass": "^3.1.0",
+    "gulp-sourcemaps": "^1.6.0",
     "html2canvas": "^1.0.0-alpha.12",
-    "imports-loader": "^0.8.0",
-    "istanbul-instrumenter-loader": "^3.0.1",
     "jasmine-core": "^3.1.0",
+    "jscs-html-reporter": "^0.1.0",
     "jsdoc": "^3.3.2",
+    "jshint": "^2.7.0",
     "karma": "^2.0.3",
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^1.0.1",
     "karma-coverage": "^1.1.2",
     "karma-html-reporter": "^0.2.7",
     "karma-jasmine": "^1.1.2",
-    "karma-webpack": "^3.0.0",
+    "karma-requirejs": "^1.1.0",
-    "location-bar": "^3.0.1",
     "lodash": "^3.10.1",
     "markdown-toc": "^0.11.7",
     "marked": "^0.3.5",
-    "mini-css-extract-plugin": "^0.4.1",
+    "merge-stream": "^1.0.0",
-    "minimist": "^1.1.1",
+    "mkdirp": "^0.5.1",
     "moment": "^2.11.1",
-    "moment-duration-format": "^2.2.2",
-    "moment-timezone": "^0.5.21",
     "node-bourbon": "^4.2.3",
-    "node-sass": "^4.9.2",
-    "painterro": "^0.2.65",
     "printj": "^1.1.0",
-    "raw-loader": "^0.5.1",
+    "requirejs": "2.1.x",
-    "request": "^2.69.0",
-    "screenfull": "^3.3.2",
     "split": "^1.0.0",
-    "style-loader": "^0.21.0",
+    "v8-compile-cache": "^1.1.0"
-    "v8-compile-cache": "^1.1.0",
-    "vue": "2.5.6",
-    "vue-loader": "^15.2.6",
-    "vue-template-compiler": "2.5.6",
-    "webpack": "^4.16.2",
-    "webpack-cli": "^3.1.0",
-    "webpack-dev-middleware": "^3.1.3",
-    "webpack-hot-middleware": "^2.22.3",
-    "zepto": "^1.2.0"
   },
   "scripts": {
     "start": "node app.js",
-    "lint": "eslint platform src openmct.js",
-    "lint:fix": "eslint platform src openmct.js --fix",
-    "build:prod": "NODE_ENV=production webpack",
-    "build:dev": "webpack",
-    "build:watch": "webpack --watch",
     "test": "karma start --single-run",
-    "test:watch": "karma start --no-single-run",
+    "jshint": "jshint platform example",
-    "verify": "concurrently 'npm:test' 'npm:lint'",
+    "watch": "karma start",
     "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
     "otherdoc": "node docs/gendocs.js --in docs/src --out dist/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",
     "docs": "npm run jsdoc ; npm run otherdoc",
-    "prepare": "npm run build:prod"
+    "prepare": "node ./node_modules/bower/bin/bower install && node ./node_modules/gulp/bin/gulp.js install"
   },
   "repository": {
     "type": "git",

platform/commonUI/about/bundle.js

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

platform/commonUI/browse/bundle.js

@@ -33,16 +33,16 @@ define([
     "./src/windowing/NewTabAction",
     "./src/windowing/FullscreenAction",
     "./src/windowing/WindowTitler",
-    "./res/templates/browse.html",
+    "text!./res/templates/browse.html",
-    "./res/templates/browse-object.html",
+    "text!./res/templates/browse-object.html",
-    "./res/templates/items/grid-item.html",
+    "text!./res/templates/items/grid-item.html",
-    "./res/templates/browse/object-header.html",
+    "text!./res/templates/browse/object-header.html",
-    "./res/templates/browse/object-header-frame.html",
+    "text!./res/templates/browse/object-header-frame.html",
-    "./res/templates/menu-arrow.html",
+    "text!./res/templates/menu-arrow.html",
-    "./res/templates/back-arrow.html",
+    "text!./res/templates/back-arrow.html",
-    "./res/templates/items/items.html",
+    "text!./res/templates/items/items.html",
-    "./res/templates/browse/object-properties.html",
+    "text!./res/templates/browse/object-properties.html",
-    "./res/templates/browse/inspector-region.html",
+    "text!./res/templates/browse/inspector-region.html",
     'legacyRegistry'
 ], function (
     BrowseController,
@@ -73,6 +73,15 @@ define([
     legacyRegistry.register("platform/commonUI/browse", {
         "extensions": {
             "routes": [
+                {
+                    "when": "/browse/:ids*?",
+                    "template": browseTemplate,
+                    "reloadOnSearch": false
+                },
+                {
+                    "when": "",
+                    "redirectTo": "/browse/"
+                }
             ],
             "constants": [
                 {
@@ -286,20 +295,6 @@ define([
                     ]
                 }
             ],
-            "templates": [
-                {
-                    key: "browseRoot",
-                    template: browseTemplate
-                },
-                {
-                    key: "browseObject",
-                    template: browseObjectTemplate
-                },
-                {
-                    key: "inspectorRegion",
-                    template: inspectorRegionTemplate
-                }
-            ],
             "licenses": [
                 {
                     "name": "screenfull.js",

platform/commonUI/browse/src/BrowseController.js

@@ -47,7 +47,6 @@ define(
             urlService,
             defaultPath
         ) {
-            window.browseScope = $scope;
             var initialPath = ($route.current.params.ids || defaultPath).split("/"),
                 currentIds;
 

platform/commonUI/browse/src/BrowseObjectController.js

@@ -31,6 +31,7 @@ define(
          * @constructor
          */
         function BrowseObjectController($scope, $location, $route) {
+            var navigatedObject;
             function setViewForDomainObject(domainObject) {
 
                 var locationViewKey = $location.search().view;
@@ -46,6 +47,7 @@ define(
                     ((domainObject && domainObject.useCapability('view')) || [])
                         .forEach(selectViewIfMatching);
                 }
+                navigatedObject = domainObject;
             }
 
             function updateQueryParam(viewKey) {

platform/commonUI/browse/test/PaneControllerSpec.js

@@ -27,6 +27,7 @@ define(
         describe("The PaneController", function () {
             var mockScope,
                 mockAgentService,
+                mockDomainObjects,
                 mockWindow,
                 controller,
                 mockLocation,
@@ -46,6 +47,17 @@ define(
 
             beforeEach(function () {
                 mockScope = jasmine.createSpyObj("$scope", ["$on"]);
+                mockDomainObjects = ['a', 'b'].map(function (id) {
+                    var mockDomainObject = jasmine.createSpyObj(
+                        'domainObject-' + id,
+                        ['getId', 'getModel', 'getCapability']
+                    );
+
+                    mockDomainObject.getId.and.returnValue(id);
+                    mockDomainObject.getModel.and.returnValue({});
+
+                    return mockDomainObject;
+                });
                 mockAgentService = jasmine.createSpyObj(
                     "agentService",
                     ["isMobile", "isPhone", "isTablet", "isPortrait", "isLandscape"]

platform/commonUI/browse/test/windowing/FullscreenActionSpec.js

@@ -47,7 +47,7 @@ define(
 
             it("toggles fullscreen mode when performed", function () {
                 action.perform();
-                expect(screenfull.toggle).toHaveBeenCalled();
+                expect(window.screenfull.toggle).toHaveBeenCalled();
             });
 
             it("provides displayable metadata", function () {

platform/commonUI/browse/test/windowing/WindowTitlerSpec.js

@@ -32,7 +32,7 @@ define(
                 mockRootScope,
                 mockDocument,
                 mockDomainObject,
-                titler; // eslint-disable-line
+                titler;
 
             beforeEach(function () {
                 mockNavigationService = jasmine.createSpyObj(

platform/commonUI/dialog/bundle.js

@@ -23,13 +23,13 @@
 define([
     "./src/DialogService",
     "./src/OverlayService",
-    "./res/templates/overlay-dialog.html",
+    "text!./res/templates/overlay-dialog.html",
-    "./res/templates/overlay-options.html",
+    "text!./res/templates/overlay-options.html",
-    "./res/templates/dialog.html",
+    "text!./res/templates/dialog.html",
-    "./res/templates/overlay-blocking-message.html",
+    "text!./res/templates/overlay-blocking-message.html",
-    "./res/templates/message.html",
+    "text!./res/templates/message.html",
-    "./res/templates/overlay-message-list.html",
+    "text!./res/templates/overlay-message-list.html",
-    "./res/templates/overlay.html",
+    "text!./res/templates/overlay.html",
     'legacyRegistry'
 ], function (
     DialogService,

platform/commonUI/edit/bundle.js

@@ -49,14 +49,14 @@ define([
     "./src/creation/CreateActionProvider",
     "./src/creation/AddActionProvider",
     "./src/creation/CreationService",
-    "./res/templates/create/locator.html",
+    "text!./res/templates/create/locator.html",
-    "./res/templates/create/create-button.html",
+    "text!./res/templates/create/create-button.html",
-    "./res/templates/create/create-menu.html",
+    "text!./res/templates/create/create-menu.html",
-    "./res/templates/library.html",
+    "text!./res/templates/library.html",
-    "./res/templates/edit-object.html",
+    "text!./res/templates/edit-object.html",
-    "./res/templates/edit-action-buttons.html",
+    "text!./res/templates/edit-action-buttons.html",
-    "./res/templates/elements.html",
+    "text!./res/templates/elements.html",
-    "./res/templates/topbar-edit.html",
+    "text!./res/templates/topbar-edit.html",
     'legacyRegistry'
 ], function (
     EditActionController,
@@ -188,7 +188,6 @@ define([
                     "name": "Remove",
                     "description": "Remove this object from its containing object.",
                     "depends": [
-                        "dialogService",
                         "navigationService"
                     ]
                 },

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

@@ -23,11 +23,9 @@
 /**
  * Module defining RemoveAction. Created by vwoeltje on 11/17/14.
  */
-define([
+define(
-    './RemoveDialog'
+    [],
-], function (
+    function () {
-    RemoveDialog
-) {
 
         /**
          * Construct an action which will remove the provided object manifestation.
@@ -35,27 +33,25 @@ define([
          * is looked up via the "context" capability (so this will be the
          * immediate ancestor by which this specific object was reached.)
          *
-     * @param {DialogService} dialogService a service which will show the dialog
+         * @param {DomainObject} object the object to be removed
-     * @param {NavigationService} navigationService a service that maintains the current navigation state
          * @param {ActionContext} context the context in which this action is performed
          * @memberof platform/commonUI/edit
          * @constructor
          * @implements {Action}
          */
-    function RemoveAction(dialogService, navigationService, context) {
+        function RemoveAction(navigationService, context) {
             this.domainObject = (context || {}).domainObject;
-        this.dialogService = dialogService;
             this.navigationService = navigationService;
         }
 
         /**
          * Perform this action.
+         * @return {Promise} a promise which will be
+         *         fulfilled when the action has completed.
          */
         RemoveAction.prototype.perform = function () {
-        var dialog,
+            var navigationService = this.navigationService,
-            dialogService = this.dialogService,
+                domainObject = this.domainObject;
-            domainObject = this.domainObject,
-            navigationService = this.navigationService;
             /*
              * Check whether an object ID matches the ID of the object being
              * removed (used to filter a parent's composition to handle the
@@ -115,12 +111,7 @@ define([
                 return parent.useCapability('mutation', doMutate);
             }
 
-        /*
+            return removeFromContext(domainObject);
-         * Pass in the function to remove the domain object so it can be
-         * associated with an 'OK' button press
-         */
-        dialog = new RemoveDialog(dialogService, domainObject, removeFromContext);
-        dialog.show();
         };
 
         // Object needs to have a parent for Remove to be applicable
@@ -138,4 +129,5 @@ define([
         };
 
         return RemoveAction;
-});
+    }
+);

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

@@ -1,77 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define([], function () {
-
-    /**
-     * @callback removeCallback
-     * @param {DomainObject} domainObject the domain object to be removed
-     */
-
-    /**
-     * Construct a new Remove dialog.
-     *
-     * @param {DialogService} dialogService the service that shows the dialog
-     * @param {DomainObject} domainObject the domain object to be removed
-     * @param {removeCallback} removeCallback callback that handles removal of the domain object
-     * @memberof platform/commonUI/edit
-     * @constructor
-     */
-    function RemoveDialog(dialogService, domainObject, removeCallback) {
-        this.dialogService = dialogService;
-        this.domainObject = domainObject;
-        this.removeCallback = removeCallback;
-    }
-
-    /**
-     * Display a dialog to confirm the removal of a domain object.
-     */
-    RemoveDialog.prototype.show = function () {
-        var dialog,
-            domainObject = this.domainObject,
-            removeCallback = this.removeCallback,
-            model = {
-                title: 'Remove ' + domainObject.getModel().name,
-                actionText: 'Warning! This action will permanently remove this object. Are you sure you want to continue?',
-                severity: 'alert',
-                primaryOption: {
-                    label: 'OK',
-                    callback: function () {
-                        removeCallback(domainObject);
-                        dialog.dismiss();
-                    }
-                },
-                options: [
-                    {
-                        label: 'Cancel',
-                        callback: function () {
-                            dialog.dismiss();
-                        }
-                    }
-                ]
-            };
-
-        dialog = this.dialogService.showBlockingMessage(model);
-    };
-
-    return RemoveDialog;
-});

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

@@ -55,7 +55,7 @@ define(
 
             // A view is editable unless explicitly flagged as not
             (views || []).forEach(function (view) {
-                if (isEditable(view) ||
+                if (view.editable === true ||
                     (view.key === 'plot' && type.getKey() === 'telemetry.panel') ||
                     (view.key === 'table' && type.getKey() === 'table') ||
                     (view.key === 'rt-table' && type.getKey() === 'rttable')
@@ -64,14 +64,6 @@ define(
                 }
             });
 
-            function isEditable(view) {
-                if (typeof view.editable === Function) {
-                    return view.editable(domainObject.useCapability('adapter'));
-                } else {
-                    return view.editable === true;
-                }
-            }
-
             return count;
         };
 

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

@@ -55,16 +55,16 @@ define(
                 navigatedObject = this.navigationService.getNavigation(),
                 actionMetadata = action.getMetadata ? action.getMetadata() : {};
 
-            // if (navigatedObject.hasCapability("editor") && navigatedObject.getCapability("editor").isEditContextRoot()) {
+            if (navigatedObject.hasCapability("editor") && navigatedObject.getCapability("editor").isEditContextRoot()) {
                 if (selectedObject.hasCapability("editor") && selectedObject.getCapability("editor").inEditContext()) {
                     return this.editModeBlacklist.indexOf(actionMetadata.key) === -1;
                 } else {
                     //Target is in the context menu
                     return this.nonEditContextBlacklist.indexOf(actionMetadata.key) === -1;
                 }
-            // } else {
+            } else {
-            //     return true;
+                return true;
-            // }
+            }
         };
 
         return EditContextualActionPolicy;

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

@@ -25,7 +25,8 @@ define(
     function (EditAndComposeAction) {
 
         describe("The Link action", function () {
-            var mockDomainObject,
+            var mockQ,
+                mockDomainObject,
                 mockParent,
                 mockContext,
                 mockComposition,
@@ -46,10 +47,13 @@ define(
             }
 
             beforeEach(function () {
+
+
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
                     ["getId", "getCapability"]
                 );
+                mockQ = { when: mockPromise };
                 mockParent = {
                     getModel: function () {
                         return model;

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

@@ -25,37 +25,50 @@ define(
     function (RemoveAction) {
 
         describe("The Remove action", function () {
-            var action,
+            var mockQ,
-                actionContext,
-                capabilities,
-                mockContext,
-                mockDialogService,
-                mockDomainObject,
-                mockMutation,
                 mockNavigationService,
+                mockDomainObject,
                 mockParent,
+                mockChildObject,
+                mockGrandchildObject,
+                mockRootObject,
+                mockContext,
+                mockChildContext,
+                mockGrandchildContext,
+                mockRootContext,
+                mockMutation,
                 mockType,
-                model;
+                actionContext,
+                model,
+                capabilities,
+                action;
+
+            function mockPromise(value) {
+                return {
+                    then: function (callback) {
+                        return mockPromise(callback(value));
+                    }
+                };
+            }
 
             beforeEach(function () {
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    ["getId", "getCapability", "getModel"]
+                    ["getId", "getCapability"]
                 );
-
+                mockChildObject = jasmine.createSpyObj(
-                mockMutation = jasmine.createSpyObj("mutation", ["invoke"]);
+                    "domainObject",
-                mockType = jasmine.createSpyObj("type", ["hasFeature"]);
+                    ["getId", "getCapability"]
-                mockType.hasFeature.and.returnValue(true);
+                );
-
+                mockGrandchildObject = jasmine.createSpyObj(
-                capabilities = {
+                    "domainObject",
-                    mutation: mockMutation,
+                    ["getId", "getCapability"]
-                    type: mockType
+                );
-                };
+                mockRootObject = jasmine.createSpyObj(
-
+                    "domainObject",
-                model = {
+                    ["getId", "getCapability"]
-                    composition: ["a", "test", "b"]
+                );
-                };
+                mockQ = { when: mockPromise };
-
                 mockParent = {
                     getModel: function () {
                         return model;
@@ -67,12 +80,12 @@ define(
                         return capabilities[k].invoke(v);
                     }
                 };
-
+                mockContext = jasmine.createSpyObj("context", ["getParent"]);
-                mockDialogService = jasmine.createSpyObj(
+                mockChildContext = jasmine.createSpyObj("context", ["getParent"]);
-                    "dialogService",
+                mockGrandchildContext = jasmine.createSpyObj("context", ["getParent"]);
-                    ["showBlockingMessage"]
+                mockRootContext = jasmine.createSpyObj("context", ["getParent"]);
-                );
+                mockMutation = jasmine.createSpyObj("mutation", ["invoke"]);
-
+                mockType = jasmine.createSpyObj("type", ["hasFeature"]);
                 mockNavigationService = jasmine.createSpyObj(
                     "navigationService",
                     [
@@ -84,19 +97,23 @@ define(
                 );
                 mockNavigationService.getNavigation.and.returnValue(mockDomainObject);
 
-                mockContext = jasmine.createSpyObj("context", ["getParent"]);
-                mockContext.getParent.and.returnValue(mockParent);
 
                 mockDomainObject.getId.and.returnValue("test");
                 mockDomainObject.getCapability.and.returnValue(mockContext);
-                mockDomainObject.getModel.and.returnValue({name: 'test object'});
-
                 mockContext.getParent.and.returnValue(mockParent);
                 mockType.hasFeature.and.returnValue(true);
 
+                capabilities = {
+                    mutation: mockMutation,
+                    type: mockType
+                };
+                model = {
+                    composition: ["a", "test", "b"]
+                };
+
                 actionContext = { domainObject: mockDomainObject };
 
-                action = new RemoveAction(mockDialogService, mockNavigationService, actionContext);
+                action = new RemoveAction(mockNavigationService, actionContext);
             });
 
             it("only applies to objects with parents", function () {
@@ -110,73 +127,15 @@ define(
                 expect(mockType.hasFeature).toHaveBeenCalledWith('creation');
             });
 
-            it("shows a blocking message dialog", function () {
-                mockParent = jasmine.createSpyObj(
-                    "parent",
-                    ["getModel", "getCapability", "useCapability"]
-                );
-
-                action.perform();
-
-                expect(mockDialogService.showBlockingMessage).toHaveBeenCalled();
-
-                // Also check that no mutation happens at this point
-                expect(mockParent.useCapability).not.toHaveBeenCalledWith("mutation", jasmine.any(Function));
-            });
-
-            describe("after the remove callback is triggered", function () {
-                var mockChildContext,
-                    mockChildObject,
-                    mockDialogHandle,
-                    mockGrandchildContext,
-                    mockGrandchildObject,
-                    mockRootContext,
-                    mockRootObject;
-
-                beforeEach(function () {
-                    mockChildObject = jasmine.createSpyObj(
-                        "domainObject",
-                        ["getId", "getCapability"]
-                    );
-
-                    mockDialogHandle = jasmine.createSpyObj(
-                        "dialogHandle",
-                        ["dismiss"]
-                    );
-
-                    mockGrandchildObject = jasmine.createSpyObj(
-                        "domainObject",
-                        ["getId", "getCapability"]
-                    );
-
-                    mockRootObject = jasmine.createSpyObj(
-                        "domainObject",
-                        ["getId", "getCapability"]
-                    );
-
-                    mockChildContext = jasmine.createSpyObj("context", ["getParent"]);
-                    mockGrandchildContext = jasmine.createSpyObj("context", ["getParent"]);
-                    mockRootContext = jasmine.createSpyObj("context", ["getParent"]);
-
-                    mockDialogService.showBlockingMessage.and.returnValue(mockDialogHandle);
-                });
-
             it("mutates the parent when performed", function () {
                 action.perform();
-                    mockDialogService.showBlockingMessage.calls.mostRecent().args[0]
-                        .primaryOption.callback();
-
                 expect(mockMutation.invoke)
                     .toHaveBeenCalledWith(jasmine.any(Function));
             });
 
             it("changes composition from its mutation function", function () {
                 var mutator, result;
-
                 action.perform();
-                    mockDialogService.showBlockingMessage.calls.mostRecent().args[0]
-                        .primaryOption.callback();
-
                 mutator = mockMutation.invoke.calls.mostRecent().args[0];
                 result = mutator(model);
 
@@ -212,8 +171,6 @@ define(
                 mockType.hasFeature.and.returnValue(true);
 
                 action.perform();
-                    mockDialogService.showBlockingMessage.calls.mostRecent().args[0]
-                        .primaryOption.callback();
 
                 // Expects navigation to parent of domainObject (removed object)
                 expect(mockNavigationService.setNavigation).toHaveBeenCalledWith(mockParent);
@@ -242,14 +199,11 @@ define(
                 mockType.hasFeature.and.returnValue(true);
 
                 action.perform();
-                    mockDialogService.showBlockingMessage.calls.mostRecent().args[0]
-                        .primaryOption.callback();
 
                 // Expects no navigation to occur
                 expect(mockNavigationService.setNavigation).not.toHaveBeenCalled();
             });
 
         });
-        });
     }
 );

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

@@ -34,6 +34,7 @@ define(
                 mockDomainObject,
                 capabilities = {},
                 mockEditAction,
+                mockSaveAction,
                 action;
 
             function mockPromise(value) {
@@ -82,6 +83,12 @@ define(
                 mockDomainObject.getCapability.and.callFake(function (name) {
                     return capabilities[name];
                 });
+                mockSaveAction = jasmine.createSpyObj(
+                    "saveAction",
+                    [
+                        "perform"
+                    ]
+                );
 
                 capabilities.action = jasmine.createSpyObj(
                     "actionCapability",

platform/commonUI/edit/test/policies/EditActionPolicySpec.js

@@ -27,6 +27,7 @@ define(
         describe("The Edit action policy", function () {
             var editableView,
                 nonEditableView,
+                undefinedView,
                 testViews,
                 testContext,
                 mockDomainObject,
@@ -66,6 +67,7 @@ define(
 
                 editableView = { editable: true };
                 nonEditableView = { editable: false };
+                undefinedView = { someKey: "some value" };
                 plotView = { key: "plot", editable: false };
                 testViews = [];
 

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

@@ -30,6 +30,12 @@ define(
                 mockObjects,
                 mockDomainObject,
                 testStructure,
+                testAB,
+                testABC,
+                testABC2,
+                testABCXYZ,
+                testABCYZ,
+                testM,
                 toolbar;
 
             beforeEach(function () {
@@ -56,6 +62,13 @@ define(
                         { name: "M", method: "m", domainObject: mockDomainObject }
                 ];
 
+                testAB = { a: 0, b: 1 };
+                testABC = { a: 0, b: 1, c: 2 };
+                testABC2 = { a: 4, b: 1, c: 2 }; // For inconsistent-state checking
+                testABCXYZ = { a: 0, b: 1, c: 2, x: 'X!', y: 'Y!', z: 'Z!' };
+                testABCYZ = { a: 0, b: 1, c: 2, y: 'Y!', z: 'Z!' };
+                testM = { m: jasmine.createSpy("method") };
+
                 toolbar = new EditToolbar(mockScope, mockOpenMCT, testStructure);
             });
 

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

@@ -43,12 +43,13 @@ define(["../../src/services/NestedTransaction"], function (NestedTransaction) {
 
         describe("when callbacks are added", function () {
             var mockCommit,
-                mockCancel;
+                mockCancel,
+                remove;
 
             beforeEach(function () {
                 mockCommit = jasmine.createSpy('commit');
                 mockCancel = jasmine.createSpy('cancel');
-                nestedTransaction.add(mockCommit, mockCancel);
+                remove = nestedTransaction.add(mockCommit, mockCancel);
             });
 
             it("does not interact with its parent transaction", function () {

platform/commonUI/general/bundle.js

@@ -34,6 +34,7 @@ define([
     "./src/controllers/ContextMenuController",
     "./src/controllers/ClickAwayController",
     "./src/controllers/ViewSwitcherController",
+    "./src/controllers/BottomBarController",
     "./src/controllers/GetterSetterController",
     "./src/controllers/SelectorController",
     "./src/controllers/ObjectInspectorController",
@@ -48,30 +49,29 @@ define([
     "./src/directives/MCTSplitPane",
     "./src/directives/MCTSplitter",
     "./src/directives/MCTTree",
-    "./src/directives/MCTIndicators",
     "./src/directives/MCTPreview",
     "./src/actions/MCTPreviewAction",
     "./src/filters/ReverseFilter",
-    "./res/templates/bottombar.html",
+    "text!./res/templates/bottombar.html",
-    "./res/templates/controls/action-button.html",
+    "text!./res/templates/controls/action-button.html",
-    "./res/templates/controls/input-filter.html",
+    "text!./res/templates/controls/input-filter.html",
-    "./res/templates/angular-indicator.html",
+    "text!./res/templates/indicator.html",
-    "./res/templates/message-banner.html",
+    "text!./res/templates/message-banner.html",
-    "./res/templates/progress-bar.html",
+    "text!./res/templates/progress-bar.html",
-    "./res/templates/controls/time-controller.html",
+    "text!./res/templates/controls/time-controller.html",
-    "./res/templates/containers/accordion.html",
+    "text!./res/templates/containers/accordion.html",
-    "./res/templates/subtree.html",
+    "text!./res/templates/subtree.html",
-    "./res/templates/tree.html",
+    "text!./res/templates/tree.html",
-    "./res/templates/tree-node.html",
+    "text!./res/templates/tree-node.html",
-    "./res/templates/label.html",
+    "text!./res/templates/label.html",
-    "./res/templates/controls/action-group.html",
+    "text!./res/templates/controls/action-group.html",
-    "./res/templates/menu/context-menu.html",
+    "text!./res/templates/menu/context-menu.html",
-    "./res/templates/controls/switcher.html",
+    "text!./res/templates/controls/switcher.html",
-    "./res/templates/object-inspector.html",
+    "text!./res/templates/object-inspector.html",
-    "./res/templates/controls/selector.html",
+    "text!./res/templates/controls/selector.html",
-    "./res/templates/controls/datetime-picker.html",
+    "text!./res/templates/controls/datetime-picker.html",
-    "./res/templates/controls/datetime-field.html",
+    "text!./res/templates/controls/datetime-field.html",
-    "./res/templates/preview.html",
+    "text!./res/templates/preview.html",
     'legacyRegistry'
 ], function (
     UrlService,
@@ -87,6 +87,7 @@ define([
     ContextMenuController,
     ClickAwayController,
     ViewSwitcherController,
+    BottomBarController,
     GetterSetterController,
     SelectorController,
     ObjectInspectorController,
@@ -101,7 +102,6 @@ define([
     MCTSplitPane,
     MCTSplitter,
     MCTTree,
-    MCTIndicators,
     MCTPreview,
     MCTPreviewAction,
     ReverseFilter,
@@ -173,6 +173,12 @@ define([
                     "key": "reverse"
                 }
             ],
+            "stylesheets": [
+                {
+                    "stylesheetUrl": "css/normalize.min.css",
+                    "priority": "mandatory"
+                }
+            ],
             "templates": [
                 {
                     "key": "bottombar",
@@ -275,6 +281,13 @@ define([
                         "$timeout"
                     ]
                 },
+                {
+                    "key": "BottomBarController",
+                    "implementation": BottomBarController,
+                    "depends": [
+                        "indicators[]"
+                    ]
+                },
                 {
                     "key": "GetterSetterController",
                     "implementation": GetterSetterController,
@@ -390,11 +403,6 @@ define([
                     "implementation": MCTTree,
                     "depends": ['gestureService', 'openmct']
                 },
-                {
-                    "key": "mctIndicators",
-                    "implementation": MCTIndicators,
-                    "depends": ['openmct']
-                },
                 {
                     "key": "mctPreview",
                     "implementation": MCTPreview,

platform/commonUI/general/res/css/reset.css

@@ -0,0 +1,48 @@
+/* http://meyerweb.com/eric/tools/css/reset/
+   v2.0 | 20110126
+   License: none (public domain)
+*/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	font-size: 100%;
+	font: inherit;
+	vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+	display: block;
+}
+body {
+	line-height: 1;
+}
+ol, ul {
+	list-style: none;
+}
+blockquote, q {
+	quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}

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

@@ -136,8 +136,7 @@ $btnFrameH: 18px;
 
 /************************** PATHS */
 // Paths need to be relative to /platform/commonUI/theme/<theme-name>/css/ directory
-$dirCommonRes: '../';
+$dirCommonRes: '../../../../general/res/';
-$dirFonts: $dirCommonRes + 'fonts/';
 $dirImgs: $dirCommonRes + 'images/';
 
 /************************** TIMINGS */