WIP - Adding telemetry test

* ISSUE-2472: disable selection in layouts during preview

.circleci/config.yml

@@ -11,24 +11,20 @@ jobs:
             name: Update npm
             command: 'sudo npm install -g npm@latest'
         - restore_cache:
-            key: dependency-cache-{{ checksum "package.json" }}-{{ checksum "bower.json" }}
+            key: dependency-cache-{{ checksum "package.json" }}
         - run:
             name: Installing dependencies (npm install)
             command: npm install
         - save_cache:
-            key: dependency-cache-{{ checksum "package.json" }}-{{ checksum "bower.json" }}
+            key: dependency-cache-{{ checksum "package.json" }}
             paths:
               - node_modules
-              - bower_components
         - run:
             name: npm run test
             command: npm run test
         - run:
             name: npm run lint
             command: npm run lint
-        - run:
-            name: npm run checkstyle
-            command: npm run checkstyle
         - store_artifacts:
             path: dist
             prefix: dist

.eslintrc.js

@@ -0,0 +1,79 @@
+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

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

.jshintrc

@@ -1,26 +0,0 @@
-{
-    "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"
-}

README.md

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

app.js

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

@@ -1,27 +0,0 @@
-{
-  "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"
-  }
-}

copyright-notice.html

@@ -18,9 +18,4 @@
  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.
--->
-<div
-	class="l-fixed-position-box"
-	ng-style="{ background: ngModel.fill(), border: '1px ' + ngModel.stroke() + ' solid' }"
-	>
-</div>
+-->

copyright-notice.js

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

example/builtins/README.md

@@ -1,8 +0,0 @@
-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

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

example/builtins/res/templates/example.html

@@ -1,24 +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.
--->
-<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

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

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

example/composite/bundle.js

@@ -1,82 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*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/SomeDecorator.js

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

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

example/composite/src/SomeOtherExample.js

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

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

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

example/eventGenerator/bundle.js

@@ -22,59 +22,60 @@
 /*global define*/
 
 define([
-    "./src/EventTelemetryProvider",
-    'legacyRegistry'
+    "./src/EventTelemetryProvider"
 ], function (
-    EventTelemetryProvider,
-    legacyRegistry
+    EventTelemetryProvider
 ) {
     "use strict";
 
-    legacyRegistry.register("example/eventGenerator", {
-        "name": "Event Message Generator",
-        "description": "For development use. Creates sample event message data that mimics a live data stream.",
-        "extensions": {
-            "components": [
-                {
-                    "implementation": EventTelemetryProvider,
-                    "type": "provider",
-                    "provides": "telemetryService",
-                    "depends": [
-                        "$q",
-                        "$timeout"
-                    ]
-                }
-            ],
-            "types": [
-                {
-                    "key": "eventGenerator",
-                    "name": "Event Message Generator",
-                    "cssClass": "icon-folder-new",
-                    "description": "For development use. Creates sample event message data that mimics a live data stream.",
-                    "priority": 10,
-                    "features": "creation",
-                    "model": {
-                        "telemetry": {}
-                    },
-                    "telemetry": {
-                        "source": "eventGenerator",
-                        "domains": [
-                            {
-                                "key": "utc",
-                                "name": "Timestamp",
-                                "format": "utc"
-                            }
-                        ],
-                        "ranges": [
-                            {
-                                "key": "message",
-                                "name": "Message",
-                                "format": "string"
-                            }
+    return {
+        name:"example/eventGenerator",
+        definition: {
+            "name": "Event Message Generator",
+            "description": "For development use. Creates sample event message data that mimics a live data stream.",
+            "extensions": {
+                "components": [
+                    {
+                        "implementation": EventTelemetryProvider,
+                        "type": "provider",
+                        "provides": "telemetryService",
+                        "depends": [
+                            "$q",
+                            "$timeout"
                         ]
                     }
-                }
-            ]
+                ],
+                "types": [
+                    {
+                        "key": "eventGenerator",
+                        "name": "Event Message Generator",
+                        "cssClass": "icon-generator-events",
+                        "description": "For development use. Creates sample event message data that mimics a live data stream.",
+                        "priority": 10,
+                        "features": "creation",
+                        "model": {
+                            "telemetry": {}
+                        },
+                        "telemetry": {
+                            "source": "eventGenerator",
+                            "domains": [
+                                {
+                                    "key": "utc",
+                                    "name": "Timestamp",
+                                    "format": "utc"
+                                }
+                            ],
+                            "ranges": [
+                                {
+                                    "key": "message",
+                                    "name": "Message",
+                                    "format": "string"
+                                }
+                            ]
+                        }
+                    }
+                ]
+            }
         }
-    });
+    };
 });

example/eventGenerator/src/EventTelemetry.js

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

example/eventGenerator/src/EventTelemetryProvider.js

@@ -34,11 +34,9 @@ define(
          * @constructor
          */
         function EventTelemetryProvider($q, $timeout) {
-            var
-	            subscriptions = [],
-	            genInterval = 1000,
-                generating = false,
-                id = Math.random() * 100000;
+            var subscriptions = [],
+                genInterval = 1000,
+                generating = false;
 
             //
             function matchesSource(request) {
@@ -47,7 +45,6 @@ define(
 
             // Used internally; this will be repacked by doPackage
             function generateData(request) {
-	            //console.log("generateData " + (Date.now() - startTime).toString());
                 return {
                     key: request.key,
                     telemetry: new EventTelemetry(request, genInterval)

example/export/ExportTelemetryAsCSVAction.js

@@ -58,15 +58,15 @@ define([], function () {
                 row,
                 i;
 
-            function copyDomainsToRow(row, index) {
+            function copyDomainsToRow(telemetryRow, index) {
                 domains.forEach(function (domain) {
-                    row[domain.name] = series.getDomainValue(index, domain.key);
+                    telemetryRow[domain.name] = series.getDomainValue(index, domain.key);
                 });
             }
 
-            function copyRangesToRow(row, index) {
+            function copyRangesToRow(telemetryRow, index) {
                 ranges.forEach(function (range) {
-                    row[range.name] = series.getRangeValue(index, range.key);
+                    telemetryRow[range.name] = series.getRangeValue(index, range.key);
                 });
             }
 

example/export/bundle.js

@@ -22,24 +22,26 @@
 /*global define*/
 
 define([
-    'legacyRegistry',
     './ExportTelemetryAsCSVAction'
-], function (legacyRegistry, ExportTelemetryAsCSVAction) {
+], function (ExportTelemetryAsCSVAction) {
     "use strict";
 
-    legacyRegistry.register("example/export", {
-        "name": "Example of using CSV Export",
-        "extensions": {
-            "actions": [
-                {
-                    "key": "example.export",
-                    "name": "Export Telemetry as CSV",
-                    "implementation": ExportTelemetryAsCSVAction,
-                    "category": "contextual",
-                    "cssClass": "icon-download",
-                    "depends": [ "exportService" ]
-                }
-            ]
+    return {
+        name:"example/export",
+        definition: {
+            "name": "Example of using CSV Export",
+            "extensions": {
+                "actions": [
+                    {
+                        "key": "example.export",
+                        "name": "Export Telemetry as CSV",
+                        "implementation": ExportTelemetryAsCSVAction,
+                        "category": "contextual",
+                        "cssClass": "icon-download",
+                        "depends": ["exportService"]
+                    }
+                ]
+            }
         }
-    });
+    };
 });

example/extensions/src/SomeExample.js

@@ -1,52 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,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/forms/bundle.js

@@ -22,32 +22,33 @@
 /*global define*/
 
 define([
-    "./src/ExampleFormController",
-    'legacyRegistry'
+    "./src/ExampleFormController"
 ], function (
-    ExampleFormController,
-    legacyRegistry
+    ExampleFormController
 ) {
     "use strict";
 
-    legacyRegistry.register("example/forms", {
-        "name": "Declarative Forms example",
-        "sources": "src",
-        "extensions": {
-            "controllers": [
-                {
-                    "key": "ExampleFormController",
-                    "implementation": ExampleFormController,
-                    "depends": [
-                        "$scope"
-                    ]
-                }
-            ],
-            "routes": [
-                {
-                    "templateUrl": "templates/exampleForm.html"
-                }
-            ]
+    return {
+        name:"example/forms",
+        definition: {
+            "name": "Declarative Forms example",
+            "sources": "src",
+            "extensions": {
+                "controllers": [
+                    {
+                        "key": "ExampleFormController",
+                        "implementation": ExampleFormController,
+                        "depends": [
+                            "$scope"
+                        ]
+                    }
+                ],
+                "routes": [
+                    {
+                        "templateUrl": "templates/exampleForm.html"
+                    }
+                ]
+            }
         }
-    });
+    };
 });

example/generator/GeneratorMetadataProvider.js

@@ -99,10 +99,10 @@ define([
 
     GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) {
         return _.extend(
-                {},
-                domainObject.telemetry,
-                METADATA_BY_TYPE[domainObject.type]
-            );
+            {},
+            domainObject.telemetry,
+            METADATA_BY_TYPE[domainObject.type]
+        );
     };
 
     return GeneratorMetadataProvider;

example/generator/GeneratorProvider.js

@@ -52,7 +52,7 @@ define([
             'period',
             'offset',
             'dataRateInHz',
-            'phase',
+            'phase'
         ];
 
         request = request || {};

example/generator/SinewaveLimitProvider.js

@@ -27,29 +27,35 @@ define([
 
 ) {
 
-    var RED = 0.9,
-        YELLOW = 0.5,
+    var RED = {
+            sin: 0.9,
+            cos: 0.9
+        },
+        YELLOW = {
+            sin: 0.5,
+            cos: 0.5
+        },
         LIMITS = {
             rh: {
-                cssClass: "s-limit-upr s-limit-red",
+                cssClass: "is-limit--upr is-limit--red",
                 low: RED,
                 high: Number.POSITIVE_INFINITY,
                 name: "Red High"
             },
             rl: {
-                cssClass: "s-limit-lwr s-limit-red",
+                cssClass: "is-limit--lwr is-limit--red",
                 high: -RED,
                 low: Number.NEGATIVE_INFINITY,
                 name: "Red Low"
             },
             yh: {
-                cssClass: "s-limit-upr s-limit-yellow",
+                cssClass: "is-limit--upr is-limit--yellow",
                 low: YELLOW,
                 high: RED,
                 name: "Yellow High"
             },
             yl: {
-                cssClass: "s-limit-lwr s-limit-yellow",
+                cssClass: "is-limit--lwr is-limit--yellow",
                 low: -RED,
                 high: -YELLOW,
                 name: "Yellow Low"
@@ -67,17 +73,18 @@ define([
     SinewaveLimitProvider.prototype.getLimitEvaluator = function (domainObject) {
         return {
             evaluate: function (datum, valueMetadata) {
-                var range = valueMetadata ? valueMetadata.key : 'sin'
-                if (datum[range] > RED) {
+                var range = valueMetadata && valueMetadata.key;
+
+                if (datum[range] > RED[range]) {
                     return LIMITS.rh;
                 }
-                if (datum[range] < -RED) {
+                if (datum[range] < -RED[range]) {
                     return LIMITS.rl;
                 }
-                if (datum[range] > YELLOW) {
+                if (datum[range] > YELLOW[range]) {
                     return LIMITS.yh;
                 }
-                if (datum[range] < -YELLOW) {
+                if (datum[range] < -YELLOW[range]) {
                     return LIMITS.yl;
                 }
             }

example/generator/WorkerInterface.js

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 define([
-    'text!./generatorWorker.js',
+    'raw-loader!./generatorWorker.js',
     'uuid'
 ], function (
     workerText,
@@ -89,7 +89,7 @@ define([
     WorkerInterface.prototype.subscribe = function (request, cb) {
         function callback(message) {
             cb(message.data);
-        };
+        }
 
         var messageId = this.dispatch('subscribe', request, callback);
 

example/generator/generatorWorker.js

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

example/generator/plugin.js

@@ -33,25 +33,24 @@ define([
     GeneratorMetadataProvider
 ) {
 
-    return function(openmct){
+    return function (openmct) {
 
         openmct.types.addType("example.state-generator", {
             name: "State Generator",
             description: "For development use.  Generates test enumerated telemetry by cycling through a given set of states",
-            cssClass: "icon-telemetry",
+            cssClass: "icon-generator-telemetry",
             creatable: true,
             form: [
                 {
                     name: "State Duration (seconds)",
-                    control: "textfield",
+                    control: "numberfield",
                     cssClass: "l-input-sm l-numeric",
                     key: "duration",
                     required: true,
                     property: [
                         "telemetry",
                         "duration"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
+                    ]
                 }
             ],
             initialize: function (object) {
@@ -66,7 +65,7 @@ define([
         openmct.types.addType("generator", {
             name: "Sine Wave Generator",
             description: "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
-            cssClass: "icon-telemetry",
+            cssClass: "icon-generator-telemetry",
             creatable: true,
             form: [
                 {

example/identity/bundle.js

@@ -22,27 +22,28 @@
 /*global define*/
 
 define([
-    "./src/ExampleIdentityService",
-    'legacyRegistry'
+    "./src/ExampleIdentityService"
 ], function (
-    ExampleIdentityService,
-    legacyRegistry
+    ExampleIdentityService
 ) {
     "use strict";
 
-    legacyRegistry.register("example/identity", {
-        "extensions": {
-            "components": [
-                {
-                    "implementation": ExampleIdentityService,
-                    "provides": "identityService",
-                    "type": "provider",
-                    "depends": [
-                        "dialogService",
-                        "$q"
-                    ]
-                }
-            ]
+    return {
+        name:"example/identity",
+        definition: {
+            "extensions": {
+                "components": [
+                    {
+                        "implementation": ExampleIdentityService,
+                        "provides": "identityService",
+                        "type": "provider",
+                        "depends": [
+                            "dialogService",
+                            "$q"
+                        ]
+                    }
+                ]
+            }
         }
-    });
+    };
 });

example/imagery/plugin.js

@@ -22,31 +22,31 @@
 
 define([
 
-], function(
+], function (
 
 ) {
     function ImageryPlugin() {
 
         var IMAGE_SAMPLES = [
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18731.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18732.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18733.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18734.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18735.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18736.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18737.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18738.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18739.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18740.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18741.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18742.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18743.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18744.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18745.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18746.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18747.jpg",
-                "https://www.hq.nasa.gov/alsj/a16/AS16-117-18748.jpg"
-            ];
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18731.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18732.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18733.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18734.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18735.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18736.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18737.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18738.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18739.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18740.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18741.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18742.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18743.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18744.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18745.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18746.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18747.jpg",
+            "https://www.hq.nasa.gov/alsj/a16/AS16-117-18748.jpg"
+        ];
 
         function pointForTimestamp(timestamp, name) {
             return {
@@ -65,7 +65,7 @@ define([
                     callback(pointForTimestamp(Date.now(), domainObject.name));
                 }, 5000);
 
-                return function (interval) {
+                return function () {
                     clearInterval(interval);
                 };
             }

example/mobile/bundle.js

@@ -21,25 +21,22 @@
  *****************************************************************************/
 /*global define*/
 
-define([
-    
-    'legacyRegistry'
-], function (
-    
-    legacyRegistry
-) {
+define([], function () {
     "use strict";
 
-    legacyRegistry.register("example/mobile", {
-        "name": "Mobile",
-        "description": "Allows elements with pertinence to mobile usage and development",
-        "extensions": {
-            "stylesheets": [
-                {
-                    "stylesheetUrl": "css/mobile-example.css",
-                    "priority": "mandatory"
-                }
-            ]
+    return {
+        name:"example/mobile",
+        definition: {
+            "name": "Mobile",
+            "description": "Allows elements with pertinence to mobile usage and development",
+            "extensions": {
+                "stylesheets": [
+                    {
+                        "stylesheetUrl": "css/mobile-example.css",
+                        "priority": "mandatory"
+                    }
+                ]
+            }
         }
-    });
+    };
 });

example/msl/bundle.js

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

example/msl/src/MSLDataDictionary.js

@@ -76,4 +76,4 @@ define(
             ]
         };
     }
-);
+);

example/msl/src/RemsTelemetryModelProvider.js

@@ -22,7 +22,7 @@
 /*global define*/
 
 define(
-    function (){
+    function () {
         "use strict";
 
         var PREFIX = "msl_tlm:",
@@ -32,20 +32,20 @@ define(
                 string: "string"
             };
 
-        function RemsTelemetryModelProvider(adapter){
+        function RemsTelemetryModelProvider(adapter) {
 
             function isRelevant(id) {
                 return id.indexOf(PREFIX) === 0;
             }
 
-            function makeId(element){
+            function makeId(element) {
                 return PREFIX + element.identifier;
             }
 
-            function buildTaxonomy(dictionary){
+            function buildTaxonomy(dictionary) {
                 var models = {};
 
-                function addMeasurement(measurement, parent){
+                function addMeasurement(measurement, parent) {
                     var format = FORMAT_MAPPINGS[measurement.type];
                     models[makeId(measurement)] = {
                         type: "msl.measurement",
@@ -73,12 +73,12 @@ define(
                         location: spacecraftId,
                         composition: measurements.map(makeId)
                     };
-                    measurements.forEach(function(measurement) {
+                    measurements.forEach(function (measurement) {
                         addMeasurement(measurement, instrumentId);
                     });
                 }
 
-                (dictionary.instruments || []).forEach(function(instrument) {
+                (dictionary.instruments || []).forEach(function (instrument) {
                     addInstrument(instrument, "msl:curiosity");
                 });
                 return models;

example/msl/src/RemsTelemetryProvider.js

@@ -72,10 +72,10 @@ define (
          * This data source does not support real-time subscriptions
          */
         RemsTelemetryProvider.prototype.subscribe = function (callback, requests) {
-            return function() {};
+            return function () {};
         };
         RemsTelemetryProvider.prototype.unsubscribe = function (callback, requests) {
-            return function() {};
+            return function () {};
         };
 
         return RemsTelemetryProvider;

example/msl/src/RemsTelemetrySeries.js

@@ -54,8 +54,8 @@ define(
          * @returns {number} A count of the number of data values available in
          * this series
          */
-        RemsTelemetrySeries.prototype.getPointCount = function() {
-                    return this.data.length;
+        RemsTelemetrySeries.prototype.getPointCount = function () {
+            return this.data.length;
         };
         /**
          * The domain value at the given index. The Rems telemetry data is
@@ -64,8 +64,8 @@ define(
          * @param index
          * @returns {number} the time value in ms since 1 January 1970
          */
-        RemsTelemetrySeries.prototype.getDomainValue = function(index) {
-                    return this.data[index].date;
+        RemsTelemetrySeries.prototype.getDomainValue = function (index) {
+            return this.data[index].date;
         };
 
         /**
@@ -75,8 +75,8 @@ define(
          * value of.
          * @returns {number} A floating point number
          */
-        RemsTelemetrySeries.prototype.getRangeValue = function(index) {
-                    return this.data[index].value;
+        RemsTelemetrySeries.prototype.getRangeValue = function (index) {
+            return this.data[index].value;
         };
 
         return RemsTelemetrySeries;

example/msl/src/RemsTelemetryServerAdapter.js

@@ -68,18 +68,18 @@ define(
          * given request ID.
          * @private
          */
-        RemsTelemetryServerAdapter.prototype.requestHistory = function(request) {
+        RemsTelemetryServerAdapter.prototype.requestHistory = function (request) {
             var self = this,
                 id = request.key;
 
             var dataTransforms = this.dataTransforms;
 
-            function processResponse(response){
+            function processResponse(response) {
                 var data = [];
                 /*
                  * History data is organised by Sol. Iterate over sols...
                  */
-                response.data.soles.forEach(function(solData){
+                response.data.soles.forEach(function (solData) {
                     /*
                      * Check that valid data exists
                      */
@@ -106,13 +106,13 @@ define(
 
             //Filter results to match request parameters
             function filterResults(results) {
-                return results.filter(function(result){
+                return results.filter(function (result) {
                     return result.date >= (request.start || Number.MIN_VALUE) &&
                         result.date <= (request.end || Number.MAX_VALUE);
                 });
             }
 
-            function packageAndResolve(results){
+            function packageAndResolve(results) {
                 return {id: id, values: results};
             }
 
@@ -132,7 +132,7 @@ define(
          * @param id The telemetry data point key to be queried.
          * @returns {Promise | Array<RemsTelemetryValue>} that resolves with an Array of {@link RemsTelemetryValue} objects for the request data key.
          */
-        RemsTelemetryServerAdapter.prototype.history = function(request) {
+        RemsTelemetryServerAdapter.prototype.history = function (request) {
             return this.requestHistory(request);
         };
 

example/notifications/bundle.js

@@ -26,61 +26,66 @@ define([
     "./src/NotificationLaunchController",
     "./src/DialogLaunchIndicator",
     "./src/NotificationLaunchIndicator",
-    'legacyRegistry'
+    "./res/dialog-launch.html",
+    "./res/notification-launch.html"
 ], function (
     DialogLaunchController,
     NotificationLaunchController,
     DialogLaunchIndicator,
     NotificationLaunchIndicator,
-    legacyRegistry
+    DialogLaunch,
+    NotificationLaunch
 ) {
     "use strict";
 
-    legacyRegistry.register("example/notifications", {
-        "extensions": {
-            "templates": [
-                {
-                    "key": "dialogLaunchTemplate",
-                    "templateUrl": "dialog-launch.html"
-                },
-                {
-                    "key": "notificationLaunchTemplate",
-                    "templateUrl": "notification-launch.html"
-                }
-            ],
-            "controllers": [
-                {
-                    "key": "DialogLaunchController",
-                    "implementation": DialogLaunchController,
-                    "depends": [
-                        "$scope",
-                        "$timeout",
-                        "$log",
-                        "dialogService",
-                        "notificationService"
-                    ]
-                },
-                {
-                    "key": "NotificationLaunchController",
-                    "implementation": NotificationLaunchController,
-                    "depends": [
-                        "$scope",
-                        "$timeout",
-                        "$log",
-                        "notificationService"
-                    ]
-                }
-            ],
-            "indicators": [
-                {
-                    "implementation": DialogLaunchIndicator,
-                    "priority": "fallback"
-                },
-                {
-                    "implementation": NotificationLaunchIndicator,
-                    "priority": "fallback"
-                }
-            ]
+    return {
+        name:"example/notifications",
+        definition: {
+            "extensions": {
+                "templates": [
+                    {
+                        "key": "dialogLaunchTemplate",
+                        "template": DialogLaunch
+                    },
+                    {
+                        "key": "notificationLaunchTemplate",
+                        "template": NotificationLaunch
+                    }
+                ],
+                "controllers": [
+                    {
+                        "key": "DialogLaunchController",
+                        "implementation": DialogLaunchController,
+                        "depends": [
+                            "$scope",
+                            "$timeout",
+                            "$log",
+                            "dialogService",
+                            "notificationService"
+                        ]
+                    },
+                    {
+                        "key": "NotificationLaunchController",
+                        "implementation": NotificationLaunchController,
+                        "depends": [
+                            "$scope",
+                            "$timeout",
+                            "$log",
+                            "notificationService"
+                        ]
+                    }
+                ],
+                "indicators": [
+                    {
+                        "implementation": DialogLaunchIndicator,
+                        "priority": "fallback"
+                    },
+                    {
+                        "implementation": NotificationLaunchIndicator,
+                        "priority": "fallback"
+                    }
+                ]
+            }
         }
-    });
+    };
 });

example/notifications/res/dialog-launch.html

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

example/notifications/res/notification-launch.html

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

example/notifications/src/DialogLaunchController.js

@@ -137,12 +137,12 @@ define(
                         " attention to an event.",
                         severity: "info",
                         primaryOption: {
-                                label: "OK",
-                                callback: function () {
-                                    $log.debug("OK Pressed");
-                                    dialog.dismiss();
-                                }
+                            label: "OK",
+                            callback: function () {
+                                $log.debug("OK Pressed");
+                                dialog.dismiss();
                             }
+                        }
                     };
 
                 dialog = dialogService.showBlockingMessage(model);

example/notifications/src/NotificationLaunchController.js

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

example/persistence/bundle.js

@@ -22,33 +22,34 @@
 /*global define*/
 
 define([
-    "./src/BrowserPersistenceProvider",
-    'legacyRegistry'
+    "./src/BrowserPersistenceProvider"
 ], function (
-    BrowserPersistenceProvider,
-    legacyRegistry
+    BrowserPersistenceProvider
 ) {
     "use strict";
 
-    legacyRegistry.register("example/persistence", {
-        "extensions": {
-            "components": [
-                {
-                    "provides": "persistenceService",
-                    "type": "provider",
-                    "implementation": BrowserPersistenceProvider,
-                    "depends": [
-                        "$q",
-                        "PERSISTENCE_SPACE"
-                    ]
-                }
-            ],
-            "constants": [
-                {
-                    "key": "PERSISTENCE_SPACE",
-                    "value": "mct"
-                }
-            ]
+    return {
+        name:"example/persistence",
+        definition: {
+            "extensions": {
+                "components": [
+                    {
+                        "provides": "persistenceService",
+                        "type": "provider",
+                        "implementation": BrowserPersistenceProvider,
+                        "depends": [
+                            "$q",
+                            "PERSISTENCE_SPACE"
+                        ]
+                    }
+                ],
+                "constants": [
+                    {
+                        "key": "PERSISTENCE_SPACE",
+                        "value": "mct"
+                    }
+                ]
+            }
         }
-    });
+    };
 });

example/policy/bundle.js

@@ -22,24 +22,25 @@
 /*global define*/
 
 define([
-    "./src/ExamplePolicy",
-    'legacyRegistry'
+    "./src/ExamplePolicy"
 ], function (
-    ExamplePolicy,
-    legacyRegistry
+    ExamplePolicy
 ) {
     "use strict";
 
-    legacyRegistry.register("example/policy", {
-        "name": "Example Policy",
-        "description": "Provides an example of using policies to prohibit actions.",
-        "extensions": {
-            "policies": [
-                {
-                    "implementation": ExamplePolicy,
-                    "category": "action"
-                }
-            ]
+    return {
+        name:"example/policy",
+        definition: {
+            "name": "Example Policy",
+            "description": "Provides an example of using policies to prohibit actions.",
+            "extensions": {
+                "policies": [
+                    {
+                        "implementation": ExamplePolicy,
+                        "category": "action"
+                    }
+                ]
+            }
         }
-    });
+    };
 });

example/profiling/bundle.js

@@ -23,33 +23,34 @@
 
 define([
     "./src/WatchIndicator",
-    "./src/DigestIndicator",
-    'legacyRegistry'
+    "./src/DigestIndicator"
 ], function (
     WatchIndicator,
-    DigestIndicator,
-    legacyRegistry
+    DigestIndicator
 ) {
     "use strict";
 
-    legacyRegistry.register("example/profiling", {
-        "extensions": {
-            "indicators": [
-                {
-                    "implementation": WatchIndicator,
-                    "depends": [
-                        "$interval",
-                        "$rootScope"
-                    ]
-                },
-                {
-                    "implementation": DigestIndicator,
-                    "depends": [
-                        "$interval",
-                        "$rootScope"
-                    ]
-                }
-            ]
+    return {
+        name:"example/profiling",
+        definition: {
+            "extensions": {
+                "indicators": [
+                    {
+                        "implementation": WatchIndicator,
+                        "depends": [
+                            "$interval",
+                            "$rootScope"
+                        ]
+                    },
+                    {
+                        "implementation": DigestIndicator,
+                        "depends": [
+                            "$interval",
+                            "$rootScope"
+                        ]
+                    }
+                ]
+            }
         }
-    });
+    };
 });

example/scratchpad/bundle.js

@@ -22,42 +22,43 @@
 /*global define*/
 
 define([
-    "./src/ScratchPersistenceProvider",
-    'legacyRegistry'
+    "./src/ScratchPersistenceProvider"
 ], function (
-    ScratchPersistenceProvider,
-    legacyRegistry
+    ScratchPersistenceProvider
 ) {
     "use strict";
 
-    legacyRegistry.register("example/scratchpad", {
-        "extensions": {
-            "roots": [
-                {
-                    "id": "scratch:root"
-                }
-            ],
-            "models": [
-                {
-                    "id": "scratch:root",
-                    "model": {
-                        "type": "folder",
-                        "composition": [],
-                        "name": "Scratchpad"
-                    },
-                    "priority": "preferred"
-                }
-            ],
-            "components": [
-                {
-                    "provides": "persistenceService",
-                    "type": "provider",
-                    "implementation": ScratchPersistenceProvider,
-                    "depends": [
-                        "$q"
-                    ]
-                }
-            ]
+    return {
+        name:"example/scratchpad",
+        definition: {
+            "extensions": {
+                "roots": [
+                    {
+                        "id": "scratch:root"
+                    }
+                ],
+                "models": [
+                    {
+                        "id": "scratch:root",
+                        "model": {
+                            "type": "folder",
+                            "composition": [],
+                            "name": "Scratchpad"
+                        },
+                        "priority": "preferred"
+                    }
+                ],
+                "components": [
+                    {
+                        "provides": "persistenceService",
+                        "type": "provider",
+                        "implementation": ScratchPersistenceProvider,
+                        "depends": [
+                            "$q"
+                        ]
+                    }
+                ]
+            }
         }
-    });
+    };
 });

example/scratchpad/src/ScratchPersistenceProvider.js

@@ -60,7 +60,7 @@ define(
         ScratchPersistenceProvider.prototype.readObject = function (space, key) {
             return this.$q.when(
                 (space === 'scratch' && this.table[key]) ?
-                        JSON.parse(this.table[key]) : undefined
+                    JSON.parse(this.table[key]) : undefined
             );
         };
 

example/simpleVuePlugin/HelloWorld.vue

@@ -0,0 +1,19 @@
+<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

@@ -0,0 +1,35 @@
+import Vue from 'Vue';
+import HelloWorld from './HelloWorld.vue';
+
+function SimpleVuePlugin() {
+    return function install(openmct) {
+        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,16 +1,32 @@
 define([
     "./src/ExampleStyleGuideModelProvider",
     "./src/MCTExample",
-    'legacyRegistry'
+    "./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"
 ], function (
     ExampleStyleGuideModelProvider,
     MCTExample,
-    legacyRegistry
+    introTemplate,
+    standardsTemplate,
+    colorsTemplate,
+    statusTemplate,
+    glyphsTemplate,
+    controlsTemplate,
+    inputTemplate,
+    menusTemplate
 ) {
-    legacyRegistry.register("example/styleguide", {
-        "name": "Open MCT Style Guide",
-        "description": "Examples and documentation illustrating UI styles in use in Open MCT.",
-        "extensions":
+    return {
+        name:"example/styleguide",
+        definition: {
+            "name": "Open MCT Style Guide",
+            "description": "Examples and documentation illustrating UI styles in use in Open MCT.",
+            "extensions":
         {
             "types": [
                 { "key": "styleguide.intro", "name": "Introduction", "cssClass": "icon-page", "description": "Introduction and overview to the style guide" },
@@ -23,14 +39,14 @@ define([
                 { "key": "styleguide.menus", "name": "Menus", "cssClass": "icon-page", "description": "Context menus, dropdowns" }
             ],
             "views": [
-                { "key": "styleguide.intro", "type": "styleguide.intro", "templateUrl": "templates/intro.html", "editable": false },
-                { "key": "styleguide.standards", "type": "styleguide.standards", "templateUrl": "templates/standards.html", "editable": false },
-                { "key": "styleguide.colors", "type": "styleguide.colors", "templateUrl": "templates/colors.html", "editable": false },
-                { "key": "styleguide.status", "type": "styleguide.status", "templateUrl": "templates/status.html", "editable": false },
-                { "key": "styleguide.glyphs", "type": "styleguide.glyphs", "templateUrl": "templates/glyphs.html", "editable": false },
-                { "key": "styleguide.controls", "type": "styleguide.controls", "templateUrl": "templates/controls.html", "editable": false },
-                { "key": "styleguide.input", "type": "styleguide.input", "templateUrl": "templates/input.html", "editable": false },
-                { "key": "styleguide.menus", "type": "styleguide.menus", "templateUrl": "templates/menus.html", "editable": false }
+                { "key": "styleguide.intro", "type": "styleguide.intro", "template": introTemplate, "editable": false },
+                { "key": "styleguide.standards", "type": "styleguide.standards", "template": standardsTemplate, "editable": false },
+                { "key": "styleguide.colors", "type": "styleguide.colors", "template": colorsTemplate, "editable": false },
+                { "key": "styleguide.status", "type": "styleguide.status", "template": statusTemplate, "editable": false },
+                { "key": "styleguide.glyphs", "type": "styleguide.glyphs", "template": glyphsTemplate, "editable": false },
+                { "key": "styleguide.controls", "type": "styleguide.controls", "template": controlsTemplate, "editable": false },
+                { "key": "styleguide.input", "type": "styleguide.input", "template": inputTemplate, "editable": false },
+                { "key": "styleguide.menus", "type": "styleguide.menus", "template": menusTemplate, "editable": false }
             ],
             "roots": [
                 {
@@ -85,17 +101,8 @@ 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

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

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

@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-@import "bourbon";
-@import "../../../../platform/commonUI/general/res/sass/constants";
-@import "../../../../platform/commonUI/general/res/sass/mixins";
-@import "../../../../platform/commonUI/themes/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);
-$colorGlyphExample: #fff;
-
-@import "style-guide-base";
-
-div.themed.espresso { display: block; }
-span.themed.espresso { display: inline; }

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

@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-@import "bourbon";
-@import "../../../../platform/commonUI/general/res/sass/constants";
-@import "../../../../platform/commonUI/general/res/sass/mixins";
-@import "../../../../platform/commonUI/themes/snow/res/sass/constants";
-@import "../../../../platform/commonUI/themes/snow/res/sass/mixins";
-@import "../../../../platform/commonUI/general/res/sass/glyphs";
-@import "../../../../platform/commonUI/general/res/sass/icons";
-
-// Thematic constants
-$colorCode: rgba(black, 0.1);
-$colorGlyphExample: darken($colorBodyBg, 30%);
-
-@import "style-guide-base";
-
-div.themed.snow { display: block; }
-span.themed.snow { display: inline; }

example/styleguide/res/templates/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="/example/styleguide/res/images/diagram-objects.svg" />
+                <img src="../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="/example/styleguide/res/images/diagram-containment.svg" />
+                <img src="../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="/example/styleguide/res/images/diagram-views.svg" />
+                <img src="../images/diagram-views.svg" />
             </div>
         </div>
     </div>
@@ -70,4 +70,4 @@
     <p></p>
     <p></p>
     <p></p>
-</div>
+</div>

example/styleguide/src/ExampleStyleGuideModelProvider.js

@@ -30,14 +30,14 @@ define(
             var pages = {};
 
             // Add pages
-            pages['intro'] = { name: "Introduction", type: "styleguide.intro", location: "styleguide:home" };
-            pages['standards'] = { name: "Standards", type: "styleguide.standards", location: "styleguide:home" };
-            pages['colors'] = { name: "Colors", type: "styleguide.colors", location: "styleguide:home" };
-            pages['glyphs'] = { name: "Glyphs", type: "styleguide.glyphs", location: "styleguide:home" };
-            pages['status'] = { name: "Status Indication", type: "styleguide.status", location: "styleguide:home" };
-            pages['controls'] = { name: "Controls", type: "styleguide.controls", location: "styleguide:ui-elements" };
-            pages['input'] = { name: "Text Inputs", type: "styleguide.input", location: "styleguide:ui-elements" };
-            pages['menus'] = { name: "Menus", type: "styleguide.menus", location: "styleguide:ui-elements" };
+            pages.intro = { name: "Introduction", type: "styleguide.intro", location: "styleguide:home" };
+            pages.standards = { name: "Standards", type: "styleguide.standards", location: "styleguide:home" };
+            pages.colors = { name: "Colors", type: "styleguide.colors", location: "styleguide:home" };
+            pages.glyphs = { name: "Glyphs", type: "styleguide.glyphs", location: "styleguide:home" };
+            pages.status = { name: "Status Indication", type: "styleguide.status", location: "styleguide:home" };
+            pages.controls = { name: "Controls", type: "styleguide.controls", location: "styleguide:ui-elements" };
+            pages.input = { name: "Text Inputs", type: "styleguide.input", location: "styleguide:ui-elements" };
+            pages.menus = { name: "Menus", type: "styleguide.menus", location: "styleguide:ui-elements" };
 
             return {
                 getModels: function () {
@@ -48,4 +48,4 @@ define(
 
         return ExampleStyleGuideModelProvider
     }
-);
+);

example/styleguide/src/MCTExample.js

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

example/taxonomy/bundle.js

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

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

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

example/worker/src/FibonacciIndicator.js

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

@@ -1,15 +0,0 @@
-/*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

@@ -1,182 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*global 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,66 +26,61 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no">
         <meta name="apple-mobile-web-app-capable" content="yes">
         <title></title>
-        <script src="bower_components/requirejs/require.js"> </script>
-        <script>
-            var THIRTY_MINUTES = 30 * 60 * 1000;
-
-            require(['openmct'], function (openmct) {
-                [
-                    'example/eventGenerator',
-                    'example/styleguide'
-                ].forEach(
-                    openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
-                );
-                openmct.install(openmct.plugins.MyItems());
-                openmct.install(openmct.plugins.LocalStorage());
-                openmct.install(openmct.plugins.Espresso());
-                openmct.install(openmct.plugins.Generator());
-                openmct.install(openmct.plugins.ExampleImagery());
-                openmct.install(openmct.plugins.UTCTimeSystem());
-                openmct.install(openmct.plugins.ImportExport());
-                openmct.install(openmct.plugins.AutoflowView({
-                    type: "telemetry.panel"
-                }));
-                openmct.install(openmct.plugins.Conductor({
-                    menuOptions: [
-                        {
-                            name: "Fixed",
-                            timeSystem: 'utc',
-                            bounds: {
-                                start: Date.now() - THIRTY_MINUTES,
-                                end: Date.now()
-                            }
-                        },
-                        {
-                            name: "Realtime",
-                            timeSystem: 'utc',
-                            clock: 'local',
-                            clockOffsets: {
-                                start: -25 * 60 * 1000,
-                                end: 5 * 60 * 1000
-                            }
-                        }
-                    ]
-                }));
-                openmct.install(openmct.plugins.SummaryWidget());
-                openmct.install(openmct.plugins.Notebook());
-                openmct.time.clock('local', {start: -THIRTY_MINUTES, end: 0});
-                openmct.time.timeSystem('utc');
-                openmct.start();
-                window.openmct = openmct;
-            });
-        </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">
+        <script src="dist/openmct.js"></script>
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96" type="image/x-icon">
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32" type="image/x-icon">
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16" type="image/x-icon">
     </head>
     <body>
-        <div class="l-splash-holder s-splash-holder">
-            <div class="l-splash s-splash"></div>
-        </div>
     </body>
+    <script>
+        const FIVE_MINUTES = 5 * 60 * 1000;
+        const THIRTY_MINUTES = 30 * 60 * 1000;
+
+        [
+            'example/eventGenerator',
+            'example/styleguide'
+        ].forEach(
+            openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
+        );
+        openmct.install(openmct.plugins.MyItems());
+        openmct.install(openmct.plugins.LocalStorage());
+        openmct.install(openmct.plugins.Generator());
+        openmct.install(openmct.plugins.ExampleImagery());
+        openmct.install(openmct.plugins.UTCTimeSystem());
+        openmct.install(openmct.plugins.AutoflowView({
+            type: "telemetry.panel"
+        }));
+        openmct.install(openmct.plugins.DisplayLayout({
+            showAsView: ['summary-widget', 'example.imagery']
+        }));
+        openmct.install(openmct.plugins.Conductor({
+            menuOptions: [
+                {
+                    name: "Fixed",
+                    timeSystem: 'utc',
+                    bounds: {
+                        start: Date.now() - THIRTY_MINUTES,
+                        end: Date.now()
+                    }
+                },
+                {
+                    name: "Realtime",
+                    timeSystem: 'utc',
+                    clock: 'local',
+                    clockOffsets: {
+                        start: - THIRTY_MINUTES,
+                        end: FIVE_MINUTES
+                    }
+                }
+            ]
+        }));
+        openmct.install(openmct.plugins.SummaryWidget());
+        openmct.install(openmct.plugins.Notebook());
+        openmct.install(openmct.plugins.LADTable());
+        openmct.install(openmct.plugins.Filters(['table', 'telemetry.plot.overlay']));
+        openmct.install(openmct.plugins.ObjectMigration());
+        openmct.install(openmct.plugins.ClearData(['table', 'telemetry.plot.overlay', 'telemetry.plot.stacked']));
+        openmct.start();
+    </script>
 </html>

karma.conf.js

@@ -21,70 +21,46 @@
  *****************************************************************************/
 
 /*global module,process*/
-module.exports = function(config) {
+
+const devMode = process.env.NODE_ENV !== 'production';
+const browsers = [process.env.NODE_ENV === 'debug' ? 'ChromeDebugging' : 'ChromeHeadless'];
+
+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 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.
+        frameworks: ['jasmine'],
         files: [
-            {pattern: 'bower_components/**/*.js', included: false},
-            {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'
+            'platform/**/*Spec.js',
+            'src/**/*Spec.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,
-
-        // Wnable / disable colors in the output (reporters and logs).
-        colors: true,
-
-        logLevel: config.LOG_INFO,
-
-        // Rerun tests when any file changes.
-        autoWatch: true,
-
-        // Specify browsers to run tests in.
-        // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-        browsers: [
-            'ChromeHeadless'
+        reporters: [
+            'progress',
+            'coverage',
+            'html'
         ],
-
-        // Code coverage reporting.
+        browsers: browsers,
+        customLaunchers: {
+            ChromeDebugging: {
+                base: 'Chrome',
+                flags: ['--remote-debugging-port=9222'],
+                debug: true
+            }
+        },
+        colors: true,
+        logLevel: config.LOG_INFO,
+        autoWatch: true,
         coverageReporter: {
             dir: process.env.CIRCLE_ARTIFACTS ?
                 process.env.CIRCLE_ARTIFACTS + '/coverage' :
@@ -96,16 +72,22 @@ module.exports = function(config) {
                 }
             }
         },
-
         // HTML test reporting.
         htmlReporter: {
             outputDir: "dist/reports/tests",
             preserveDescribeNesting: true,
             foldAll: false
         },
-
-        // Continuous Integration mode.
-        // If true, Karma captures browsers, runs the tests and exits.
+        preprocessors: {
+            // add webpack as preprocessor
+            'platform/**/*Spec.js': [ 'webpack', 'sourcemap' ],
+            'src/**/*Spec.js': [ 'webpack', 'sourcemap' ]
+        },
+        webpack: webpackConfig,
+        webpackMiddleware: {
+            stats: 'errors-only',
+            logLevel: 'warn'
+        },
         singleRun: true
     });
-};
+}

openmct.js

@@ -19,102 +19,19 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global requirejs,BUILD_CONSTANTS*/
+/*global module*/
 
-requirejs.config({
-    "paths": {
-        "legacyRegistry": "src/legacyRegistry",
-        "angular": "bower_components/angular/angular.min",
-        "angular-route": "bower_components/angular-route/angular-route.min",
-        "csv": "bower_components/comma-separated-values/csv.min",
-        "EventEmitter": "bower_components/eventemitter3/index",
-        "es6-promise": "bower_components/es6-promise/es6-promise.min",
-        "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 matcher = /\/openmct.js$/;
+if (document.currentScript) {
+    let src = document.currentScript.src;
+    if (src && matcher.test(src)) {
+        // eslint-disable-next-line no-undef
+        __webpack_public_path__ = src.replace(matcher, '') + '/';
     }
-});
+}
 
-define([
-    './platform/framework/src/Main',
-    './src/defaultRegistry',
-    './src/MCT',
-    './src/plugins/buildInfo/plugin'
-], function (Main, defaultRegistry, MCT, buildInfo) {
-    var openmct = new MCT();
+const MCT = require('./src/MCT');
 
-    openmct.legacyRegistry = defaultRegistry;
-    openmct.install(openmct.plugins.Plot());
+var openmct = new MCT();
 
-    if (typeof BUILD_CONSTANTS !== 'undefined') {
-        openmct.install(buildInfo(BUILD_CONSTANTS));
-    }
-
-    openmct.on('start', function () {
-        return new Main().run(defaultRegistry);
-    });
-
-    return openmct;
-});
+module.exports = openmct;

package.json

@@ -1,8 +1,17 @@
 {
   "name": "openmct",
-  "version": "0.14.0-SNAPSHOT",
+  "version": "1.0.0-beta",
   "description": "The Open MCT core platform",
-  "dependencies": {
+  "dependencies": {},
+  "devDependencies": {
+    "acorn": "6.2.0",
+    "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",
@@ -13,59 +22,71 @@
     "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",
-    "minimist": "^1.1.1",
-    "painterro": "^0.2.65",
-    "request": "^2.69.0",
-    "vue": "^2.5.6"
-  },
-  "devDependencies": {
-    "bower": "^1.7.7",
+    "fast-sass-loader": "1.4.6",
+    "file-loader": "^1.1.11",
+    "file-saver": "^1.3.8",
     "git-rev-sync": "^1.4.0",
     "glob": ">= 3.0.0",
-    "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",
+    "html-loader": "^0.5.5",
     "html2canvas": "^1.0.0-alpha.12",
+    "imports-loader": "^0.8.0",
+    "istanbul-instrumenter-loader": "^3.0.1",
     "jasmine-core": "^3.1.0",
-    "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-requirejs": "^1.1.0",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-webpack": "^3.0.0",
+    "location-bar": "^3.0.1",
     "lodash": "^3.10.1",
     "markdown-toc": "^0.11.7",
     "marked": "^0.3.5",
-    "merge-stream": "^1.0.0",
-    "mkdirp": "^0.5.1",
+    "mini-css-extract-plugin": "^0.4.1",
+    "minimist": "^1.1.1",
     "moment": "^2.11.1",
+    "moment-duration-format": "^2.2.2",
+    "moment-timezone": "^0.5.21",
     "node-bourbon": "^4.2.3",
-    "printj": "^1.1.0",
-    "requirejs": "2.1.x",
+    "node-sass": "^4.9.2",
+    "painterro": "^0.2.65",
+    "printj": "^1.2.1",
+    "raw-loader": "^0.5.1",
+    "request": "^2.69.0",
     "split": "^1.0.0",
-    "v8-compile-cache": "^1.1.0"
+    "style-loader": "^0.21.0",
+    "v8-compile-cache": "^1.1.0",
+    "vue": "2.5.6",
+    "vue-loader": "^15.2.6",
+    "vue-template-compiler": "2.5.6",
+    "webpack": "^4.16.2",
+    "webpack-cli": "^3.1.0",
+    "webpack-dev-middleware": "^3.1.3",
+    "webpack-hot-middleware": "^2.22.3",
+    "zepto": "^1.2.0"
   },
   "scripts": {
     "start": "node app.js",
+    "lint": "eslint platform example src openmct.js",
+    "lint:fix": "eslint platform example src openmct.js --fix",
+    "build:prod": "NODE_ENV=production webpack",
+    "build:dev": "webpack",
+    "build:watch": "webpack --watch",
     "test": "karma start --single-run",
-    "jshint": "jshint platform example",
-    "lint": "./node_modules/gulp/bin/gulp.js lint",
-    "checkstyle": "./node_modules/gulp/bin/gulp.js checkstyle",
-    "watch": "karma start",
+    "test-debug": "NODE_ENV=debug karma start --no-single-run",
+    "test:watch": "karma start --no-single-run",
+    "verify": "concurrently 'npm:test' 'npm:lint'",
     "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
     "otherdoc": "node docs/gendocs.js --in docs/src --out dist/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",
     "docs": "npm run jsdoc ; npm run otherdoc",
-    "prepare": "node ./node_modules/bower/bin/bower install && node ./node_modules/gulp/bin/gulp.js install"
+    "prepare": "npm run build:prod"
   },
   "repository": {
     "type": "git",

platform/commonUI/about/bundle.js

@@ -21,18 +21,17 @@
  *****************************************************************************/
 
 define([
-    "text!./res/templates/about-dialog.html",
+    "./res/templates/about-dialog.html",
     "./src/LogoController",
     "./src/AboutController",
     "./src/LicenseController",
-    "text!./res/templates/app-logo.html",
-    "text!./res/templates/about-logo.html",
-    "text!./res/templates/overlay-about.html",
-    "text!./res/templates/license-apache.html",
-    "text!./res/templates/license-mit.html",
-    "text!./res/templates/licenses.html",
-    "text!./res/templates/licenses-export-md.html",
-    'legacyRegistry'
+    "./res/templates/app-logo.html",
+    "./res/templates/about-logo.html",
+    "./res/templates/overlay-about.html",
+    "./res/templates/license-apache.html",
+    "./res/templates/license-mit.html",
+    "./res/templates/licenses.html",
+    "./res/templates/licenses-export-md.html"
 ], function (
     aboutDialogTemplate,
     LogoController,
@@ -44,137 +43,139 @@ define([
     licenseApacheTemplate,
     licenseMitTemplate,
     licensesTemplate,
-    licensesExportMdTemplate,
-    legacyRegistry
+    licensesExportMdTemplate
 ) {
 
-    legacyRegistry.register("platform/commonUI/about", {
-        "name": "About Open MCT",
-        "extensions": {
-            "templates": [
-                {
-                    "key": "app-logo",
-                    "priority": "optional",
-                    "template": appLogoTemplate
-                },
-                {
-                    "key": "about-logo",
-                    "priority": "preferred",
-                    "template": aboutLogoTemplate
-                },
-                {
-                    "key": "about-dialog",
-                    "template": aboutDialogTemplate
-                },
-                {
-                    "key": "overlay-about",
-                    "template": overlayAboutTemplate
-                },
-                {
-                    "key": "license-apache",
-                    "template": licenseApacheTemplate
-                },
-                {
-                    "key": "license-mit",
-                    "template": licenseMitTemplate
-                }
-            ],
-            "controllers": [
-                {
-                    "key": "LogoController",
-                    "depends": [
-                        "overlayService"
-                    ],
-                    "implementation": LogoController
-                },
-                {
-                    "key": "AboutController",
-                    "depends": [
-                        "versions[]",
-                        "$window"
-                    ],
-                    "implementation": AboutController
-                },
-                {
-                    "key": "LicenseController",
-                    "depends": [
-                        "licenses[]"
-                    ],
-                    "implementation": LicenseController
-                }
-            ],
-            "licenses": [
-                {
-                    "name": "Json.NET",
-                    "version": "6.0.8",
-                    "author": "Newtonsoft",
-                    "description": "JSON serialization/deserialization",
-                    "website": "http://www.newtonsoft.com/json",
-                    "copyright": "Copyright (c) 2007 James Newton-King",
-                    "license": "license-mit",
-                    "link": "https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md"
-                },
-                {
-                    "name": "Nancy",
-                    "version": "0.23.2",
-                    "author": "Andreas Håkansson, Steven Robbins and contributors",
-                    "description": "Embedded web server",
-                    "website": "http://nancyfx.org/",
-                    "copyright": "Copyright © 2010 Andreas Håkansson, Steven Robbins and contributors",
-                    "license": "license-mit",
-                    "link": "http://www.opensource.org/licenses/mit-license.php"
-                },
-                {
-                    "name": "Nancy.Hosting.Self",
-                    "version": "0.23.2",
-                    "author": "Andreas Håkansson, Steven Robbins and contributors",
-                    "description": "Embedded web server",
-                    "website": "http://nancyfx.org/",
-                    "copyright": "Copyright © 2010 Andreas Håkansson, Steven Robbins and contributors",
-                    "license": "license-mit",
-                    "link": "http://www.opensource.org/licenses/mit-license.php"
-                },
-                {
-                    "name": "SuperSocket",
-                    "version": "0.9.0.2",
-                    "author": " Kerry Jiang",
-                    "description": "Supports SuperWebSocket",
-                    "website": "https://supersocket.codeplex.com/",
-                    "copyright": "Copyright 2010-2014 Kerry Jiang (kerry-jiang@hotmail.com)",
-                    "license": "license-apache",
-                    "link": "https://supersocket.codeplex.com/license"
-                },
-                {
-                    "name": "SuperWebSocket",
-                    "version": "0.9.0.2",
-                    "author": " Kerry Jiang",
-                    "description": "WebSocket implementation for client-server communication",
-                    "website": "https://superwebsocket.codeplex.com/",
-                    "copyright": "Copyright 2010-2014 Kerry Jiang (kerry-jiang@hotmail.com)",
-                    "license": "license-apache",
-                    "link": "https://superwebsocket.codeplex.com/license"
-                },
-                {
-                    "name": "log4net",
-                    "version": "2.0.3",
-                    "author": "Apache Software Foundation",
-                    "description": "Logging",
-                    "website": "http://logging.apache.org/log4net/",
-                    "copyright": "Copyright © 2004-2015 Apache Software Foundation.",
-                    "license": "license-apache",
-                    "link": "http://logging.apache.org/log4net/license.html"
-                }
-            ],
-            "routes": [
-                {
-                    "when": "/licenses",
-                    "template": licensesTemplate
-                },
-                {
-                    "when": "/licenses-md",
-                    "template": licensesExportMdTemplate
-                }
-            ]
+    return {
+        name:"platform/commonUI/about",
+        definition: {
+            "name": "About Open MCT",
+            "extensions": {
+                "templates": [
+                    {
+                        "key": "app-logo",
+                        "priority": "optional",
+                        "template": appLogoTemplate
+                    },
+                    {
+                        "key": "about-logo",
+                        "priority": "preferred",
+                        "template": aboutLogoTemplate
+                    },
+                    {
+                        "key": "about-dialog",
+                        "template": aboutDialogTemplate
+                    },
+                    {
+                        "key": "overlay-about",
+                        "template": overlayAboutTemplate
+                    },
+                    {
+                        "key": "license-apache",
+                        "template": licenseApacheTemplate
+                    },
+                    {
+                        "key": "license-mit",
+                        "template": licenseMitTemplate
+                    }
+                ],
+                "controllers": [
+                    {
+                        "key": "LogoController",
+                        "depends": [
+                            "overlayService"
+                        ],
+                        "implementation": LogoController
+                    },
+                    {
+                        "key": "AboutController",
+                        "depends": [
+                            "versions[]",
+                            "$window"
+                        ],
+                        "implementation": AboutController
+                    },
+                    {
+                        "key": "LicenseController",
+                        "depends": [
+                            "licenses[]"
+                        ],
+                        "implementation": LicenseController
+                    }
+                ],
+                "licenses": [
+                    {
+                        "name": "Json.NET",
+                        "version": "6.0.8",
+                        "author": "Newtonsoft",
+                        "description": "JSON serialization/deserialization",
+                        "website": "http://www.newtonsoft.com/json",
+                        "copyright": "Copyright (c) 2007 James Newton-King",
+                        "license": "license-mit",
+                        "link": "https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md"
+                    },
+                    {
+                        "name": "Nancy",
+                        "version": "0.23.2",
+                        "author": "Andreas Håkansson, Steven Robbins and contributors",
+                        "description": "Embedded web server",
+                        "website": "http://nancyfx.org/",
+                        "copyright": "Copyright © 2010 Andreas Håkansson, Steven Robbins and contributors",
+                        "license": "license-mit",
+                        "link": "http://www.opensource.org/licenses/mit-license.php"
+                    },
+                    {
+                        "name": "Nancy.Hosting.Self",
+                        "version": "0.23.2",
+                        "author": "Andreas Håkansson, Steven Robbins and contributors",
+                        "description": "Embedded web server",
+                        "website": "http://nancyfx.org/",
+                        "copyright": "Copyright © 2010 Andreas Håkansson, Steven Robbins and contributors",
+                        "license": "license-mit",
+                        "link": "http://www.opensource.org/licenses/mit-license.php"
+                    },
+                    {
+                        "name": "SuperSocket",
+                        "version": "0.9.0.2",
+                        "author": " Kerry Jiang",
+                        "description": "Supports SuperWebSocket",
+                        "website": "https://supersocket.codeplex.com/",
+                        "copyright": "Copyright 2010-2014 Kerry Jiang (kerry-jiang@hotmail.com)",
+                        "license": "license-apache",
+                        "link": "https://supersocket.codeplex.com/license"
+                    },
+                    {
+                        "name": "SuperWebSocket",
+                        "version": "0.9.0.2",
+                        "author": " Kerry Jiang",
+                        "description": "WebSocket implementation for client-server communication",
+                        "website": "https://superwebsocket.codeplex.com/",
+                        "copyright": "Copyright 2010-2014 Kerry Jiang (kerry-jiang@hotmail.com)",
+                        "license": "license-apache",
+                        "link": "https://superwebsocket.codeplex.com/license"
+                    },
+                    {
+                        "name": "log4net",
+                        "version": "2.0.3",
+                        "author": "Apache Software Foundation",
+                        "description": "Logging",
+                        "website": "http://logging.apache.org/log4net/",
+                        "copyright": "Copyright © 2004-2015 Apache Software Foundation.",
+                        "license": "license-apache",
+                        "link": "http://logging.apache.org/log4net/license.html"
+                    }
+                ],
+                "routes": [
+                    {
+                        "when": "/licenses",
+                        "template": licensesTemplate
+                    },
+                    {
+                        "when": "/licenses-md",
+                        "template": licensesExportMdTemplate
+                    }
+                ]
+            }
         }
-    });
+    };
 });

platform/commonUI/browse/bundle.js

@@ -21,292 +21,157 @@
  *****************************************************************************/
 
 define([
-    "./src/BrowseController",
-    "./src/PaneController",
-    "./src/InspectorPaneController",
-    "./src/BrowseObjectController",
-    "./src/MenuArrowController",
-    "./src/ObjectHeaderController",
     "./src/navigation/NavigationService",
     "./src/navigation/NavigateAction",
     "./src/navigation/OrphanNavigationHandler",
     "./src/windowing/NewTabAction",
-    "./src/windowing/FullscreenAction",
-    "./src/windowing/WindowTitler",
-    "text!./res/templates/browse.html",
-    "text!./res/templates/browse-object.html",
-    "text!./res/templates/items/grid-item.html",
-    "text!./res/templates/browse/object-header.html",
-    "text!./res/templates/browse/object-header-frame.html",
-    "text!./res/templates/menu-arrow.html",
-    "text!./res/templates/back-arrow.html",
-    "text!./res/templates/items/items.html",
-    "text!./res/templates/browse/object-properties.html",
-    "text!./res/templates/browse/inspector-region.html",
-    'legacyRegistry'
+    "./res/templates/browse.html",
+    "./res/templates/browse-object.html",
+    "./res/templates/browse/object-header.html",
+    "./res/templates/browse/object-header-frame.html",
+    "./res/templates/menu-arrow.html",
+    "./res/templates/back-arrow.html",
+    "./res/templates/browse/object-properties.html",
+    "./res/templates/browse/inspector-region.html"
 ], function (
-    BrowseController,
-    PaneController,
-    InspectorPaneController,
-    BrowseObjectController,
-    MenuArrowController,
-    ObjectHeaderController,
     NavigationService,
     NavigateAction,
     OrphanNavigationHandler,
     NewTabAction,
-    FullscreenAction,
-    WindowTitler,
     browseTemplate,
     browseObjectTemplate,
-    gridItemTemplate,
     objectHeaderTemplate,
     objectHeaderFrameTemplate,
     menuArrowTemplate,
     backArrowTemplate,
-    itemsTemplate,
     objectPropertiesTemplate,
-    inspectorRegionTemplate,
-    legacyRegistry
+    inspectorRegionTemplate
 ) {
 
-    legacyRegistry.register("platform/commonUI/browse", {
-        "extensions": {
-            "routes": [
-                {
-                    "when": "/browse/:ids*?",
-                    "template": browseTemplate,
-                    "reloadOnSearch": false
-                },
-                {
-                    "when": "",
-                    "redirectTo": "/browse/"
-                }
-            ],
-            "constants": [
-                {
-                    "key": "DEFAULT_PATH",
-                    "value": "mine",
-                    "priority": "fallback"
-                }
-            ],
-            "controllers": [
-                {
-                    "key": "BrowseController",
-                    "implementation": BrowseController,
-                    "depends": [
-                        "$scope",
-                        "$route",
-                        "$location",
-                        "objectService",
-                        "navigationService",
-                        "urlService",
-                        "DEFAULT_PATH"
-                    ]
-                },
-                {
-                    "key": "PaneController",
-                    "implementation": PaneController,
-                    "priority": "preferred",
-                    "depends": [
-                        "$scope",
-                        "agentService",
-                        "$window",
-                        "$location",
-                        "$attrs",
-                        "navigationService"
-                    ]
-                },
-                {
-                    "key": "BrowseObjectController",
-                    "implementation": BrowseObjectController,
-                    "depends": [
-                        "$scope",
-                        "$location",
-                        "$route"
-                    ]
-                },
-                {
-                    "key": "MenuArrowController",
-                    "implementation": MenuArrowController,
-                    "depends": [
-                        "$scope"
-                    ]
-                },
-                {
-                    "key": "InspectorPaneController",
-                    "implementation": InspectorPaneController,
-                    "priority": "preferred",
-                    "depends": [
-                        "$scope",
-                        "agentService",
-                        "$window",
-                        "navigationService",
-                        "$location",
-                        "$attrs"
-                    ]
-                },
-                {
-                    "key": "ObjectHeaderController",
-                    "implementation": ObjectHeaderController,
-                    "depends": [
-                        "$scope"
-                    ]
-                }
-            ],
-            "representations": [
-                {
-                    "key": "browse-object",
-                    "template": browseObjectTemplate,
-                    "gestures": [
-                        "drop"
-                    ],
-                    "uses": [
-                        "view"
-                    ]
-                },
-                {
-                    "key": "grid-item",
-                    "template": gridItemTemplate,
-                    "uses": [
-                        "type",
-                        "action",
-                        "location"
-                    ],
-                    "gestures": [
-                        "info",
-                        "menu"
-                    ]
-                },
-                {
-                    "key": "object-header",
-                    "template": objectHeaderTemplate,
-                    "uses": [
-                        "type"
-                    ]
-                },
-                {
-                    "key": "object-header-frame",
-                    "template": objectHeaderFrameTemplate,
-                    "uses": [
-                        "type"
-                    ]
-                },
-                {
-                    "key": "menu-arrow",
-                    "template": menuArrowTemplate,
-                    "uses": [
-                        "action"
-                    ],
-                    "gestures": [
-                        "menu"
-                    ]
-                },
-                {
-                    "key": "back-arrow",
-                    "uses": [
-                        "context"
-                    ],
-                    "template": backArrowTemplate
-                },
-                {
-                    "key": "object-properties",
-                    "template": objectPropertiesTemplate
-                },
-                {
-                    "key": "inspector-region",
-                    "template": inspectorRegionTemplate
-                }
-            ],
-            "services": [
-                {
-                    "key": "navigationService",
-                    "implementation": NavigationService,
-                    "depends": [
-                        "$window"
-                    ]
-                }
-            ],
-            "actions": [
-                {
-                    "key": "navigate",
-                    "implementation": NavigateAction,
-                    "depends": [
-                        "navigationService"
-                    ]
-                },
-                {
-                    "key": "window",
-                    "name": "Open In New Tab",
-                    "implementation": NewTabAction,
-                    "description": "Open in a new browser tab",
-                    "category": [
-                        "view-control",
-                        "contextual"
-                    ],
-                    "depends": [
-                        "urlService",
-                        "$window"
-                    ],
-                    "group": "windowing",
-                    "cssClass": "icon-new-window",
-                    "priority": "preferred"
-                },
-                {
-                    "key": "fullscreen",
-                    "implementation": FullscreenAction,
-                    "category": "view-control",
-                    "group": "windowing",
-                    "priority": "default"
-                }
-            ],
-            "views": [
-                {
-                    "key": "items",
-                    "name": "Grid",
-                    "cssClass": "icon-thumbs-strip",
-                    "description": "Grid of available items",
-                    "template": itemsTemplate,
-                    "uses": [
-                        "composition"
-                    ],
-                    "gestures": [
-                        "drop"
-                    ],
-                    "type": "folder",
-                    "editable": false
-                }
-            ],
-            "runs": [
-                {
-                    "implementation": WindowTitler,
-                    "depends": [
-                        "navigationService",
-                        "$rootScope",
-                        "$document"
-                    ]
-                },
-                {
-                    "implementation": OrphanNavigationHandler,
-                    "depends": [
-                        "throttle",
-                        "topic",
-                        "navigationService"
-                    ]
-                }
-            ],
-            "licenses": [
-                {
-                    "name": "screenfull.js",
-                    "version": "1.2.0",
-                    "description": "Wrapper for cross-browser usage of fullscreen API",
-                    "author": "Sindre Sorhus",
-                    "website": "https://github.com/sindresorhus/screenfull.js/",
-                    "copyright": "Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)",
-                    "license": "license-mit",
-                    "link": "https://github.com/sindresorhus/screenfull.js/blob/gh-pages/license"
-                }
-            ]
+    return {
+        name:"platform/commonUI/browse",
+        definition: {
+            "extensions": {
+                "routes": [
+                ],
+                "constants": [
+                    {
+                        "key": "DEFAULT_PATH",
+                        "value": "mine",
+                        "priority": "fallback"
+                    }
+                ],
+                "representations": [
+                    {
+                        "key": "browse-object",
+                        "template": browseObjectTemplate,
+                        "gestures": [
+                            "drop"
+                        ],
+                        "uses": [
+                            "view"
+                        ]
+                    },
+                    {
+                        "key": "object-header",
+                        "template": objectHeaderTemplate,
+                        "uses": [
+                            "type"
+                        ]
+                    },
+                    {
+                        "key": "object-header-frame",
+                        "template": objectHeaderFrameTemplate,
+                        "uses": [
+                            "type"
+                        ]
+                    },
+                    {
+                        "key": "menu-arrow",
+                        "template": menuArrowTemplate,
+                        "uses": [
+                            "action"
+                        ],
+                        "gestures": [
+                            "menu"
+                        ]
+                    },
+                    {
+                        "key": "back-arrow",
+                        "uses": [
+                            "context"
+                        ],
+                        "template": backArrowTemplate
+                    },
+                    {
+                        "key": "object-properties",
+                        "template": objectPropertiesTemplate
+                    },
+                    {
+                        "key": "inspector-region",
+                        "template": inspectorRegionTemplate
+                    }
+                ],
+                "services": [
+                    {
+                        "key": "navigationService",
+                        "implementation": NavigationService,
+                        "depends": [
+                            "$window"
+                        ]
+                    }
+                ],
+                "actions": [
+                    {
+                        "key": "navigate",
+                        "implementation": NavigateAction,
+                        "depends": [
+                            "navigationService"
+                        ]
+                    },
+                    {
+                        "key": "window",
+                        "name": "Open In New Tab",
+                        "implementation": NewTabAction,
+                        "description": "Open in a new browser tab",
+                        "category": [
+                            "view-control",
+                            "contextual"
+                        ],
+                        "depends": [
+                            "urlService",
+                            "$window"
+                        ],
+                        "group": "windowing",
+                        "cssClass": "icon-new-window",
+                        "priority": "preferred"
+                    }
+                ],
+                "runs": [
+                    {
+                        "implementation": OrphanNavigationHandler,
+                        "depends": [
+                            "throttle",
+                            "topic",
+                            "navigationService"
+                        ]
+                    }
+                ],
+                "templates": [
+                    {
+                        key: "browseRoot",
+                        template: browseTemplate
+                    },
+                    {
+                        key: "browseObject",
+                        template: browseObjectTemplate
+                    },
+                    {
+                        key: "inspectorRegion",
+                        template: inspectorRegionTemplate
+                    }
+                ]
+            }
         }
-    });
+    };
 });

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

@@ -66,5 +66,4 @@
             </mct-representation>
         </div>
     </div>
-    <mct-include key="'conductor'" class="abs holder flex-elem flex-fixed l-flex-row l-time-conductor-holder"></mct-include>
 </div>

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

@@ -1,45 +0,0 @@
-<!--
- Open MCT, Copyright (c) 2014-2018, United States Government
- as represented by the Administrator of the National Aeronautics and Space
- Administration. All rights reserved.
-
- Open MCT is licensed under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
- Open MCT includes source code licensed under additional open source
- licenses. See the Open Source Licenses file (LICENSES.md) included with
- this source code distribution or the Licensing information page available
- at runtime from the About dialog for additional information.
--->
-<!-- For selected, add class 'selected' to outer div -->
-<div class='item grid-item' ng-click='action.perform("navigate")'>
-    <div class='contents abs'>
-        <div class='top-bar bar abs'>
-            <span class='icon-people' title='Shared'></span>
-            <mct-representation class="desktop-hide" key="'info-button'" mct-object="domainObject"></mct-representation>
-        </div>
-        <div class='item-main abs lg'>
-            <span class="t-item-icon" ng-class="{ 'l-icon-link':location.isLink() }">
-                <span class="t-item-icon-glyph ng-binding {{type.getCssClass()}}"></span>
-            </span>
-            <div class='abs item-open icon-pointer-right'></div>
-        </div>
-        <div class='bottom-bar bar abs'>
-            <div class='title'>{{model.name}}</div>
-            <div class='details'>
-                <span>{{type.getName()}}</span>
-                <span ng-show="model.composition !== undefined">
-                    - {{model.composition.length}} Item<span ng-show="model.composition.length > 1">s</span>
-                </span>
-            </div>
-        </div>
-    </div>
-</div>

platform/commonUI/browse/res/templates/items/items.html

@@ -1,27 +0,0 @@
-<!--
- Open MCT, Copyright (c) 2014-2018, United States Government
- as represented by the Administrator of the National Aeronautics and Space
- Administration. All rights reserved.
-
- Open MCT is licensed under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
- Open MCT includes source code licensed under additional open source
- licenses. See the Open Source Licenses file (LICENSES.md) included with
- this source code distribution or the Licensing information page available
- at runtime from the About dialog for additional information.
--->
-<div class='items-holder grid abs'>
-    <mct-representation key="'grid-item'"
-                        ng-repeat="childObject in composition"
-                        mct-object="childObject">
-    </mct-representation>
-</div>

platform/commonUI/browse/src/BrowseController.js

@@ -1,214 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * This bundle implements Browse mode.
- * @namespace platform/commonUI/browse
- */
-define(
-    ['lodash'],
-    function (_) {
-
-        /**
-         * The BrowseController is used to populate the initial scope in Browse
-         * mode. It loads the root object from the objectService and makes it
-         * available in the scope for Angular template's; this is the point at
-         * which Angular templates first have access to the domain object
-         * hierarchy.
-         *
-         * @memberof platform/commonUI/browse
-         * @constructor
-         */
-        function BrowseController(
-            $scope,
-            $route,
-            $location,
-            objectService,
-            navigationService,
-            urlService,
-            defaultPath
-        ) {
-            var initialPath = ($route.current.params.ids || defaultPath).split("/"),
-                currentIds;
-
-            $scope.treeModel = {
-                selectedObject: undefined,
-                onSelection: function (object) {
-                    navigationService.setNavigation(object, true);
-                },
-                allowSelection: function (object) {
-                    var domainObjectInView = navigationService.getNavigation(),
-                        isInEditMode = domainObjectInView.getCapability('status').get('editing');
-
-                    if (isInEditMode) {
-
-                        var actions = object.getCapability('action'),
-                            previewAction = actions.getActions({key: 'mct-preview-action'})[0];
-
-                        if (previewAction && previewAction.perform) {
-                            previewAction.perform();
-                            return false;
-                        } else {
-                            return navigationService.shouldNavigate();
-                        }
-
-                    } else {
-                        return true;
-                    }
-                }
-            };
-
-            function idsForObject(domainObject) {
-                return urlService
-                    .urlForLocation("", domainObject)
-                    .replace('/', '');
-            }
-
-            // Find an object in an array of objects.
-            function findObject(domainObjects, id) {
-                var i;
-                for (i = 0; i < domainObjects.length; i += 1) {
-                    if (domainObjects[i].getId() === id) {
-                        return domainObjects[i];
-                    }
-                }
-            }
-
-            // helper, fetch a single object from the object service.
-            function getObject(id) {
-                return objectService.getObjects([id])
-                    .then(function (results) {
-                        return results[id];
-                    });
-            }
-
-            // recursively locate and return an object inside of a container
-            // via a path.  If at any point in the recursion it fails to find
-            // the next object, it will return the parent.
-            function findViaComposition(containerObject, path) {
-                var nextId = path.shift();
-                if (!nextId) {
-                    return containerObject;
-                }
-                return containerObject.useCapability('composition')
-                    .then(function (composees) {
-                        var nextObject = findObject(composees, nextId);
-                        if (!nextObject) {
-                            return containerObject;
-                        }
-                        if (!nextObject.hasCapability('composition')) {
-                            return nextObject;
-                        }
-                        return findViaComposition(nextObject, path);
-                    });
-            }
-
-            function navigateToObject(desiredObject) {
-                $scope.navigatedObject = desiredObject;
-                $scope.treeModel.selectedObject = desiredObject;
-                currentIds = idsForObject(desiredObject);
-                $route.current.pathParams.ids = currentIds;
-                $location.path('/browse/' + currentIds);
-            }
-
-            function getLastChildIfRoot(object) {
-                if (object.getId() !== 'ROOT') {
-                    return object;
-                }
-                return object.useCapability('composition')
-                    .then(function (composees) {
-                        return composees[composees.length - 1];
-                    });
-            }
-
-            function navigateToPath(path) {
-                return getObject('ROOT')
-                    .then(function (root) {
-                        return findViaComposition(root, path);
-                    })
-                    .then(getLastChildIfRoot)
-                    .then(function (object) {
-                        navigationService.setNavigation(object);
-                    });
-            }
-
-            getObject('ROOT')
-                .then(function (root) {
-                    $scope.domainObject = root;
-                    navigateToPath(initialPath);
-                });
-
-            // Handle navigation events from view service.  Only navigates
-            // if path has changed.
-            function navigateDirectlyToModel(domainObject) {
-                var newIds = idsForObject(domainObject);
-                if (currentIds !== newIds) {
-                    currentIds = newIds;
-                    navigateToObject(domainObject);
-                }
-            }
-
-            // Listen for changes in navigation state.
-            navigationService.addListener(navigateDirectlyToModel);
-
-            // Listen for route changes which are caused by browser events
-            // (e.g. bookmarks to pages in OpenMCT) and prevent them.  Instead,
-            // navigate to the path ourselves, which results in it being
-            // properly set.
-            $scope.$on('$routeChangeStart', function (event, route, oldRoute) {
-                if (route.$$route === $route.current.$$route) {
-                    if (route.pathParams.ids &&
-                        route.pathParams.ids !== $route.current.pathParams.ids) {
-
-                        var otherParams = _.omit(route.params, 'ids');
-                        var oldOtherParams = _.omit(oldRoute.params, 'ids');
-                        var deletedParams = _.omit(oldOtherParams, _.keys(otherParams));
-
-                        event.preventDefault();
-
-                        navigateToPath(route.pathParams.ids.split('/'))
-                            .then(function () {
-                                if (!_.isEqual(otherParams, oldOtherParams)) {
-                                    _.forEach(otherParams, function (v, k) {
-                                        $location.search(k, v);
-                                    });
-                                    _.forEach(deletedParams, function (k) {
-                                        $location.search(k, null);
-                                    });
-                                }
-                            });
-                    } else {
-                        navigateToPath([]);
-                    }
-                }
-            });
-
-            // Clean up when the scope is destroyed
-            $scope.$on("$destroy", function () {
-                navigationService.removeListener(navigateDirectlyToModel);
-            });
-        }
-
-        return BrowseController;
-    }
-);
-

platform/commonUI/browse/src/BrowseObjectController.js

@@ -1,74 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    [],
-    function () {
-
-        /**
-         * Controller for the `browse-object` representation of a domain
-         * object (the right-hand side of Browse mode.)
-         * @memberof platform/commonUI/browse
-         * @constructor
-         */
-        function BrowseObjectController($scope, $location, $route) {
-            var navigatedObject;
-            function setViewForDomainObject(domainObject) {
-
-                var locationViewKey = $location.search().view;
-
-                function selectViewIfMatching(view) {
-                    if (view.key === locationViewKey) {
-                        $scope.representation = $scope.representation || {};
-                        $scope.representation.selected = view;
-                    }
-                }
-
-                if (locationViewKey) {
-                    ((domainObject && domainObject.useCapability('view')) || [])
-                        .forEach(selectViewIfMatching);
-                }
-                navigatedObject = domainObject;
-            }
-
-            function updateQueryParam(viewKey) {
-                if (viewKey && $location.search().view !== viewKey) {
-                    $location.search('view', viewKey);
-                }
-            }
-
-            $scope.$watch('domainObject', setViewForDomainObject);
-            $scope.$watch('representation.selected.key', updateQueryParam);
-            $scope.$on('$locationChangeSuccess', function () {
-                setViewForDomainObject($scope.domainObject);
-            });
-
-            $scope.doAction = function (action) {
-                return $scope[action] && $scope[action]();
-            };
-
-        }
-
-        return BrowseObjectController;
-    }
-);
-

platform/commonUI/browse/src/InspectorPaneController.js

@@ -1,78 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-
-define(
-    ["./PaneController"],
-    function (PaneController) {
-
-        /**
-         * Pane controller that reveals inspector, if hidden, when object
-         * switches to edit mode.
-         *
-         * @param $scope
-         * @param agentService
-         * @param $window
-         * @param navigationService
-         * @constructor
-         */
-        function InspectorPaneController($scope, agentService, $window, navigationService, $location, $attrs) {
-            PaneController.call(this, $scope, agentService, $window, $location, $attrs);
-            var statusListener,
-                self = this;
-
-            function showInspector(statuses) {
-                if (statuses.indexOf('editing') !== -1 && !self.visible()) {
-                    self.toggle();
-                }
-            }
-
-            function attachStatusListener(domainObject) {
-                // Remove existing status listener if existing
-                if (statusListener) {
-                    statusListener();
-                }
-
-                if (domainObject.hasCapability("status")) {
-                    statusListener = domainObject.getCapability("status").listen(showInspector);
-                }
-                return statusListener;
-            }
-
-            var domainObject = navigationService.getNavigation();
-            if (domainObject) {
-                attachStatusListener(domainObject);
-            }
-
-            navigationService.addListener(attachStatusListener);
-
-            $scope.$on("$destroy", function () {
-                statusListener();
-                navigationService.removeListener(attachStatusListener);
-            });
-        }
-
-        InspectorPaneController.prototype = Object.create(PaneController.prototype);
-
-        return InspectorPaneController;
-    }
-);

platform/commonUI/browse/src/MenuArrowController.js

@@ -1,59 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * Module defining MenuArrowController. Created by shale on 06/30/2015.
- */
-define(
-    [],
-    function () {
-
-        /**
-         * A left-click on the menu arrow should display a
-         * context menu. This controller launches the context
-         * menu.
-         * @memberof platform/commonUI/browse
-         * @constructor
-         */
-        function MenuArrowController($scope) {
-            this.$scope = $scope;
-        }
-
-        /**
-         * Show a context menu for the domain object in this scope.
-         *
-         * @param event the browser event which caused this (used to
-         *        position the menu)
-         */
-        MenuArrowController.prototype.showMenu = function (event) {
-            var actionContext = {
-                key: 'menu',
-                domainObject: this.$scope.domainObject,
-                event: event
-            };
-
-            this.$scope.domainObject.getCapability('action').perform(actionContext);
-        };
-
-        return MenuArrowController;
-    }
-);

platform/commonUI/browse/src/ObjectHeaderController.js

@@ -1,92 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    [],
-    function () {
-
-        /**
-         * Controller to provide the ability to inline edit an object name.
-         *
-         * @constructor
-         * @memberof platform/commonUI/browse
-         */
-        function ObjectHeaderController($scope) {
-            this.$scope = $scope;
-            this.domainObject = $scope.domainObject;
-            this.editable = this.allowEdit();
-        }
-
-        /**
-         * Updates the object name on blur and enter keypress events.
-         *
-         * @param event the mouse event
-         */
-        ObjectHeaderController.prototype.updateName = function (event) {
-            if (!event || !event.currentTarget) {
-                return;
-            }
-
-            if (event.type === 'blur') {
-                this.updateModel(event);
-            } else if (event.which === 13) {
-                this.updateModel(event);
-                event.currentTarget.blur();
-                window.getSelection().removeAllRanges();
-            }
-        };
-
-        /**
-         * Updates the model.
-         *
-         * @param event the mouse event
-         * @param private
-         */
-        ObjectHeaderController.prototype.updateModel = function (event) {
-            var name = event.currentTarget.textContent.replace(/\n/g, ' ');
-
-            if (name.length === 0) {
-                name = "Unnamed " + this.domainObject.getCapability("type").typeDef.name;
-                event.currentTarget.textContent = name;
-            }
-
-            if (name !== this.domainObject.getModel().name) {
-                this.domainObject.getCapability('mutation').mutate(function (model) {
-                    model.name = name;
-                });
-            }
-        };
-
-        /**
-         * Checks if the domain object is editable.
-         *
-         * @private
-         * @return true if object is editable
-         */
-        ObjectHeaderController.prototype.allowEdit = function () {
-            var type = this.domainObject && this.domainObject.getCapability('type');
-            return !!(type && type.hasFeature('creation'));
-        };
-
-        return ObjectHeaderController;
-    }
-);

platform/commonUI/browse/src/PaneController.js

@@ -1,88 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-
-define(
-    [],
-    function () {
-        var navigationListenerAdded = false;
-        /**
-         * Controller to provide the ability to show/hide the tree in
-         * Browse mode.
-         * @constructor
-         * @memberof platform/commonUI/browse
-         */
-        function PaneController($scope, agentService, $window, $location, $attrs, navigationService) {
-            var self = this;
-            this.agentService = agentService;
-            var hideParameterPresent = $location.search().hasOwnProperty($attrs.hideParameter);
-
-            if ($attrs.hideParameter && hideParameterPresent) {
-                this.state = false;
-                $location.search($attrs.hideParameter, undefined);
-            } else {
-                this.state = true;
-            }
-
-            /**
-             * Callback to invoke when any selection occurs in the tree.
-             * This controller can be passed in as the `parameters` object
-             * to the tree representation.
-             *
-             * @property {Function} callback
-             * @memberof platform/commonUI/browse.PaneController#
-             */
-            this.callback = function () {
-                // Note that, since this is a callback to pass, this is not
-                // declared as a method but as a property which happens to
-                // be a function.
-                if (agentService.isPhone() && agentService.isPortrait()) {
-                    // On phones, trees should collapse in portrait mode
-                    // when something is navigated-to.
-                    self.state = false;
-                }
-            };
-
-            if (navigationService && navigationService.addListener && !navigationListenerAdded) {
-                navigationService.addListener(this.callback);
-                navigationListenerAdded = true;
-            }
-        }
-
-        /**
-         * Toggle the visibility of the pane.
-         */
-        PaneController.prototype.toggle = function () {
-            this.state = !this.state;
-        };
-
-        /**
-         * Get the desired visibility state of the pane.
-         * @returns {boolean} true when visible
-         */
-        PaneController.prototype.visible = function () {
-            return !!this.state;
-        };
-
-        return PaneController;
-    }
-);

platform/commonUI/browse/src/navigation/OrphanNavigationHandler.js

@@ -58,7 +58,7 @@ define([], function () {
 
         function checkNavigation() {
             var navigatedObject = navigationService.getNavigation();
-            if (navigatedObject.hasCapability('context')) {
+            if (navigatedObject && navigatedObject.hasCapability('context')) {
                 if (!navigatedObject.getCapability('editor').isEditContextRoot()) {
                     preventOrphanNavigation(navigatedObject);
                 }

platform/commonUI/browse/src/windowing/FullscreenAction.js

@@ -1,64 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * Module defining FullscreenAction. Created by vwoeltje on 11/18/14.
- */
-define(
-    ["screenfull"],
-    function (screenfull) {
-
-        var ENTER_FULLSCREEN = "Enter full screen mode",
-            EXIT_FULLSCREEN = "Exit full screen mode";
-
-        /**
-         * The fullscreen action toggles between fullscreen display
-         * and regular in-window display.
-         * @memberof platform/commonUI/browse
-         * @constructor
-         * @implements {Action}
-         */
-        function FullscreenAction(context) {
-            this.context = context;
-        }
-
-        FullscreenAction.prototype.perform = function () {
-            screenfull.toggle();
-        };
-
-        FullscreenAction.prototype.getMetadata = function () {
-            // We override getMetadata, because the icon cssClass and
-            // description need to be determined at run-time
-            // based on whether or not we are currently
-            // full screen.
-            var metadata = Object.create(FullscreenAction);
-            metadata.cssClass = screenfull.isFullscreen ? "icon-fullscreen-expand" : "icon-fullscreen-collapse";
-            metadata.description = screenfull.isFullscreen ?
-                EXIT_FULLSCREEN : ENTER_FULLSCREEN;
-            metadata.group = "windowing";
-            metadata.context = this.context;
-            return metadata;
-        };
-
-        return FullscreenAction;
-    }
-);

platform/commonUI/browse/src/windowing/WindowTitler.js

@@ -1,51 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    [],
-    function () {
-
-        /**
-         * Updates the title of the current window to reflect the name
-         * of the currently navigated-to domain object.
-         * @memberof platform/commonUI/browse
-         * @constructor
-         */
-        function WindowTitler(navigationService, $rootScope, $document) {
-            // Look up name of the navigated domain object...
-            function getNavigatedObjectName() {
-                var navigatedObject = navigationService.getNavigation();
-                return navigatedObject && navigatedObject.getModel().name;
-            }
-
-            // Set the window title...
-            function setTitle(name) {
-                $document[0].title = name;
-            }
-
-            // Watch the former, and invoke the latter
-            $rootScope.$watch(getNavigatedObjectName, setTitle);
-        }
-
-        return WindowTitler;
-    }
-);

platform/commonUI/browse/test/BrowseControllerSpec.js

@@ -1,266 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global console*/
-
-/**
- * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
- */
-define(
-    [
-        "../src/BrowseController",
-        "../src/navigation/NavigationService"
-    ],
-    function (
-        BrowseController,
-        NavigationService
-    ) {
-
-        describe("The browse controller", function () {
-            var mockScope,
-                mockRoute,
-                mockLocation,
-                mockObjectService,
-                mockNavigationService,
-                mockRootObject,
-                mockUrlService,
-                mockDefaultRootObject,
-                mockOtherDomainObject,
-                mockNextObject,
-                testDefaultRoot,
-                controller;
-
-            function waitsForNavigation() {
-                return new Promise(function (resolve) {
-                    mockNavigationService.setNavigation.and.callFake(function (obj) {
-                        var returnValue;
-                        try {
-                            returnValue = NavigationService.prototype.setNavigation.call(mockNavigationService, obj);
-                        } catch (err) {
-                            console.error(err);
-                            //Not rejecting because 'setNavigation' has been called, which is what's being tested here.
-                            //Rejecting will fail tests.
-                        }
-                        resolve();
-                        return returnValue;
-                    });
-                });
-            }
-
-            function instantiateController() {
-                controller = new BrowseController(
-                    mockScope,
-                    mockRoute,
-                    mockLocation,
-                    mockObjectService,
-                    mockNavigationService,
-                    mockUrlService,
-                    testDefaultRoot
-                );
-            }
-
-            beforeEach(function () {
-                testDefaultRoot = "some-root-level-domain-object";
-
-                mockScope = jasmine.createSpyObj(
-                    "$scope",
-                    ["$on", "$watch"]
-                );
-                mockRoute = { current: { params: {}, pathParams: {} } };
-                mockUrlService = jasmine.createSpyObj(
-                    "urlService",
-                    ["urlForLocation"]
-                );
-                mockUrlService.urlForLocation.and.callFake(function (mode, object) {
-                    if (object === mockDefaultRootObject) {
-                        return [mode, testDefaultRoot].join('/');
-                    }
-                    if (object === mockOtherDomainObject) {
-                        return [mode, 'other'].join('/');
-                    }
-                    if (object === mockNextObject) {
-                        return [mode, testDefaultRoot, 'next'].join('/');
-                    }
-                    throw new Error('Tried to get url for unexpected object');
-                });
-                mockLocation = jasmine.createSpyObj(
-                    "$location",
-                    ["path"]
-                );
-                mockObjectService = jasmine.createSpyObj(
-                    "objectService",
-                    ["getObjects"]
-                );
-                mockNavigationService = new NavigationService({});
-                [
-                    "getNavigation",
-                    "setNavigation",
-                    "addListener",
-                    "removeListener"
-                ].forEach(function (method) {
-                    spyOn(mockNavigationService, method)
-                        .and.callThrough();
-                });
-                mockRootObject = jasmine.createSpyObj(
-                    "rootObjectContainer",
-                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
-                );
-                mockDefaultRootObject = jasmine.createSpyObj(
-                    "defaultRootObject",
-                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
-                );
-                mockOtherDomainObject = jasmine.createSpyObj(
-                    "otherDomainObject",
-                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
-                );
-                mockNextObject = jasmine.createSpyObj(
-                    "nestedDomainObject",
-                    ["getId", "getCapability", "getModel", "useCapability", "hasCapability"]
-                );
-                mockObjectService.getObjects.and.returnValue(Promise.resolve({
-                    ROOT: mockRootObject
-                }));
-                mockRootObject.useCapability.and.returnValue(Promise.resolve([
-                    mockOtherDomainObject,
-                    mockDefaultRootObject
-                ]));
-                mockRootObject.hasCapability.and.returnValue(true);
-                mockDefaultRootObject.useCapability.and.returnValue(Promise.resolve([
-                    mockNextObject
-                ]));
-                mockDefaultRootObject.hasCapability.and.returnValue(true);
-                mockOtherDomainObject.hasCapability.and.returnValue(false);
-                mockNextObject.useCapability.and.returnValue(undefined);
-                mockNextObject.hasCapability.and.returnValue(false);
-                mockNextObject.getId.and.returnValue("next");
-                mockDefaultRootObject.getId.and.returnValue(testDefaultRoot);
-
-                instantiateController();
-                return waitsForNavigation();
-            });
-
-            it("uses composition to set the navigated object, if there is none", function () {
-                instantiateController();
-                return waitsForNavigation().then(function () {
-                    expect(mockNavigationService.setNavigation)
-                    .toHaveBeenCalledWith(mockDefaultRootObject);
-                });
-            });
-
-            it("navigates to a root-level object, even when default path is not found", function () {
-                mockDefaultRootObject.getId
-                    .and.returnValue("something-other-than-the-" + testDefaultRoot);
-                instantiateController();
-
-                return waitsForNavigation().then(function () {
-                    expect(mockNavigationService.setNavigation)
-                    .toHaveBeenCalledWith(mockDefaultRootObject);
-                });
-            });
-
-            it("does not try to override navigation", function () {
-                mockNavigationService.getNavigation.and.returnValue(mockDefaultRootObject);
-                instantiateController();
-                return waitsForNavigation().then(function () {
-                    expect(mockScope.navigatedObject).toBe(mockDefaultRootObject);
-                });
-            });
-
-            it("updates scope when navigated object changes", function () {
-                // Should have registered a listener - call it
-                mockNavigationService.addListener.calls.mostRecent().args[0](
-                    mockOtherDomainObject
-                );
-                expect(mockScope.navigatedObject).toEqual(mockOtherDomainObject);
-            });
-
-
-            it("releases its navigation listener when its scope is destroyed", function () {
-                expect(mockScope.$on).toHaveBeenCalledWith(
-                    "$destroy",
-                    jasmine.any(Function)
-                );
-                mockScope.$on.calls.mostRecent().args[1]();
-
-                // Should remove the listener it added earlier
-                expect(mockNavigationService.removeListener).toHaveBeenCalledWith(
-                    mockNavigationService.addListener.calls.mostRecent().args[0]
-                );
-            });
-
-            it("uses route parameters to choose initially-navigated object", function () {
-                mockRoute.current.params.ids = testDefaultRoot + "/next";
-                instantiateController();
-                return waitsForNavigation().then(function () {
-                    expect(mockScope.navigatedObject).toBe(mockNextObject);
-                    expect(mockNavigationService.setNavigation)
-                        .toHaveBeenCalledWith(mockNextObject);
-                });
-            });
-
-            it("handles invalid IDs by going as far as possible", function () {
-                // Idea here is that if we get a bad path of IDs,
-                // browse controller should traverse down it until
-                // it hits an invalid ID.
-                mockRoute.current.params.ids = testDefaultRoot + "/junk";
-                instantiateController();
-                return waitsForNavigation().then(function () {
-                    expect(mockScope.navigatedObject).toBe(mockDefaultRootObject);
-                    expect(mockNavigationService.setNavigation)
-                        .toHaveBeenCalledWith(mockDefaultRootObject);
-                });
-            });
-
-            it("handles compositionless objects by going as far as possible", function () {
-                // Idea here is that if we get a path which passes
-                // through an object without a composition, browse controller
-                // should stop at it since remaining IDs cannot be loaded.
-                mockRoute.current.params.ids = testDefaultRoot + "/next/junk";
-                instantiateController();
-                return waitsForNavigation().then(function () {
-                    expect(mockScope.navigatedObject).toBe(mockNextObject);
-                    expect(mockNavigationService.setNavigation)
-                        .toHaveBeenCalledWith(mockNextObject);
-                });
-            });
-
-            it("updates the displayed route to reflect current navigation", function () {
-                // In order to trigger a route update and not a route change,
-                // the current route must be updated before location.path is
-                // called.
-                expect(mockRoute.current.pathParams.ids)
-                    .not
-                    .toBe(testDefaultRoot + '/next');
-                mockLocation.path.and.callFake(function () {
-                    expect(mockRoute.current.pathParams.ids)
-                        .toBe(testDefaultRoot + '/next');
-                });
-                mockNavigationService.addListener.calls.mostRecent().args[0](
-                    mockNextObject
-                );
-                expect(mockLocation.path).toHaveBeenCalledWith(
-                    '/browse/' + testDefaultRoot + '/next'
-                );
-            });
-
-        });
-    }
-);

platform/commonUI/browse/test/BrowseObjectControllerSpec.js

@@ -1,93 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    ["../src/BrowseObjectController"],
-    function (BrowseObjectController) {
-
-        describe("The browse object controller", function () {
-            var mockScope,
-                mockLocation,
-                mockRoute,
-                controller;
-
-            // Utility function; look for a $watch on scope and fire it
-            function fireWatch(expr, value) {
-                mockScope.$watch.calls.all().forEach(function (call) {
-                    if (call.args[0] === expr) {
-                        call.args[1](value);
-                    }
-                });
-            }
-
-            beforeEach(function () {
-                mockScope = jasmine.createSpyObj(
-                    "$scope",
-                    ["$on", "$watch"]
-                );
-                mockRoute = { current: { params: {} } };
-                mockLocation = jasmine.createSpyObj(
-                    "$location",
-                    ["path", "search"]
-                );
-                mockLocation.search.and.returnValue({});
-
-                controller = new BrowseObjectController(
-                    mockScope,
-                    mockLocation,
-                    mockRoute
-                );
-            });
-
-            it("updates query parameters when selected view changes", function () {
-                fireWatch("representation.selected.key", "xyz");
-                expect(mockLocation.search).toHaveBeenCalledWith('view', "xyz");
-
-                // Allows the path index to be checked
-                // prior to setting $route.current
-                mockLocation.path.and.returnValue("/browse/");
-            });
-
-            it("sets the active view from query parameters", function () {
-                var mockDomainObject = jasmine.createSpyObj(
-                        "domainObject",
-                        ['getId', 'getModel', 'getCapability', 'useCapability']
-                    ),
-                    testViews = [
-                        { key: 'abc' },
-                        { key: 'def', someKey: 'some value' },
-                        { key: 'xyz' }
-                    ];
-
-                mockDomainObject.useCapability.and.callFake(function (c) {
-                    return (c === 'view') && testViews;
-                });
-                mockLocation.search.and.returnValue({ view: 'def' });
-
-                fireWatch('domainObject', mockDomainObject);
-                expect(mockScope.representation.selected)
-                    .toEqual(testViews[1]);
-            });
-
-        });
-    }
-);

platform/commonUI/browse/test/InspectorPaneControllerSpec.js

@@ -1,103 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    ["../src/InspectorPaneController"],
-    function (InspectorPaneController) {
-
-        describe("The InspectorPaneController", function () {
-            var mockScope,
-                mockAgentService,
-                mockDomainObject,
-                mockWindow,
-                mockStatusCapability,
-                mockNavigationService,
-                mockNavigationUnlistener,
-                mockStatusUnlistener,
-                controller,
-                mockLocation,
-                mockAttrs;
-
-            beforeEach(function () {
-                mockScope = jasmine.createSpyObj("$scope", ["$on"]);
-                mockWindow = jasmine.createSpyObj("$window", ["open"]);
-                mockAgentService = jasmine.createSpyObj(
-                    "agentService",
-                    ["isMobile", "isPhone", "isTablet", "isPortrait", "isLandscape"]
-                );
-
-                mockNavigationUnlistener = jasmine.createSpy("navigationUnlistener");
-                mockNavigationService = jasmine.createSpyObj(
-                    "navigationService",
-                    ["getNavigation", "addListener"]
-                );
-                mockNavigationService.addListener.and.returnValue(mockNavigationUnlistener);
-
-                mockStatusUnlistener = jasmine.createSpy("statusUnlistener");
-                mockStatusCapability = jasmine.createSpyObj(
-                    "statusCapability",
-                    ["listen"]
-                );
-                mockStatusCapability.listen.and.returnValue(mockStatusUnlistener);
-
-                mockDomainObject = jasmine.createSpyObj(
-                    'domainObject',
-                    [
-                        'getId',
-                        'getModel',
-                        'getCapability',
-                        'hasCapability'
-                    ]
-                );
-                mockDomainObject.getId.and.returnValue("domainObject");
-                mockDomainObject.getModel.and.returnValue({});
-                mockDomainObject.hasCapability.and.returnValue(true);
-                mockDomainObject.getCapability.and.returnValue(mockStatusCapability);
-
-                mockLocation = jasmine.createSpyObj('location', ['search']);
-                mockLocation.search.and.returnValue({});
-
-                mockAttrs = {};
-
-                controller = new InspectorPaneController(mockScope, mockAgentService, mockWindow, mockNavigationService, mockLocation, mockAttrs);
-            });
-
-            it("listens for changes to navigation and attaches a status" +
-                " listener", function () {
-                expect(mockNavigationService.addListener).toHaveBeenCalledWith(jasmine.any(Function));
-                mockNavigationService.addListener.calls.mostRecent().args[0](mockDomainObject);
-                expect(mockStatusCapability.listen).toHaveBeenCalledWith(jasmine.any(Function));
-            });
-
-            it("if hidden, shows the inspector when domain object switches to" +
-                " edit mode", function () {
-                controller.toggle();
-                // test pre-condition that inspector is hidden
-                expect(controller.visible()).toBe(false);
-                mockNavigationService.addListener.calls.mostRecent().args[0](mockDomainObject);
-                mockStatusCapability.listen.calls.mostRecent().args[0](["editing"]);
-                expect(controller.visible()).toBe(true);
-            });
-
-        });
-    }
-);

platform/commonUI/browse/test/MenuArrowControllerSpec.js

@@ -1,79 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * MenuArrowControllerSpec. Created by shale on 07/02/2015.
- */
-define(
-    ["../src/MenuArrowController"],
-    function (MenuArrowController) {
-
-        describe("The menu arrow controller ", function () {
-            var mockScope,
-                mockDomainObject,
-                mockEvent,
-                mockContextMenuAction,
-                mockActionContext,
-                controller;
-
-            beforeEach(function () {
-                mockScope = jasmine.createSpyObj(
-                    "$scope",
-                    [""]
-                );
-                mockDomainObject = jasmine.createSpyObj(
-                    "domainObject",
-                    ["getCapability"]
-                );
-                mockEvent = jasmine.createSpyObj(
-                    "event",
-                    ["preventDefault"]
-                );
-                mockContextMenuAction = jasmine.createSpyObj(
-                    "action",
-                    ["perform", "getActions"]
-                );
-                mockActionContext = jasmine.createSpyObj(
-                    "actionContext",
-                    [""]
-                );
-
-                mockActionContext.domainObject = mockDomainObject;
-                mockActionContext.event = mockEvent;
-                mockScope.domainObject = mockDomainObject;
-                mockDomainObject.getCapability.and.returnValue(mockContextMenuAction);
-                mockContextMenuAction.perform.and.returnValue(jasmine.any(Function));
-
-                controller = new MenuArrowController(mockScope);
-            });
-
-            it("calls the context menu action when clicked", function () {
-                // Simulate a click on the menu arrow
-                controller.showMenu(mockEvent);
-
-                // Expect the menu action to be performed
-                expect(mockDomainObject.getCapability).toHaveBeenCalledWith('action');
-                expect(mockContextMenuAction.perform).toHaveBeenCalled();
-            });
-        });
-    }
-);

platform/commonUI/browse/test/ObjectHeaderControllerSpec.js

@@ -1,137 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    ["../src/ObjectHeaderController"],
-    function (ObjectHeaderController) {
-
-        describe("The object header controller", function () {
-            var mockScope,
-                mockDomainObject,
-                mockCapabilities,
-                mockMutationCapability,
-                mockTypeCapability,
-                mockEvent,
-                mockCurrentTarget,
-                model,
-                controller;
-
-            beforeEach(function () {
-                mockMutationCapability = jasmine.createSpyObj("mutation", ["mutate"]);
-                mockTypeCapability = jasmine.createSpyObj("type", ["typeDef", "hasFeature"]);
-                mockTypeCapability.typeDef = { name: ""};
-                mockTypeCapability.hasFeature.and.callFake(function (feature) {
-                    return feature === 'creation';
-                });
-
-                mockCapabilities = {
-                    mutation: mockMutationCapability,
-                    type: mockTypeCapability
-                };
-
-                model = {
-                    name: "Test name"
-                };
-                mockDomainObject = jasmine.createSpyObj("domainObject", ["getCapability", "getModel"]);
-                mockDomainObject.getModel.and.returnValue(model);
-                mockDomainObject.getCapability.and.callFake(function (key) {
-                    return mockCapabilities[key];
-                });
-
-                mockScope = {
-                    domainObject: mockDomainObject
-                };
-
-                mockCurrentTarget = jasmine.createSpyObj("currentTarget", ["blur", "textContent"]);
-                mockCurrentTarget.blur.and.returnValue(mockCurrentTarget);
-
-                mockEvent = {
-                    which: {},
-                    type: {},
-                    currentTarget: mockCurrentTarget
-                };
-
-                controller = new ObjectHeaderController(mockScope);
-            });
-
-            it("updates the model with new name on blur", function () {
-                mockEvent.type = "blur";
-                mockCurrentTarget.textContent = "New name";
-                controller.updateName(mockEvent);
-
-                expect(mockMutationCapability.mutate).toHaveBeenCalled();
-            });
-
-            it("updates the model with a default for blank names", function () {
-                mockEvent.type = "blur";
-                mockCurrentTarget.textContent = "";
-                controller.updateName(mockEvent);
-
-                expect(mockCurrentTarget.textContent.length).not.toEqual(0);
-                expect(mockMutationCapability.mutate).toHaveBeenCalled();
-            });
-
-            it("does not update the model if the same name", function () {
-                mockEvent.type = "blur";
-                mockCurrentTarget.textContent = mockDomainObject.getModel().name;
-                controller.updateName(mockEvent);
-
-                expect(mockMutationCapability.mutate).not.toHaveBeenCalled();
-            });
-
-            it("updates the model on enter keypress event only", function () {
-                mockCurrentTarget.textContent = "New name";
-                controller.updateName(mockEvent);
-
-                expect(mockMutationCapability.mutate).not.toHaveBeenCalled();
-
-                mockEvent.which = 13;
-                controller.updateName(mockEvent);
-
-                expect(mockMutationCapability.mutate).toHaveBeenCalledWith(jasmine.any(Function));
-
-                mockMutationCapability.mutate.calls.mostRecent().args[0](model);
-
-                expect(mockDomainObject.getModel().name).toBe("New name");
-            });
-
-            it("blurs the field on enter key press", function () {
-                mockCurrentTarget.textContent = "New name";
-                mockEvent.which = 13;
-                controller.updateName(mockEvent);
-
-                expect(mockEvent.currentTarget.blur).toHaveBeenCalled();
-            });
-
-            it("allows editting name when object is creatable", function () {
-                expect(controller.allowEdit()).toBe(true);
-            });
-
-            it("disallows editting name when object is non-creatable", function () {
-                mockTypeCapability.hasFeature.and.returnValue(false);
-
-                expect(controller.allowEdit()).toBe(false);
-
-            });
-        });
-    }
-);

platform/commonUI/browse/test/PaneControllerSpec.js

@@ -1,118 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    ["../src/PaneController"],
-    function (PaneController) {
-
-        describe("The PaneController", function () {
-            var mockScope,
-                mockAgentService,
-                mockDomainObjects,
-                mockWindow,
-                controller,
-                mockLocation,
-                mockAttrs;
-
-            // We want to reinstantiate for each test case
-            // because device state can influence constructor-time behavior
-            function instantiateController() {
-                return new PaneController(
-                    mockScope,
-                    mockAgentService,
-                    mockWindow,
-                    mockLocation,
-                    mockAttrs
-                );
-            }
-
-            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"]
-                );
-                mockWindow = jasmine.createSpyObj("$window", ["open"]);
-
-                mockLocation = jasmine.createSpyObj('location', ['search']);
-                mockLocation.search.and.returnValue({});
-
-                mockAttrs = {};
-            });
-
-            it("is initially visible", function () {
-                expect(instantiateController().visible()).toBeTruthy();
-            });
-
-            it("allows visibility to be toggled", function () {
-                controller = instantiateController();
-                controller.toggle();
-                expect(controller.visible()).toBeFalsy();
-                controller.toggle();
-                expect(controller.visible()).toBeTruthy();
-            });
-
-            it("collapses on navigation changes on portrait-oriented phones", function () {
-                mockAgentService.isMobile.and.returnValue(true);
-                mockAgentService.isPhone.and.returnValue(true);
-                mockAgentService.isPortrait.and.returnValue(true);
-                controller = instantiateController();
-                expect(controller.visible()).toBeTruthy();
-
-                // Simulate a change from the tree by invoking controller's
-                controller.callback();
-
-                // Tree should have collapsed
-                expect(controller.visible()).toBeFalsy();
-            });
-
-            describe("specifying hideParameter", function () {
-                beforeEach(function () {
-                    mockAttrs = {hideParameter: 'hideTree'};
-                });
-
-                it("sets pane state to false when in location.search", function () {
-                    mockLocation.search.and.returnValue({'hideTree': true});
-                    expect(instantiateController().visible()).toBe(false);
-                    expect(mockLocation.search).toHaveBeenCalledWith('hideTree', undefined);
-                });
-
-                it("sets state to true when not found in location.search", function () {
-                    mockLocation.search.and.returnValue({});
-                    expect(instantiateController().visible()).toBe(true);
-                    expect(mockLocation.search).not.toHaveBeenCalledWith('hideTree', undefined);
-                });
-            });
-        });
-    }
-);

platform/commonUI/browse/test/navigation/NavigateActionSpec.js

@@ -56,7 +56,7 @@ define([
             return action.perform()
                 .then(function () {
                     expect(mockNavigationService.setNavigation)
-                    .toHaveBeenCalledWith(mockDomainObject, true);
+                        .toHaveBeenCalledWith(mockDomainObject, true);
                 });
         });
 

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

@@ -1,59 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
- */
-define(
-    ["../../src/windowing/FullscreenAction", "screenfull"],
-    function (FullscreenAction, screenfull) {
-
-        describe("The fullscreen action", function () {
-            var action,
-                oldToggle;
-
-            beforeEach(function () {
-                // Screenfull is not shimmed or injected, so
-                // we need to spy on it in the global scope.
-                oldToggle = screenfull.toggle;
-
-                screenfull.toggle = jasmine.createSpy("toggle");
-
-                action = new FullscreenAction({});
-            });
-
-            afterEach(function () {
-                screenfull.toggle = oldToggle;
-            });
-
-            it("toggles fullscreen mode when performed", function () {
-                action.perform();
-                expect(window.screenfull.toggle).toHaveBeenCalled();
-            });
-
-            it("provides displayable metadata", function () {
-                expect(action.getMetadata().cssClass).toBeDefined();
-            });
-
-        });
-    }
-);

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

@@ -46,7 +46,7 @@ define(
                 // tree is opened in a new tab using the
                 // context menu
                 mockContextSelected = jasmine.createSpyObj("context", ["selectedObject",
-                                                               "domainObject"]);
+                    "domainObject"]);
 
                 // Mocks the urlService used to make the new tab's url from a
                 // domainObject and mode
@@ -54,11 +54,11 @@ define(
 
                 // Action done using the current context or mockContextCurrent
                 actionCurrent = new NewTabAction(mockUrlService, mockWindow,
-                                                 mockContextCurrent);
+                    mockContextCurrent);
 
                 // Action done using the selected context or mockContextSelected
                 actionSelected = new NewTabAction(mockUrlService, mockWindow,
-                                                  mockContextSelected);
+                    mockContextSelected);
 
             });
 

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

@@ -1,78 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * WindowTitlerSpec. Created by vwoeltje on 11/6/14.
- */
-define(
-    ["../../src/windowing/WindowTitler"],
-    function (WindowTitler) {
-
-        describe("The window titler", function () {
-            var mockNavigationService,
-                mockRootScope,
-                mockDocument,
-                mockDomainObject,
-                titler;
-
-            beforeEach(function () {
-                mockNavigationService = jasmine.createSpyObj(
-                    'navigationService',
-                    ['getNavigation']
-                );
-                mockRootScope = jasmine.createSpyObj(
-                    '$rootScope',
-                    ['$watch']
-                );
-                mockDomainObject = jasmine.createSpyObj(
-                    'domainObject',
-                    ['getModel']
-                );
-                mockDocument = [{}];
-
-                mockDomainObject.getModel.and.returnValue({ name: 'Test name' });
-                mockNavigationService.getNavigation.and.returnValue(mockDomainObject);
-
-                titler = new WindowTitler(
-                    mockNavigationService,
-                    mockRootScope,
-                    mockDocument
-                );
-            });
-
-            it("listens for changes to the name of the navigated object", function () {
-                expect(mockRootScope.$watch).toHaveBeenCalledWith(
-                    jasmine.any(Function),
-                    jasmine.any(Function)
-                );
-                expect(mockRootScope.$watch.calls.mostRecent().args[0]())
-                    .toEqual('Test name');
-            });
-
-            it("sets the title to the name of the navigated object", function () {
-                mockRootScope.$watch.calls.mostRecent().args[1]("Some name");
-                expect(mockDocument[0].title).toEqual("Some name");
-            });
-
-        });
-    }
-);

platform/commonUI/dialog/bundle.js

@@ -23,14 +23,14 @@
 define([
     "./src/DialogService",
     "./src/OverlayService",
-    "text!./res/templates/overlay-dialog.html",
-    "text!./res/templates/overlay-options.html",
-    "text!./res/templates/dialog.html",
-    "text!./res/templates/overlay-blocking-message.html",
-    "text!./res/templates/message.html",
-    "text!./res/templates/overlay-message-list.html",
-    "text!./res/templates/overlay.html",
-    'legacyRegistry'
+    "./res/templates/overlay-dialog.html",
+    "./res/templates/overlay-options.html",
+    "./res/templates/dialog.html",
+    "./res/templates/overlay-blocking-message.html",
+    "./res/templates/message.html",
+    "./res/templates/notification-message.html",
+    "./res/templates/overlay-message-list.html",
+    "./res/templates/overlay.html"
 ], function (
     DialogService,
     OverlayService,
@@ -39,66 +39,74 @@ define([
     dialogTemplate,
     overlayBlockingMessageTemplate,
     messageTemplate,
+    notificationMessageTemplate,
     overlayMessageListTemplate,
-    overlayTemplate,
-    legacyRegistry
+    overlayTemplate
 ) {
 
-    legacyRegistry.register("platform/commonUI/dialog", {
-        "extensions": {
-            "services": [
-                {
-                    "key": "dialogService",
-                    "implementation": DialogService,
-                    "depends": [
-                        "overlayService",
-                        "$q",
-                        "$log",
-                        "$document"
-                    ]
-                },
-                {
-                    "key": "overlayService",
-                    "implementation": OverlayService,
-                    "depends": [
-                        "$document",
-                        "$compile",
-                        "$rootScope"
-                    ]
-                }
-            ],
-            "templates": [
-                {
-                    "key": "overlay-dialog",
-                    "template": overlayDialogTemplate
-                },
-                {
-                    "key": "overlay-options",
-                    "template": overlayOptionsTemplate
-                },
-                {
-                    "key": "form-dialog",
-                    "template": dialogTemplate
-                },
-                {
-                    "key": "overlay-blocking-message",
-                    "template": overlayBlockingMessageTemplate
-                },
-                {
-                    "key": "message",
-                    "template": messageTemplate
-                },
-                {
-                    "key": "overlay-message-list",
-                    "template": overlayMessageListTemplate
-                }
-            ],
-            "containers": [
-                {
-                    "key": "overlay",
-                    "template": overlayTemplate
-                }
-            ]
+    return {
+        name:"platform/commonUI/dialog",
+        definition: {
+            "extensions": {
+                "services": [
+                    {
+                        "key": "dialogService",
+                        "implementation": DialogService,
+                        "depends": [
+                            "overlayService",
+                            "$q",
+                            "$log",
+                            "$document"
+                        ]
+                    },
+                    {
+                        "key": "overlayService",
+                        "implementation": OverlayService,
+                        "depends": [
+                            "$document",
+                            "$compile",
+                            "$rootScope",
+                            "$timeout"
+                        ]
+                    }
+                ],
+                "templates": [
+                    {
+                        "key": "overlay-dialog",
+                        "template": overlayDialogTemplate
+                    },
+                    {
+                        "key": "overlay-options",
+                        "template": overlayOptionsTemplate
+                    },
+                    {
+                        "key": "form-dialog",
+                        "template": dialogTemplate
+                    },
+                    {
+                        "key": "overlay-blocking-message",
+                        "template": overlayBlockingMessageTemplate
+                    },
+                    {
+                        "key": "message",
+                        "template": messageTemplate
+                    },
+                    {
+                        "key": "notification-message",
+                        "template": notificationMessageTemplate
+                    },
+                    {
+                        "key": "overlay-message-list",
+                        "template": overlayMessageListTemplate
+                    }
+                ],
+                "containers": [
+                    {
+                        "key": "overlay",
+                        "template": overlayTemplate
+                    }
+                ]
+            }
         }
-    });
+    };
 });

platform/commonUI/dialog/res/templates/dialog.html

@@ -19,24 +19,24 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div class="abs top-bar">
-    <div class="dialog-title">{{ngModel.title}}</div>
-    <div class="hint">All fields marked <span class="req icon-asterisk"></span> are required.</div>
+<div class="c-overlay__top-bar">
+    <div class="c-overlay__dialog-title">{{ngModel.title}}</div>
+    <div class="c-overlay__dialog-hint hint">All fields marked <span class="req icon-asterisk"></span> are required.</div>
 </div>
-<div class='abs editor'>
+<div class='c-overlay__contents-main'>
     <mct-form ng-model="ngModel.value"
               structure="ngModel.structure"
               class="validates"
               name="createForm">
     </mct-form>
 </div>
-<div class="abs bottom-bar">
-    <a class='s-button major'
+<div class="c-overlay__button-bar">
+    <a class='c-button c-button--major'
        ng-class="{ disabled: !createForm.$valid }"
        ng-click="ngModel.confirm()">
         OK
     </a>
-    <a class='s-button'
+    <a class='c-button  '
        ng-click="ngModel.cancel()">
         Cancel
     </a>

platform/commonUI/dialog/res/templates/message.html

@@ -1,10 +1,10 @@
-<div class="l-message"
+<div class="c-message"
      ng-class="'message-severity-' + ngModel.severity">
     <div class="w-message-contents">
-        <div class="top-bar">
-            <div class="title">{{ngModel.title}}</div>
+        <div class="c-message__top-bar">
+            <div class="c-message__title">{{ngModel.title}}</div>
         </div>
-        <div class="hint" ng-hide="ngModel.hint === undefined">
+        <div class="c-message__hint" ng-hide="ngModel.hint === undefined">
             {{ngModel.hint}}
             <span ng-if="ngModel.timestamp !== undefined">[{{ngModel.timestamp}}]</span>
         </div>
@@ -16,17 +16,17 @@
                          ng-model="ngModel"
                          ng-show="ngModel.progress !== undefined || ngModel.unknownProgress"></mct-include>
         </div>
-        <div class="bottom-bar">
-            <a ng-repeat="dialogOption in ngModel.options"
-               class="s-button"
+        <div class="c-overlay__button-bar">
+            <button ng-repeat="dialogOption in ngModel.options"
+               class="c-button"
                ng-click="dialogOption.callback()">
                 {{dialogOption.label}}
-            </a>
-            <a class="s-button major"
+            </button>
+            <button class="c-button c-button--major"
                ng-if="ngModel.primaryOption"
                ng-click="ngModel.primaryOption.callback()">
                 {{ngModel.primaryOption.label}}
-            </a>
+            </button>
         </div>
     </div>
-</div>
+</div>

platform/commonUI/dialog/res/templates/notification-message.html

@@ -0,0 +1,25 @@
+<div class="c-message"
+     ng-class="'message-severity-' + ngModel.severity">
+    <div class="w-message-contents">
+        <div class="c-message__top-bar">
+            <div class="c-message__title">{{ngModel.message}}</div>
+        </div>
+        <div class="message-body">
+            <mct-include key="'progress-bar'"
+                         ng-model="ngModel"
+                         ng-show="ngModel.progressPerc !== undefined"></mct-include>
+        </div>
+    </div>
+    <div class="c-overlay__button-bar">
+        <button ng-repeat="dialogOption in ngModel.options"
+                class="c-button"
+                ng-click="dialogOption.callback()">
+            {{dialogOption.label}}
+        </button>
+        <button class="c-button c-button--major"
+                ng-if="ngModel.primaryOption"
+                ng-click="ngModel.primaryOption.callback()">
+            {{ngModel.primaryOption.label}}
+        </button>
+    </div>
+</div>