Context Menu WIP

* Implemented indicators

* WIP

* Fixed templates from notifications example

* Message bar implemented

* Implemented notifications

* Fixed bug with destruction of notifications

* Renamed MessageBanner to NotificationBanner

* Add save success message

* Removed NotificationServiceSpec

* Removed legacy constants from bundle

.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,28 +7,17 @@
  * 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.host = options.host || options.h || 'localhost';
 options.directory = options.directory || options.D || '.';
-    ['include', 'exclude', 'i', 'x'].forEach(function (opt) {
-        options[opt] = options[opt] || [];
-        // Make sure includes/excludes always end up as arrays
-        options[opt] = Array.isArray(options[opt]) ?
-                options[opt] : [options[opt]];
-    });
-    options.include = options.include.concat(options.i);
-    options.exclude = options.exclude.concat(options.x);
 
 // Show command line options
 if (options.help || options.h) {
@@ -36,8 +25,6 @@
     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);
@@ -45,28 +32,6 @@
 
 app.disable('x-powered-by');
 
-    // Override bundles.json for HTTP requests
-    app.use('/' + BUNDLE_FILE, function (req, res) {
-        var bundles;
-
-        try {
-            bundles = JSON.parse(fs.readFileSync(BUNDLE_FILE, 'utf8'));
-        } catch (e) {
-            bundles = [];
-        }
-
-        // Handle command line inclusions/exclusions
-        bundles = bundles.concat(options.include);
-        bundles = bundles.filter(function (bundle) {
-            return options.exclude.indexOf(bundle) === -1;
-        });
-        bundles = bundles.filter(function (bundle, index) { // Uniquify
-            return bundles.indexOf(bundle) === index;
-        });
-
-        res.send(JSON.stringify(bundles));
-    });
-
 app.use('/proxyUrl', function proxyRequest(req, res, next) {
     console.log('Proxying request to: ', req.query.url);
     req.pipe(request({
@@ -75,11 +40,39 @@
     }).on('error', next)).pipe(res);
 });
 
-    // Expose everything else as static files
-    app.use(express['static'](options.directory));
+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',
+    webpackConfig.entry.openmct
+];
+
+const compiler = webpack(webpackConfig);
+
+app.use(require('webpack-dev-middleware')(
+    compiler,
+    {
+        publicPath: '/dist',
+        logLevel: 'warn'
+    }
+));
+
+app.use(require('webpack-hot-middleware')(
+    compiler,
+    {
+
+    }
+));
+
+// Expose index.html for development users.
+app.get('/', function (req, res) {
+    fs.createReadStream('index.html').pipe(res);
+});
 
 // Finally, open the HTTP server and log the instance to the console
 app.listen(options.port, options.host, function() {
     console.log('Open MCT application running at %s:%s', options.host, options.port)
 });
-}());

bower.json

@@ -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

@@ -19,9 +19,3 @@
  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>

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/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/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/SomeAggregator.js

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

example/composite/src/SomeDecorator.js

@@ -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/eventGenerator/src/EventTelemetry.js

@@ -27,12 +27,11 @@
  * 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) {
 

example/extensions/bundle.js

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

example/extensions/src/SomeExample.js

@@ -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/generator/SinewaveLimitProvider.js

@@ -27,8 +27,14 @@ 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",
@@ -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,

example/notifications/bundle.js

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

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 () {
-
                 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 () {
-
                 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
+                });
             };
 
 
@@ -129,38 +79,37 @@ define(
              * periodically, tracking an ongoing process.
              */
             $scope.newProgress = function () {
-
                 var notificationModel = {
                     title: "Progress notification example",
                     severity: "info",
                     progress: 0,
-                    actionText: getExampleActionText(),
-                    unknownProgress: false
+                    actionText: getExampleActionText()
                 };
 
                 /**
                  * Simulate an ongoing process and update the progress bar.
                  * @param notification
                  */
-                function incrementProgress(notificationModel) {
+                function incrementProgress() {
                     notificationModel.progress = Math.min(100, Math.floor(notificationModel.progress + Math.random() * 30));
                     notificationModel.progressText = ["Estimated time" +
                     " remaining:" +
                     " about ", 60 - Math.floor((notificationModel.progress / 100) * 60), " seconds"].join(" ");
                     if (notificationModel.progress < 100) {
-                        $timeout(function(){incrementProgress(notificationModel);}, 1000);
+                        $timeout(function () {
+                            incrementProgress(notificationModel);
+                        }, 1000);
                     }
                 }
 
                 notificationService.notify(notificationModel);
-                incrementProgress(notificationModel);
+                incrementProgress();
             };
 
             /**
              * Launch a new notification with severity level of INFO.
              */
             $scope.newInfo = function () {
-
                 notificationService.info({
                     title: "Example Info notification " + messageCounter++
                 });

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

example/styleguide/bundle.js

@@ -1,10 +1,26 @@
 define([
     "./src/ExampleStyleGuideModelProvider",
     "./src/MCTExample",
+    "./res/templates/intro.html",
+    "./res/templates/standards.html",
+    "./res/templates/colors.html",
+    "./res/templates/status.html",
+    "./res/templates/glyphs.html",
+    "./res/templates/controls.html",
+    "./res/templates/input.html",
+    "./res/templates/menus.html",
     'legacyRegistry'
 ], function (
     ExampleStyleGuideModelProvider,
     MCTExample,
+    introTemplate,
+    standardsTemplate,
+    colorsTemplate,
+    statusTemplate,
+    glyphsTemplate,
+    controlsTemplate,
+    inputTemplate,
+    menusTemplate,
     legacyRegistry
 ) {
     legacyRegistry.register("example/styleguide", {
@@ -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,16 +101,6 @@ define([
                         "$q"
                     ]
                 }
-            ],
-            "stylesheets": [
-                {
-                    "stylesheetUrl": "css/style-guide-espresso.css",
-                    "theme": "espresso"
-                },
-                {
-                    "stylesheetUrl": "css/style-guide-snow.css",
-                    "theme": "snow"
-                }
             ]
         }
     });

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>

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

example/worker/src/FibonacciIndicator.js

@@ -1,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,11 +26,17 @@
         <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 src="dist/openmct.js"></script>
+        <link rel="stylesheet" href="dist/openmct.css">
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32">
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96">
+        <link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16">
+        <link rel="shortcut icon" href="dist/favicons/favicon.ico">
+    </head>
+    <body>
+    </body>
     <script>
         var THIRTY_MINUTES = 30 * 60 * 1000;
-
-            require(['openmct'], function (openmct) {
         [
             'example/eventGenerator',
             'example/styleguide'
@@ -39,7 +45,6 @@
         );
         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());
@@ -70,22 +75,9 @@
         }));
         openmct.install(openmct.plugins.SummaryWidget());
         openmct.install(openmct.plugins.Notebook());
+        openmct.install(openmct.plugins.FolderView());
         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">
-    </head>
-    <body>
-        <div class="l-splash-holder s-splash-holder">
-            <div class="l-splash s-splash"></div>
-        </div>
-    </body>
 </html>

karma.conf.js

@@ -21,70 +21,40 @@
  *****************************************************************************/
 
 /*global module,process*/
-module.exports = function(config) {
+
+const devMode = process.env.NODE_ENV !== 'production';
+
+module.exports = (config) => {
+
+    const webpackConfig = require('./webpack.config.js');
+    delete webpackConfig.output;
+
+    if (!devMode) {
+        webpackConfig.module.rules.push({
+            test: /\.js$/,
+            exclude: /node_modules|example/,
+            use: 'istanbul-instrumenter-loader'
+        });
+    }
+
     config.set({
-
-        // Base path that will be used to resolve all file patterns.
         basePath: '',
-
-        // Frameworks 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).
+        reporters: [
+            'progress',
+            'coverage',
+            'html'
+        ],
+        browsers: ['ChromeHeadless'],
         colors: true,
-
         logLevel: config.LOG_INFO,
-
-        // Rerun tests when any file changes.
         autoWatch: true,
 
-        // Specify browsers to run tests in.
-        // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-        browsers: [
-            'ChromeHeadless'
-        ],
-
-        // Code coverage reporting.
         coverageReporter: {
             dir: process.env.CIRCLE_ARTIFACTS ?
                 process.env.CIRCLE_ARTIFACTS + '/coverage' :
@@ -104,8 +74,19 @@ module.exports = function(config) {
             foldAll: false
         },
 
-        // Continuous Integration mode.
-        // If true, Karma captures browsers, runs the tests and exits.
+        preprocessors: {
+            // add webpack as preprocessor
+            'platform/**/*Spec.js': [ 'webpack' ],
+            'src/**/*Spec.js': [ 'webpack' ]
+        },
+
+        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,BUILD_CONSTANTS*/
 
-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) {
+const MCT = require('./src/MCT');
+
 var openmct = new MCT();
 
-    openmct.legacyRegistry = defaultRegistry;
-    openmct.install(openmct.plugins.Plot());
-
-    if (typeof BUILD_CONSTANTS !== 'undefined') {
-        openmct.install(buildInfo(BUILD_CONSTANTS));
-    }
-
-    openmct.on('start', function () {
-        return new Main().run(defaultRegistry);
-    });
-
-    return openmct;
-});
+module.exports = openmct;

package.json

@@ -2,7 +2,15 @@
   "name": "openmct",
   "version": "0.14.0-SNAPSHOT",
   "description": "The Open MCT core platform",
-  "dependencies": {
+  "dependencies": {},
+  "devDependencies": {
+    "angular": "1.4.14",
+    "angular-route": "1.4.14",
+    "babel-eslint": "8.2.6",
+    "comma-separated-values": "^3.6.4",
+    "concurrently": "^3.6.1",
+    "copy-webpack-plugin": "^4.5.2",
+    "css-loader": "^1.0.0",
     "d3-array": "1.2.x",
     "d3-axis": "1.0.x",
     "d3-collection": "1.0.x",
@@ -13,59 +21,70 @@
     "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.5",
+    "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-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",
+    "node-sass": "^4.9.2",
+    "painterro": "^0.2.65",
     "printj": "^1.1.0",
-    "requirejs": "2.1.x",
+    "raw-loader": "^0.5.1",
+    "request": "^2.69.0",
+    "screenfull": "^3.3.2",
     "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 src openmct.js",
+    "lint:fix": "eslint platform src openmct.js --fix",
+    "build:prod": "NODE_ENV=production webpack",
+    "build:dev": "webpack",
+    "build:watch": "webpack --watch",
     "test": "karma start --single-run",
-    "jshint": "jshint platform example",
-    "lint": "./node_modules/gulp/bin/gulp.js lint",
-    "checkstyle": "./node_modules/gulp/bin/gulp.js checkstyle",
-    "watch": "karma start",
+    "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,17 +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",
+    "./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",
     'legacyRegistry'
 ], function (
     aboutDialogTemplate,

platform/commonUI/browse/bundle.js

@@ -33,16 +33,14 @@ define([
     "./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",
+    "./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",
     'legacyRegistry'
 ], function (
     BrowseController,
@@ -59,12 +57,10 @@ define([
     WindowTitler,
     browseTemplate,
     browseObjectTemplate,
-    gridItemTemplate,
     objectHeaderTemplate,
     objectHeaderFrameTemplate,
     menuArrowTemplate,
     backArrowTemplate,
-    itemsTemplate,
     objectPropertiesTemplate,
     inspectorRegionTemplate,
     legacyRegistry
@@ -73,15 +69,6 @@ define([
     legacyRegistry.register("platform/commonUI/browse", {
         "extensions": {
             "routes": [
-                {
-                    "when": "/browse/:ids*?",
-                    "template": browseTemplate,
-                    "reloadOnSearch": false
-                },
-                {
-                    "when": "",
-                    "redirectTo": "/browse/"
-                }
             ],
             "constants": [
                 {
@@ -165,19 +152,6 @@ define([
                         "view"
                     ]
                 },
-                {
-                    "key": "grid-item",
-                    "template": gridItemTemplate,
-                    "uses": [
-                        "type",
-                        "action",
-                        "location"
-                    ],
-                    "gestures": [
-                        "info",
-                        "menu"
-                    ]
-                },
                 {
                     "key": "object-header",
                     "template": objectHeaderTemplate,
@@ -260,23 +234,6 @@ define([
                     "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,
@@ -295,6 +252,20 @@ define([
                     ]
                 }
             ],
+            "templates": [
+                {
+                    key: "browseRoot",
+                    template: browseTemplate
+                },
+                {
+                    key: "browseObject",
+                    template: browseObjectTemplate
+                },
+                {
+                    key: "inspectorRegion",
+                    template: inspectorRegionTemplate
+                }
+            ],
             "licenses": [
                 {
                     "name": "screenfull.js",

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/src/BrowseController.js

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

platform/commonUI/browse/src/BrowseObjectController.js

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

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/test/PaneControllerSpec.js

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

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

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

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

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

platform/commonUI/dialog/bundle.js

@@ -23,13 +23,13 @@
 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",
+    "./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/overlay-message-list.html",
+    "./res/templates/overlay.html",
     'legacyRegistry'
 ], function (
     DialogService,

platform/commonUI/edit/bundle.js

@@ -49,14 +49,14 @@ define([
     "./src/creation/CreateActionProvider",
     "./src/creation/AddActionProvider",
     "./src/creation/CreationService",
-    "text!./res/templates/create/locator.html",
-    "text!./res/templates/create/create-button.html",
-    "text!./res/templates/create/create-menu.html",
-    "text!./res/templates/library.html",
-    "text!./res/templates/edit-object.html",
-    "text!./res/templates/edit-action-buttons.html",
-    "text!./res/templates/elements.html",
-    "text!./res/templates/topbar-edit.html",
+    "./res/templates/create/locator.html",
+    "./res/templates/create/create-button.html",
+    "./res/templates/create/create-menu.html",
+    "./res/templates/library.html",
+    "./res/templates/edit-object.html",
+    "./res/templates/edit-action-buttons.html",
+    "./res/templates/elements.html",
+    "./res/templates/topbar-edit.html",
     'legacyRegistry'
 ], function (
     EditActionController,
@@ -319,6 +319,12 @@ define([
                     ]
                 }
             ],
+            "templates": [
+                {
+                    key: "elementsPool",
+                    template: elementsTemplate
+                }
+            ],
             "components": [
                 {
                     "type": "decorator",
@@ -399,7 +405,8 @@ define([
                     "description": "Provides transactional editing capabilities",
                     "implementation": EditorCapability,
                     "depends": [
-                        "transactionService"
+                        "transactionService",
+                        "openmct"
                     ]
                 }
             ],

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

@@ -36,9 +36,11 @@ define(
          */
         function EditorCapability(
             transactionService,
+            openmct,
             domainObject
         ) {
             this.transactionService = transactionService;
+            this.openmct = openmct;
             this.domainObject = domainObject;
         }
 
@@ -48,27 +50,19 @@ define(
          * or finish() are called.
          */
         EditorCapability.prototype.edit = function () {
-            this.transactionService.startTransaction();
+            console.warn('DEPRECATED: cannot edit via edit capability, use openmct.editor instead.');
+            this.openmct.editor.edit();
             this.domainObject.getCapability('status').set('editing', true);
         };
 
-        function isEditContextRoot(domainObject) {
-            return domainObject.getCapability('status').get('editing');
-        }
-
-        function isEditing(domainObject) {
-            return isEditContextRoot(domainObject) ||
-                domainObject.hasCapability('context') &&
-                isEditing(domainObject.getCapability('context').getParent());
-        }
-
         /**
          * Determines whether this object, or any of its ancestors are
          * currently being edited.
          * @returns boolean
          */
         EditorCapability.prototype.inEditContext = function () {
-            return isEditing(this.domainObject);
+            console.warn('DEPRECATION WARNING: isEditing checks must be done via openmct.editor.');
+            return this.openmct.editor.isEditing();
         };
 
         /**
@@ -77,7 +71,8 @@ define(
          * @returns {*}
          */
         EditorCapability.prototype.isEditContextRoot = function () {
-            return isEditContextRoot(this.domainObject);
+            console.warn('DEPRECATION WARNING: isEditing checks must be done via openmct.editor.');
+            return this.openmct.editor.isEditing();
         };
 
         /**
@@ -86,10 +81,7 @@ define(
          * @returns {*}
          */
         EditorCapability.prototype.save = function () {
-            var transactionService = this.transactionService;
-            return transactionService.commit().then(function () {
-                transactionService.startTransaction();
-            });
+            console.warn('DEPRECATED: cannot save via edit capability, use openmct.editor instead.');
         };
 
         EditorCapability.prototype.invoke = EditorCapability.prototype.edit;
@@ -100,16 +92,7 @@ define(
          * @returns {*}
          */
         EditorCapability.prototype.finish = function () {
-            var domainObject = this.domainObject;
-
-            if (this.transactionService.isActive()) {
-                return this.transactionService.cancel().then(function () {
-                    domainObject.getCapability("status").set("editing", false);
-                    return domainObject;
-                });
-            } else {
-                return Promise.resolve(domainObject);
-            }
+            console.warn('DEPRECATED: cannot finish via edit capability, use openmct.editor instead.');
         };
 
         /**

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

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

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

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

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

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

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

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

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

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

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

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

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

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

platform/commonUI/formats/src/DurationFormat.js

@@ -56,7 +56,7 @@ define([
     };
 
     DurationFormat.prototype.validate = function (text) {
-        return moment.utc(text, DATE_FORMATS).isValid();
+        return moment.utc(text, DATE_FORMATS, true).isValid();
     };
 
     return DurationFormat;

platform/commonUI/formats/src/UTCTimeFormat.js

@@ -29,6 +29,7 @@ define([
     var DATE_FORMAT = "YYYY-MM-DD HH:mm:ss.SSS",
         DATE_FORMATS = [
             DATE_FORMAT,
+            DATE_FORMAT + "Z",
             "YYYY-MM-DD HH:mm:ss",
             "YYYY-MM-DD HH:mm",
             "YYYY-MM-DD"
@@ -52,70 +53,14 @@ define([
         this.key = "utc";
     }
 
-    /**
-     * Returns an appropriate time format based on the provided value and
-     * the threshold required.
-     * @private
-     */
-    function getScaledFormat(d) {
-        var momentified = moment.utc(d);
-        /**
-         * Uses logic from d3 Time-Scales, v3 of the API. See
-         * https://github.com/d3/d3-3.x-api-reference/blob/master/Time-Scales.md
-         *
-         * Licensed
-         */
-        var format = [
-            [".SSS", function (m) {
-                return m.milliseconds();
-            }],
-            [":ss", function (m) {
-                return m.seconds();
-            }],
-            ["HH:mm", function (m) {
-                return m.minutes();
-            }],
-            ["HH", function (m) {
-                return m.hours();
-            }],
-            ["ddd DD", function (m) {
-                return m.days() &&
-                    m.date() !== 1;
-            }],
-            ["MMM DD", function (m) {
-                return m.date() !== 1;
-            }],
-            ["MMMM", function (m) {
-                return m.month();
-            }],
-            ["YYYY", function () {
-                return true;
-            }]
-        ].filter(function (row) {
-                return row[1](momentified);
-            })[0][0];
-
-        if (format !== undefined) {
-            return moment.utc(d).format(format);
-        }
-    }
-
     /**
      * @param {number} value The value to format.
-     * @param {number} [minValue] Contextual information for scaled formatting used in linear scales such as conductor
-     * and plot axes. Specifies the smallest number on the scale.
-     * @param {number} [maxValue] Contextual information for scaled formatting used in linear scales such as conductor
-     * and plot axes. Specifies the largest number on the scale
-     * @param {number} [count] Contextual information for scaled formatting used in linear scales such as conductor
-     * and plot axes. The number of labels on the scale.
      * @returns {string} the formatted date(s). If multiple values were requested, then an array of
      * formatted values will be returned. Where a value could not be formatted, `undefined` will be returned at its position
      * in the array.
      */
     UTCTimeFormat.prototype.format = function (value) {
-        if (arguments.length > 1) {
-            return getScaledFormat(value);
-        } else if (value !== undefined) {
+        if (value !== undefined) {
             return moment.utc(value).format(DATE_FORMAT) + "Z";
         } else {
             return value;
@@ -130,7 +75,7 @@ define([
     };
 
     UTCTimeFormat.prototype.validate = function (text) {
-        return moment.utc(text, DATE_FORMATS).isValid();
+        return moment.utc(text, DATE_FORMATS, true).isValid();
     };
 
     return UTCTimeFormat;

platform/commonUI/formats/test/UTCTimeFormatSpec.js

@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define([
-    "../src/UTCTimeFormat",
-    "moment"
-], function (
-    UTCTimeFormat,
-    moment
-) {
-    describe("The UTCTimeFormat class", function () {
-        var format;
-        var scale;
-
-        beforeEach(function () {
-            format = new UTCTimeFormat();
-            scale = {min: 0, max: 0};
-        });
-
-        it("Provides an appropriately scaled time format based on the input" +
-            " time", function () {
-            var TWO_HUNDRED_MS = 200;
-            var THREE_SECONDS = 3000;
-            var FIVE_MINUTES = 5 * 60 * 1000;
-            var ONE_HOUR_TWENTY_MINS = (1 * 60 * 60 * 1000) + (20 * 60 * 1000);
-            var TEN_HOURS = (10 * 60 * 60 * 1000);
-
-            var JUNE_THIRD = moment.utc("2016-06-03", "YYYY-MM-DD");
-            var APRIL = moment.utc("2016-04", "YYYY-MM");
-            var TWENTY_SIXTEEN = moment.utc("2016", "YYYY");
-
-            expect(format.format(TWO_HUNDRED_MS, scale)).toBe(".200");
-            expect(format.format(THREE_SECONDS, scale)).toBe(":03");
-            expect(format.format(FIVE_MINUTES, scale)).toBe("00:05");
-            expect(format.format(ONE_HOUR_TWENTY_MINS, scale)).toBe("01:20");
-            expect(format.format(TEN_HOURS, scale)).toBe("10");
-
-            expect(format.format(JUNE_THIRD, scale)).toBe("Fri 03");
-            expect(format.format(APRIL, scale)).toBe("April");
-            expect(format.format(TWENTY_SIXTEEN, scale)).toBe("2016");
-        });
-    });
-});

platform/commonUI/general/bundle.js

@@ -52,26 +52,26 @@ define([
     "./src/directives/MCTPreview",
     "./src/actions/MCTPreviewAction",
     "./src/filters/ReverseFilter",
-    "text!./res/templates/bottombar.html",
-    "text!./res/templates/controls/action-button.html",
-    "text!./res/templates/controls/input-filter.html",
-    "text!./res/templates/angular-indicator.html",
-    "text!./res/templates/message-banner.html",
-    "text!./res/templates/progress-bar.html",
-    "text!./res/templates/controls/time-controller.html",
-    "text!./res/templates/containers/accordion.html",
-    "text!./res/templates/subtree.html",
-    "text!./res/templates/tree.html",
-    "text!./res/templates/tree-node.html",
-    "text!./res/templates/label.html",
-    "text!./res/templates/controls/action-group.html",
-    "text!./res/templates/menu/context-menu.html",
-    "text!./res/templates/controls/switcher.html",
-    "text!./res/templates/object-inspector.html",
-    "text!./res/templates/controls/selector.html",
-    "text!./res/templates/controls/datetime-picker.html",
-    "text!./res/templates/controls/datetime-field.html",
-    "text!./res/templates/preview.html",
+    "./res/templates/bottombar.html",
+    "./res/templates/controls/action-button.html",
+    "./res/templates/controls/input-filter.html",
+    "./res/templates/angular-indicator.html",
+    "./res/templates/message-banner.html",
+    "./res/templates/progress-bar.html",
+    "./res/templates/controls/time-controller.html",
+    "./res/templates/containers/accordion.html",
+    "./res/templates/subtree.html",
+    "./res/templates/tree.html",
+    "./res/templates/tree-node.html",
+    "./res/templates/label.html",
+    "./res/templates/controls/action-group.html",
+    "./res/templates/menu/context-menu.html",
+    "./res/templates/controls/switcher.html",
+    "./res/templates/object-inspector.html",
+    "./res/templates/controls/selector.html",
+    "./res/templates/controls/datetime-picker.html",
+    "./res/templates/controls/datetime-field.html",
+    "./res/templates/preview.html",
     'legacyRegistry'
 ], function (
     UrlService,
@@ -173,12 +173,6 @@ define([
                     "key": "reverse"
                 }
             ],
-            "stylesheets": [
-                {
-                    "stylesheetUrl": "css/normalize.min.css",
-                    "priority": "mandatory"
-                }
-            ],
             "templates": [
                 {
                     "key": "bottombar",

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

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

platform/commonUI/general/src/controllers/BannerController.js

@@ -60,7 +60,7 @@ define(
                     };
                     //If the notification is dismissed by the user, close
                     // the dialog.
-                    notification.onDismiss(function () {
+                    notification.on('dismiss', function () {
                         dialog.dismiss();
                     });
 

platform/commonUI/general/src/directives/MCTSelectable.js

@@ -45,6 +45,15 @@ define(
 
             // Link; install event handlers.
             function link(scope, element, attrs) {
+                var isDestroyed = false;
+                scope.$on("$destroy", function () {
+                    isDestroyed = true;
+                });
+
+                openmct.$injector.get('$timeout')(function () {
+                    if (isDestroyed) {
+                        return;
+                    }
                     var removeSelectable = openmct.selection.selectable(
                         element[0],
                         scope.$eval(attrs.mctSelectable),
@@ -54,6 +63,9 @@ define(
                     scope.$on("$destroy", function () {
                         removeSelectable();
                     });
+                });
+
+
             }
 
             return {

platform/commonUI/general/src/ui/ToggleView.js

@@ -22,7 +22,7 @@
 
 define([
     'zepto',
-    'text!../../res/templates/tree/toggle.html'
+    '../../res/templates/tree/toggle.html'
 ], function ($, toggleTemplate) {
     function ToggleView(state) {
         this.expanded = !!state;

platform/commonUI/general/src/ui/TreeLabelView.js

@@ -22,7 +22,7 @@
 
 define([
     'zepto',
-    'text!../../res/templates/tree/tree-label.html'
+    '../../res/templates/tree/tree-label.html'
 ], function ($, labelTemplate) {
 
     function TreeLabelView(gestureService) {

platform/commonUI/general/src/ui/TreeNodeView.js

@@ -22,7 +22,7 @@
 
 define([
     'zepto',
-    'text!../../res/templates/tree/node.html',
+    '../../res/templates/tree/node.html',
     './ToggleView',
     './TreeLabelView'
 ], function ($, nodeTemplate, ToggleView, TreeLabelView) {

platform/commonUI/general/src/ui/TreeView.js

@@ -23,7 +23,7 @@
 define([
     'zepto',
     './TreeNodeView',
-    'text!../../res/templates/tree/wait-node.html'
+    '../../res/templates/tree/wait-node.html'
 ], function ($, TreeNodeView, spinnerTemplate) {
 
     function TreeView(gestureService, openmct, selectFn) {

platform/commonUI/general/test/StyleSheetLoaderSpec.js

@@ -31,7 +31,7 @@ define(
                 mockHead,
                 mockElement,
                 testBundle,
-                loader;
+                loader; // eslint-disable-line
 
             beforeEach(function () {
                 testBundle = {

platform/commonUI/general/test/directives/MCTPopupSpec.js

@@ -41,7 +41,6 @@ define(
                 mockScope,
                 mockElement,
                 testAttrs,
-                mockBody,
                 mockTransclude,
                 mockParentEl,
                 mockNewElement,
@@ -59,8 +58,6 @@ define(
                     jasmine.createSpyObj("$scope", ["$eval", "$apply", "$on"]);
                 mockElement =
                     jasmine.createSpyObj("element", JQLITE_METHODS);
-                mockBody =
-                    jasmine.createSpyObj("body", JQLITE_METHODS);
                 mockTransclude =
                     jasmine.createSpy("transclude");
                 mockParentEl =

platform/commonUI/inspect/bundle.js

@@ -24,10 +24,10 @@ define([
     "./src/gestures/InfoGesture",
     "./src/gestures/InfoButtonGesture",
     "./src/services/InfoService",
-    "text!./res/info-table.html",
-    "text!./res/info-bubble.html",
-    "text!./res/bubble.html",
-    "text!./res/templates/info-button.html",
+    "./res/info-table.html",
+    "./res/info-bubble.html",
+    "./res/bubble.html",
+    "./res/templates/info-button.html",
     'legacyRegistry'
 ], function (
     InfoGesture,

platform/commonUI/inspect/test/gestures/InfoButtonGestureSpec.js

@@ -25,8 +25,7 @@ define(
     function (InfoButtonGesture) {
 
         describe("The info button gesture", function () {
-            var mockTimeout,
-                mockDocument,
+            var mockDocument,
                 mockBody,
                 mockAgentService,
                 mockInfoService,
@@ -42,7 +41,6 @@ define(
                 fireDismissGesture;
 
             beforeEach(function () {
-                mockTimeout = jasmine.createSpy('$timeout');
                 mockDocument = jasmine.createSpyObj('$document', ['find']);
                 mockBody = jasmine.createSpyObj('body', ['on', 'off', 'scope', 'css', 'unbind']);
                 mockDocument.find.and.returnValue(mockBody);

platform/commonUI/mobile/test/DeviceClassifierSpec.js

@@ -74,7 +74,7 @@ define(
                     "device " + (trueMethods.join(", "));
 
                 describe("when " + summary, function () {
-                    var classifier;
+                    var classifier; // eslint-disable-line
 
                     beforeEach(function () {
                         trueMethods.forEach(function (m) {

platform/commonUI/notification/bundle.js

@@ -23,33 +23,17 @@
 define([
     "./src/NotificationIndicatorController",
     "./src/NotificationIndicator",
-    "./src/NotificationService",
-    "text!./res/notification-indicator.html",
+    "./res/notification-indicator.html",
     'legacyRegistry'
 ], function (
     NotificationIndicatorController,
     NotificationIndicator,
-    NotificationService,
     notificationIndicatorTemplate,
     legacyRegistry
 ) {
 
     legacyRegistry.register("platform/commonUI/notification", {
         "extensions": {
-            "constants": [
-                {
-                    "key": "DEFAULT_AUTO_DISMISS",
-                    "value": 3000
-                },
-                {
-                    "key": "FORCE_AUTO_DISMISS",
-                    "value": 1000
-                },
-                {
-                    "key": "MINIMIZE_TIMEOUT",
-                    "value": 300
-                }
-            ],
             "templates": [
                 {
                     "key": "notificationIndicatorTemplate",
@@ -76,12 +60,11 @@ define([
             "services": [
                 {
                     "key": "notificationService",
-                    "implementation": NotificationService,
+                    "implementation": function (openmct) {
+                        return openmct.notifications;
+                    },
                     "depends": [
-                        "$timeout",
-                        "topic",
-                        "DEFAULT_AUTO_DISMISS",
-                        "MINIMIZE_TIMEOUT"
+                        "openmct"
                     ]
                 }
             ]

platform/commonUI/notification/src/NotificationService.js

@@ -1,437 +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 the notification service, which can be used to
- * show banner notifications to the user. Banner notifications
- * are used to inform users of events in a non-intrusive way. As
- * much as possible, notifications share a model with blocking
- * dialogs so that the same information can be provided in a dialog
- * and then minimized to a banner notification if needed.
- *
- * @namespace platform/commonUI/notification
- */
-define(
-    ['moment'],
-    function (moment) {
-
-        /**
-         * A representation of a user action. Options are provided to
-         * dialogs and notifications and are shown as buttons.
-         *
-         * @typedef {object} NotificationOption
-         * @property {string} label the label to appear on the button for
-         * this action
-         * @property {function} callback a callback function to be invoked
-         * when the button is clicked
-        */
-
-        /**
-         * A representation of a banner notification. Banner notifications
-         * are used to inform users of events in a non-intrusive way. As
-         * much as possible, notifications share a model with blocking
-         * dialogs so that the same information can be provided in a dialog
-         * and then minimized to a banner notification if needed, or vice-versa.
-         *
-         * @typedef {object} NotificationModel
-         * @property {string} title The title of the message
-         * @property {string} severity The importance of the message (one of
-         * 'info', 'alert', or 'error' where info < alert <error)
-         * @property {number} [progress] The completion status of a task
-         * represented numerically
-         * @property {boolean} [unknownProgress] a boolean indicating that the
-         * progress of the underlying task is unknown. This will result in a
-         * visually distinct progress bar.
-         * @property {boolean} [autoDismiss] If truthy, dialog will
-         * be automatically minimized or dismissed (depending on severity).
-         * Additionally, if the provided value is a number, it will be used
-         * as the delay period before being dismissed.
-         * @property {boolean} [dismissable=true] If true, notification will
-         * include an option to dismiss it completely.
-         * @property {NotificationOption} [primaryOption] the default user
-         * response to
-         * this message. Will be represented as a button with the provided
-         * label and action. May be used by banner notifications to display
-         * only the most important option to users.
-         * @property {NotificationOption[]} [options] any additional
-         * actions the user can take. Will be represented as additional buttons
-         * that may or may not be available from a banner.
-         * @see DialogModel
-         */
-
-        /**
-         * A wrapper object that is returned as a handle to a newly created
-         * notification. Wraps the notifications model and decorates with
-         * functions to dismiss or minimize the notification.
-         *
-         * @typedef {object} Notification
-         * @property {function} dismiss This method is added to the object
-         * returned by {@link NotificationService#notify} and can be used to
-         * dismiss this notification. Dismissing a notification will remove
-         * it completely and it will not appear in the notification indicator
-         * @property {function} minimize This method is added to the object
-         * returned by {@link NotificationService#notify} and can be used to
-         * minimize this notification. Minimizing a notification will send
-         * it to the notification indicator
-         * @property {function} dismissOrMinimize This method is added to the
-         * object returned by {@link NotificationService#notify}. It will
-         * hide the notification by either dismissing or minimizing it,
-         * depending on severity. Typically this is the method that should
-         * be used for dismissing a notification. If more control is
-         * required, then the minimize or dismiss functions can be called
-         * individually.
-         * @property {function} onDismiss Allows listening for on dismiss
-         * events. This allows cleanup etc. when the notification is dismissed.
-         */
-
-        /**
-         * The notification service is responsible for informing the user of
-         * events via the use of banner notifications.
-         * @memberof platform/commonUI/notification
-         * @constructor
-         * @param $timeout the Angular $timeout service
-         * @param defaultAutoDismissTimeout The period of time that an
-         * auto-dismissed message will be displayed for.
-         * @param minimizeAnimationTimeout When notifications are minimized, a brief
-         * animation is shown. This animation requires some time to execute,
-         * so a timeout is required before the notification is hidden
-         */
-        function NotificationService($timeout, topic, defaultAutoDismissTimeout, minimizeAnimationTimeout) {
-            this.notifications = [];
-            this.$timeout = $timeout;
-            this.highest = { severity: "info" };
-            this.AUTO_DISMISS_TIMEOUT = defaultAutoDismissTimeout;
-            this.MINIMIZE_ANIMATION_TIMEOUT = minimizeAnimationTimeout;
-            this.topic = topic;
-
-            /*
-             * A context in which to hold the active notification and a
-             * handle to its timeout.
-             */
-            this.active = {};
-        }
-
-        /**
-         * Minimize a notification. The notification will still be available
-         * from the notification list. Typically notifications with a
-         * severity of 'info' should not be minimized, but rather
-         * dismissed. If you're not sure which is appropriate,
-         * use {@link Notification#dismissOrMinimize}
-         *
-         * @private
-         */
-        NotificationService.prototype.minimize = function (service, notification) {
-            //Check this is a known notification
-            var index = service.notifications.indexOf(notification);
-
-            if (service.active.timeout) {
-                /*
-                 Method can be called manually (clicking dismiss) or
-                 automatically from an auto-timeout. this.active.timeout
-                 acts as a semaphore to prevent race conditions. Cancel any
-                 timeout in progress (for the case where a manual dismiss
-                 has shortcut an active auto-dismiss), and clear the
-                 semaphore.
-                 */
-                service.$timeout.cancel(service.active.timeout);
-                delete service.active.timeout;
-            }
-
-            if (index >= 0) {
-                notification.model.minimized = true;
-                //Add a brief timeout before showing the next notification
-                // in order to allow the minimize animation to run through.
-                service.$timeout(function () {
-                    service.setActiveNotification(service.selectNextNotification());
-                }, service.MINIMIZE_ANIMATION_TIMEOUT);
-            }
-        };
-
-        /**
-         * Completely removes a notification. This will dismiss it from the
-         * message banner and remove it from the list of notifications.
-         * Typically only notifications with a severity of info should be
-         * dismissed. If you're not sure whether to dismiss or minimize a
-         * notification, use {@link Notification#dismissOrMinimize}.
-         * dismiss
-         *
-         * @private
-         */
-        NotificationService.prototype.dismiss = function (service, notification) {
-            //Check this is a known notification
-            var index = service.notifications.indexOf(notification);
-
-            if (service.active.timeout) {
-                /* Method can be called manually (clicking dismiss) or
-                 * automatically from an auto-timeout. this.active.timeout
-                 * acts as a semaphore to prevent race conditions. Cancel any
-                 * timeout in progress (for the case where a manual dismiss
-                 * has shortcut an active auto-dismiss), and clear the
-                 * semaphore.
-                 */
-
-                service.$timeout.cancel(service.active.timeout);
-                delete service.active.timeout;
-            }
-
-            if (index >= 0) {
-                service.notifications.splice(index, 1);
-            }
-            service.setActiveNotification(service.selectNextNotification());
-
-            this.setHighestSeverity();
-        };
-
-        /**
-         * Depending on the severity of the notification will selectively
-         * dismiss or minimize where appropriate.
-         *
-         * @private
-         */
-        NotificationService.prototype.dismissOrMinimize = function (notification) {
-            var model = notification.model;
-            if (model.severity === "info") {
-                if (model.autoDismiss === false) {
-                    notification.minimize();
-                } else {
-                    notification.dismiss();
-                }
-            } else {
-                notification.minimize();
-            }
-        };
-
-        /**
-         * Returns the notification that is currently visible in the banner area
-         * @returns {Notification}
-         */
-        NotificationService.prototype.getActiveNotification = function () {
-            return this.active.notification;
-        };
-
-        /**
-         * A convenience method for info notifications. Notifications
-         * created via this method will be auto-dismissed after a default
-         * wait period unless explicitly forbidden by the caller through
-         * the {autoDismiss} property on the {NotificationModel}, in which
-         * case the notification will be minimized after the wait.
-         * @param {NotificationModel | string} message either a string for
-         * the title of the notification message, or a {@link NotificationModel}
-         * defining the options notification to display
-         * @returns {Notification} the provided notification decorated with
-         * functions to dismiss or minimize
-         */
-        NotificationService.prototype.info = function (message) {
-            var notificationModel = typeof message === "string" ? {title: message} : message;
-            notificationModel.severity = "info";
-            return this.notify(notificationModel);
-        };
-
-        /**
-         * A convenience method for alert notifications. Notifications
-         * created via this method will will have severity of "alert" enforced
-         * @param {NotificationModel | string} message either a string for
-         * the title of the alert message with default options, or a
-         * {@link NotificationModel} defining the options notification to
-         * display
-         * @returns {Notification} the provided notification decorated with
-         * functions to dismiss or minimize
-         */
-        NotificationService.prototype.alert = function (message) {
-            var notificationModel = typeof message === "string" ? {title: message} : message;
-            notificationModel.severity = "alert";
-            return this.notify(notificationModel);
-        };
-
-        /**
-         * A convenience method for error notifications. Notifications
-         * created via this method will will have severity of "error" enforced
-         * @param {NotificationModel | string} message either a string for
-         * the title of the error message with default options, or a
-         * {@link NotificationModel} defining the options notification to
-         * display
-         * @returns {Notification} the provided notification decorated with
-         * functions to dismiss or minimize
-         */
-        NotificationService.prototype.error = function (message) {
-            var notificationModel = typeof message === "string" ? {title: message} : message;
-            notificationModel.severity = "error";
-            return this.notify(notificationModel);
-        };
-
-        /**
-         * @private
-         */
-        NotificationService.prototype.setHighestSeverity = function () {
-            var severity = {
-                    "info": 1,
-                    "alert": 2,
-                    "error": 3
-                };
-            this.highest.severity = this.notifications.reduce(function (previous, notification) {
-                if (severity[notification.model.severity] > severity[previous]) {
-                    return notification.model.severity;
-                } else {
-                    return previous;
-                }
-            }, "info");
-        };
-
-        /**
-         * Notifies the user of an event. If there is a banner notification
-         * already active, then it will be dismissed or minimized automatically,
-         * and the provided notification displayed in its place.
-         *
-         * @param {NotificationModel} notificationModel The notification to
-         * display
-         * @returns {Notification} the provided notification decorated with
-         * functions to {@link Notification#dismiss} or {@link Notification#minimize}
-         */
-        NotificationService.prototype.notify = function (notificationModel) {
-            var self = this,
-                notification,
-                activeNotification = self.active.notification,
-                topic = this.topic();
-
-            notificationModel.severity = notificationModel.severity || "info";
-            notificationModel.timestamp = moment.utc().format('YYYY-MM-DD hh:mm:ss.ms');
-
-            notification = {
-                model: notificationModel,
-
-                minimize: function () {
-                    self.minimize(self, notification);
-                },
-
-                dismiss: function () {
-                    self.dismiss(self, notification);
-                    topic.notify();
-                },
-
-                dismissOrMinimize: function () {
-                    self.dismissOrMinimize(notification);
-                },
-
-                onDismiss: function (callback) {
-                    topic.listen(callback);
-                }
-            };
-
-            //Notifications support a 'dismissable' attribute. This is a
-            // convenience to support adding a 'dismiss' option to the
-            // notification for the common case of dismissing a
-            // notification. Could also be done manually by specifying an
-            // option on the model
-            if (notificationModel.dismissable !== false) {
-                notificationModel.options = notificationModel.options || [];
-                notificationModel.options.unshift({
-                    label: "Dismiss",
-                    callback: function () {
-                        notification.dismiss();
-                    }
-                });
-            }
-
-            this.notifications.push(notification);
-
-            this.setHighestSeverity();
-
-            /*
-            Check if there is already an active (ie. visible) notification
-             */
-            if (!this.active.notification) {
-                this.setActiveNotification(notification);
-
-            } else if (!this.active.timeout) {
-                /*
-                 If there is already an active notification, time it out. If it's
-                 already got a timeout in progress (either because it has had
-                 timeout forced because of a queue of messages, or it had an
-                 autodismiss specified), leave it to run. Otherwise force a
-                  timeout.
-
-                 This notification has been added to queue and will be
-                  serviced as soon as possible.
-                 */
-                this.active.timeout = this.$timeout(function () {
-                    activeNotification.dismissOrMinimize();
-                }, this.AUTO_DISMISS_TIMEOUT);
-            }
-
-            return notification;
-        };
-
-        /**
-         * Used internally by the NotificationService
-         * @private
-         */
-        NotificationService.prototype.setActiveNotification = function (notification) {
-            var shouldAutoDismiss;
-            this.active.notification = notification;
-
-            if (!notification) {
-                delete this.active.timeout;
-                return;
-            }
-
-            if (notification.model.severity === "info") {
-                shouldAutoDismiss = true;
-            } else {
-                shouldAutoDismiss = notification.model.autoDismiss;
-            }
-
-            if (shouldAutoDismiss || this.selectNextNotification()) {
-                this.active.timeout = this.$timeout(function () {
-                    notification.dismissOrMinimize();
-                }, this.AUTO_DISMISS_TIMEOUT);
-            } else {
-                delete this.active.timeout;
-            }
-        };
-
-        /**
-         * Used internally by the NotificationService
-         *
-         * @private
-         */
-        NotificationService.prototype.selectNextNotification = function () {
-            var notification,
-                i = 0;
-
-            /*
-            Loop through the notifications queue and find the first one that
-            has not already been minimized (manually or otherwise).
-             */
-            for (; i < this.notifications.length; i++) {
-                notification = this.notifications[i];
-
-                if (!notification.model.minimized &&
-                    notification !== this.active.notification) {
-
-                    return notification;
-                }
-            }
-        };
-
-        return NotificationService;
-    }
-);

platform/commonUI/notification/test/NotificationServiceSpec.js

@@ -1,275 +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 describe,it,expect,beforeEach,jasmine*/
-
-define(
-    ['../src/NotificationService'],
-    function (NotificationService) {
-
-        describe("The notification service ", function () {
-            var notificationService,
-                mockTimeout,
-                mockAutoDismiss,
-                mockMinimizeTimeout,
-                mockTopicFunction,
-                mockTopicObject,
-                infoModel,
-                alertModel,
-                errorModel;
-
-            function elapseTimeout() {
-                mockTimeout.calls.mostRecent().args[0]();
-            }
-
-            beforeEach(function () {
-                mockTimeout = jasmine.createSpy("$timeout");
-                mockTopicFunction = jasmine.createSpy("topic");
-                mockTopicObject = jasmine.createSpyObj("topicObject", ["listen", "notify"]);
-                mockTopicFunction.and.returnValue(mockTopicObject);
-
-                mockAutoDismiss = mockMinimizeTimeout = 1000;
-                notificationService = new NotificationService(mockTimeout, mockTopicFunction, mockAutoDismiss, mockMinimizeTimeout);
-
-                infoModel = {
-                    title: "Mock Info Notification",
-                    severity: "info"
-                };
-
-                alertModel = {
-                    title: "Mock Alert Notification",
-                    severity: "alert"
-                };
-
-                errorModel = {
-                    title: "Mock Error Notification",
-                    severity: "error"
-                };
-            });
-
-            it("notifies listeners on dismissal of notification", function () {
-                var dismissListener = jasmine.createSpy("ondismiss");
-                var notification = notificationService.notify(infoModel);
-                notification.onDismiss(dismissListener);
-                expect(mockTopicObject.listen).toHaveBeenCalled();
-                notification.dismiss();
-                expect(mockTopicObject.notify).toHaveBeenCalled();
-                mockTopicObject.listen.calls.mostRecent().args[0]();
-                expect(dismissListener).toHaveBeenCalled();
-            });
-
-            it("dismisses a notification when the notification's dismiss method is used", function () {
-                var notification = notificationService.info(infoModel);
-                notification.dismiss();
-                expect(notificationService.getActiveNotification()).toBeUndefined();
-                expect(notificationService.notifications.length).toEqual(0);
-            });
-
-            it("minimizes a notification when the notification's minimize method is used", function () {
-                var notification = notificationService.info(infoModel);
-                notification.minimize();
-                elapseTimeout(); // needed for the minimize animation timeout
-                expect(notificationService.getActiveNotification()).toBeUndefined();
-                expect(notificationService.notifications.length).toEqual(1);
-                expect(notificationService.notifications[0]).toEqual(notification);
-            });
-
-            describe("when receiving info notifications", function () {
-                it("minimizes info notifications if the caller disables auto-dismiss", function () {
-                    infoModel.autoDismiss = false;
-                    var notification = notificationService.info(infoModel);
-                    elapseTimeout();
-                    // 2nd elapse for the minimize animation timeout
-                    elapseTimeout();
-                    expect(notificationService.getActiveNotification()).toBeUndefined();
-                    expect(notificationService.notifications.length).toEqual(1);
-                    expect(notificationService.notifications[0]).toEqual(notification);
-                });
-
-                it("dismisses info notifications if the caller ignores auto-dismiss", function () {
-                    notificationService.info(infoModel);
-                    elapseTimeout();
-                    expect(notificationService.getActiveNotification()).toBeUndefined();
-                    expect(notificationService.notifications.length).toEqual(0);
-                });
-
-                it("dismisses info notifications if the caller requests auto-dismiss", function () {
-                    infoModel.autoDismiss = true;
-                    notificationService.info(infoModel);
-                    elapseTimeout();
-                    expect(notificationService.getActiveNotification()).toBeUndefined();
-                    expect(notificationService.notifications.length).toEqual(0);
-                });
-            });
-
-            describe("when receiving alert notifications", function () {
-                it("minimizes alert notifications if the caller enables auto-dismiss", function () {
-                    alertModel.autoDismiss = true;
-                    var notification = notificationService.alert(alertModel);
-                    elapseTimeout();
-                    elapseTimeout();
-                    expect(notificationService.getActiveNotification()).toBeUndefined();
-                    expect(notificationService.notifications.length).toEqual(1);
-                    expect(notificationService.notifications[0]).toEqual(notification);
-                });
-
-                it("keeps alert notifications active if the caller disables auto-dismiss", function () {
-                    mockTimeout.and.callFake(function (callback, time) {
-                        callback();
-                    });
-                    alertModel.autoDismiss = false;
-                    var notification = notificationService.alert(alertModel);
-                    expect(notificationService.getActiveNotification()).toEqual(notification);
-                    expect(notificationService.notifications.length).toEqual(1);
-                    expect(notificationService.notifications[0]).toEqual(notification);
-                });
-
-                it("keeps alert notifications active if the caller ignores auto-dismiss", function () {
-                    mockTimeout.and.callFake(function (callback, time) {
-                        callback();
-                    });
-                    var notification = notificationService.alert(alertModel);
-                    expect(notificationService.getActiveNotification()).toEqual(notification);
-                    expect(notificationService.notifications.length).toEqual(1);
-                    expect(notificationService.notifications[0]).toEqual(notification);
-                });
-            });
-
-            describe("when receiving error notifications", function () {
-                it("minimizes error notifications if the caller enables auto-dismiss", function () {
-                    errorModel.autoDismiss = true;
-                    var notification = notificationService.error(errorModel);
-                    elapseTimeout();
-                    elapseTimeout();
-                    expect(notificationService.getActiveNotification()).toBeUndefined();
-                    expect(notificationService.notifications.length).toEqual(1);
-                    expect(notificationService.notifications[0]).toEqual(notification);
-                });
-
-                it("keeps error notifications active if the caller disables auto-dismiss", function () {
-                    mockTimeout.and.callFake(function (callback, time) {
-                        callback();
-                    });
-                    errorModel.autoDismiss = false;
-                    var notification = notificationService.error(errorModel);
-                    expect(notificationService.getActiveNotification()).toEqual(notification);
-                    expect(notificationService.notifications.length).toEqual(1);
-                    expect(notificationService.notifications[0]).toEqual(notification);
-                });
-
-                it("keeps error notifications active if the caller ignores auto-dismiss", function () {
-                    mockTimeout.and.callFake(function (callback, time) {
-                        callback();
-                    });
-                    var notification = notificationService.error(errorModel);
-                    expect(notificationService.getActiveNotification()).toEqual(notification);
-                    expect(notificationService.notifications.length).toEqual(1);
-                    expect(notificationService.notifications[0]).toEqual(notification);
-                });
-            });
-
-            describe("when called with multiple notifications", function () {
-                it("auto-dismisses the previously active notification, making the new notification active", function () {
-                    var activeNotification;
-                    infoModel.autoDismiss = false;
-                    //First pre-load with a info message
-                    notificationService.notify(infoModel);
-                    activeNotification = notificationService.getActiveNotification();
-                    //Initially expect the active notification to be info
-                    expect(activeNotification.model).toBe(infoModel);
-                    //Then notify of an error
-                    notificationService.notify(errorModel);
-                    //But it should be auto-dismissed and replaced with the
-                    // error notification
-                    elapseTimeout();
-                    //Two timeouts, one is to force minimization after
-                    // displaying the message for a minimum period, the
-                    // second is to allow minimization animation to take place.
-                    elapseTimeout();
-                    activeNotification = notificationService.getActiveNotification();
-                    expect(activeNotification.model).toBe(errorModel);
-                });
-
-                it("auto-minimizes an active error notification", function () {
-                    var activeNotification;
-                    //First pre-load with an error message
-                    notificationService.notify(errorModel);
-                    //Then notify of info
-                    notificationService.notify(infoModel);
-                    expect(notificationService.notifications.length).toEqual(2);
-                    //Mock the auto-minimize
-                    elapseTimeout();
-                    //Two timeouts, one is to force minimization after
-                    // displaying the message for a minimum period, the
-                    // second is to allow minimization animation to take place.
-                    elapseTimeout();
-                    //Previous error message should be minimized, not
-                    // dismissed
-                    expect(notificationService.notifications.length).toEqual(2);
-                    activeNotification = notificationService.getActiveNotification();
-                    expect(activeNotification.model).toBe(infoModel);
-                    expect(errorModel.minimized).toEqual(true);
-                });
-
-                it("auto-minimizes errors when a number of them arrive in short succession", function () {
-                    var activeNotification,
-                        error2 = {
-                            title: "Second Mock Error Notification",
-                            severity: "error"
-                        },
-                        error3 = {
-                            title: "Third Mock Error Notification",
-                            severity: "error"
-                        };
-
-                    //First pre-load with a info message
-                    notificationService.notify(errorModel);
-                    //Then notify of a third error
-                    notificationService.notify(error2);
-                    notificationService.notify(error3);
-                    expect(notificationService.notifications.length).toEqual(3);
-                    //Mock the auto-minimize
-                    elapseTimeout();
-                    //Two timeouts, one is to force minimization after
-                    // displaying the message for a minimum period, the
-                    // second is to allow minimization animation to take place.
-                    elapseTimeout();
-                    //Previous error message should be minimized, not
-                    // dismissed
-                    expect(notificationService.notifications.length).toEqual(3);
-                    activeNotification = notificationService.getActiveNotification();
-                    expect(activeNotification.model).toBe(error2);
-                    expect(errorModel.minimized).toEqual(true);
-
-                    //Mock the second auto-minimize
-                    elapseTimeout();
-                    //Two timeouts, one is to force minimization after
-                    // displaying the message for a minimum period, the
-                    // second is to allow minimization animation to take place.
-                    elapseTimeout();
-                    activeNotification = notificationService.getActiveNotification();
-                    expect(activeNotification.model).toBe(error3);
-                    expect(error2.minimized).toEqual(true);
-                });
-            });
-        });
-    }
-);

platform/commonUI/regions/src/InspectorController.js

@@ -76,7 +76,7 @@ define(
          * @returns a domain object
          */
         InspectorController.prototype.selectedItem = function () {
-            return this.$scope.selection[0].context.oldItem;
+            return this.$scope.selection[0] && this.$scope.selection[0].context.oldItem;
         };
 
         /**

platform/core/test/types/TypePropertyConversionSpec.js

@@ -48,10 +48,11 @@ define(
             });
 
             it("throws exceptions on unrecognized conversions", function () {
-                var caught = false, tmp;
+                var caught = false;
 
                 try {
-                    tmp = new TypePropertyConversion("some-unknown-conversion");
+                    // eslint-disable-next-line
+                    new TypePropertyConversion("some-unknown-conversion");
                 } catch (e) {
                     caught = true;
                 }

platform/entanglement/test/services/CopyServiceSpec.js

@@ -124,7 +124,6 @@ define(
 
                 var mockQ,
                     mockDeferred,
-                    createObjectPromise,
                     copyService,
                     object,
                     newParent,
@@ -138,7 +137,6 @@ define(
                     resolvedValue;
 
                 beforeEach(function () {
-                    createObjectPromise = synchronousPromise(undefined);
                     policyService.allow.and.returnValue(true);
 
                     persistObjectPromise = synchronousPromise(undefined);
@@ -275,8 +273,7 @@ define(
                 describe("on domainObject with composition", function () {
                     var childObject,
                         objectClone,
-                        childObjectClone,
-                        compositionPromise;
+                        childObjectClone;
 
                     beforeEach(function () {
                         var invocationCount = 0,
@@ -325,11 +322,6 @@ define(
                             }
                         });
 
-                        compositionPromise = jasmine.createSpyObj(
-                            'compositionPromise',
-                            ['then']
-                        );
-
                         compositionCapability
                             .invoke
                             .and.returnValue(synchronousPromise([childObject]));

platform/entanglement/test/services/MoveServiceSpec.js

@@ -178,7 +178,6 @@ define(
                             type: { type: 'object' }
                         }
                     });
-
                     moveResult = moveService.perform(object, newParent);
                 });
 
@@ -189,6 +188,10 @@ define(
                     );
                 });
 
+                it("returns a promise", function () {
+                    expect(moveResult.then).toEqual(jasmine.any(Function));
+                });
+
                 it("waits for result of link", function () {
                     expect(linkService.perform.calls.mostRecent().promise.then)
                         .toHaveBeenCalledWith(jasmine.any(Function));

platform/features/clock/bundle.js

@@ -34,8 +34,8 @@ define([
     "./src/actions/RestartTimerAction",
     "./src/actions/StopTimerAction",
     "./src/actions/PauseTimerAction",
-    "text!./res/templates/clock.html",
-    "text!./res/templates/timer.html",
+    "./res/templates/clock.html",
+    "./res/templates/timer.html",
     'legacyRegistry'
 ], function (
     MomentTimezone,

platform/features/conductor/compatibility/bundle.js

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

platform/features/conductor/compatibility/src/ConductorRepresenter.js

@@ -1,95 +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(
-    [],
-    function () {
-
-        /**
-         * Representer that provides a compatibility layer between the new
-         * time conductor and existing representations / views. Listens to
-         * the v2 time conductor API and generates v1 style events using the
-         * Angular event bus. This is transitional code code and will be
-         * removed.
-         *
-         * Deprecated immediately as this is temporary code
-         *
-         * @deprecated
-         * @constructor
-         */
-        function ConductorRepresenter(
-            openmct,
-            scope,
-            element
-        ) {
-            this.timeAPI = openmct.time;
-            this.scope = scope;
-            this.element = element;
-
-            this.boundsListener = this.boundsListener.bind(this);
-            this.timeSystemListener = this.timeSystemListener.bind(this);
-            this.followListener = this.followListener.bind(this);
-        }
-
-        ConductorRepresenter.prototype.boundsListener = function (bounds) {
-            var timeSystem = this.timeAPI.timeSystem();
-            this.scope.$broadcast('telemetry:display:bounds', {
-                start: bounds.start,
-                end: bounds.end,
-                domain: timeSystem.key
-            }, this.timeAPI.clock() !== undefined);
-        };
-
-        ConductorRepresenter.prototype.timeSystemListener = function (timeSystem) {
-            var bounds = this.timeAPI.bounds();
-            this.scope.$broadcast('telemetry:display:bounds', {
-                start: bounds.start,
-                end: bounds.end,
-                domain: timeSystem.key
-            }, this.timeAPI.clock() !== undefined);
-        };
-
-        ConductorRepresenter.prototype.followListener = function () {
-            this.boundsListener(this.timeAPI.bounds());
-        };
-
-        // Handle a specific representation of a specific domain object
-        ConductorRepresenter.prototype.represent = function represent(representation) {
-            if (representation.key === 'browse-object') {
-                this.destroy();
-
-                this.timeAPI.on("bounds", this.boundsListener);
-                this.timeAPI.on("timeSystem", this.timeSystemListener);
-                this.timeAPI.on("follow", this.followListener);
-            }
-        };
-
-        ConductorRepresenter.prototype.destroy = function destroy() {
-            this.timeAPI.off("bounds", this.boundsListener);
-            this.timeAPI.off("timeSystem", this.timeSystemListener);
-            this.timeAPI.off("follow", this.followListener);
-        };
-
-        return ConductorRepresenter;
-    }
-);
-

platform/features/conductor/core/bundle.js

@@ -1,158 +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/ui/TimeConductorController",
-    "./src/ui/ConductorAxisController",
-    "./src/ui/ConductorTOIController",
-    "./src/ui/ConductorTOIDirective",
-    "./src/ui/TimeOfInterestController",
-    "./src/ui/ConductorAxisDirective",
-    "./src/ui/NumberFormat",
-    "./src/ui/StringFormat",
-    "text!./res/templates/time-conductor.html",
-    "text!./res/templates/mode-selector/mode-selector.html",
-    "text!./res/templates/mode-selector/mode-menu.html",
-    "text!./res/templates/time-of-interest.html",
-    "legacyRegistry"
-], function (
-    TimeConductorController,
-    ConductorAxisController,
-    ConductorTOIController,
-    ConductorTOIDirective,
-    TimeOfInterestController,
-    ConductorAxisDirective,
-    NumberFormat,
-    StringFormat,
-    timeConductorTemplate,
-    modeSelectorTemplate,
-    modeMenuTemplate,
-    timeOfInterest,
-    legacyRegistry
-) {
-
-    legacyRegistry.register("platform/features/conductor/core", {
-        "extensions": {
-            "controllers": [
-                {
-                    "key": "TimeConductorController",
-                    "implementation": TimeConductorController,
-                    "depends": [
-                        "$scope",
-                        "$window",
-                        "openmct",
-                        "formatService",
-                        "CONDUCTOR_CONFIG"
-                    ]
-                },
-                {
-                    "key": "ConductorTOIController",
-                    "implementation": ConductorTOIController,
-                    "depends": [
-                        "$scope",
-                        "openmct",
-                        "formatService"
-                    ]
-                },
-                {
-                    "key": "TimeOfInterestController",
-                    "implementation": TimeOfInterestController,
-                    "depends": [
-                        "$scope",
-                        "openmct",
-                        "formatService"
-                    ]
-                }
-            ],
-            "directives": [
-                {
-                    "key": "conductorAxis",
-                    "implementation": ConductorAxisDirective,
-                    "depends": [
-                        "openmct",
-                        "formatService"
-                    ]
-                },
-                {
-                    "key": "conductorToi",
-                    "implementation": ConductorTOIDirective
-                }
-            ],
-            "stylesheets": [
-                {
-                    "stylesheetUrl": "css/time-conductor-espresso.css",
-                    "theme": "espresso"
-                },
-                {
-                    "stylesheetUrl": "css/time-conductor-snow.css",
-                    "theme": "snow"
-                }
-            ],
-            "templates": [
-                {
-                    "key": "conductor",
-                    "template": timeConductorTemplate
-                },
-                {
-                    "key": "mode-menu",
-                    "template": modeMenuTemplate
-                },
-                {
-                    "key": "mode-selector",
-                    "template": modeSelectorTemplate
-                },
-                {
-                    "key": "time-of-interest",
-                    "template": timeOfInterest
-                }
-            ],
-            "representations": [
-                {
-                    "key": "time-conductor",
-                    "template": timeConductorTemplate
-                }
-            ],
-            "licenses": [
-                {
-                    "name": "D3: Data-Driven Documents",
-                    "version": "4.1.0",
-                    "author": "Mike Bostock",
-                    "description": "D3 (or D3.js) is a JavaScript library for visualizing data using web standards. D3 helps you bring data to life using SVG, Canvas and HTML. D3 combines powerful visualization and interaction techniques with a data-driven approach to DOM manipulation, giving you the full capabilities of modern browsers and the freedom to design the right visual interface for your data.",
-                    "website": "https://d3js.org/",
-                    "copyright": "Copyright 2010-2016 Mike Bostock",
-                    "license": "BSD-3-Clause",
-                    "link": "https://github.com/d3/d3/blob/master/LICENSE"
-                }
-            ],
-            "formats": [
-                {
-                    "key": "number",
-                    "implementation": NumberFormat
-                },
-                {
-                    "key": "string",
-                    "implementation": StringFormat
-                }
-            ]
-        }
-    });
-});

platform/features/conductor/core/res/templates/mode-selector/mode-menu.html

@@ -1,46 +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.
--->
-<div class="w-menu">
-    <div class="col menu-items">
-        <ul>
-            <li ng-repeat="metadata in ngModel.options"
-                ng-click="ngModel.select(metadata)">
-                <a ng-mouseover="ngModel.activeMetadata = metadata"
-                   ng-mouseleave="ngModel.activeMetadata = undefined"
-                   class="menu-item-a {{metadata.cssClass}}">
-                    {{metadata.name}}
-                </a>
-            </li>
-        </ul>
-    </div>
-    <div class="col menu-item-description">
-        <div class="desc-area ui-symbol icon type-icon {{ngModel.activeMetadata.cssClass}}"></div>
-        <div class="w-title-desc">
-            <div class="desc-area title">
-                {{ngModel.activeMetadata.name}}
-            </div>
-            <div class="desc-area description">
-                {{ngModel.activeMetadata.description}}
-            </div>
-        </div>
-    </div>
-</div>

platform/features/conductor/core/res/templates/mode-selector/mode-selector.html

@@ -1,33 +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.
--->
-<span ng-controller="ClickAwayController as modeController">
-    <div class="s-menu-button"
-         ng-click="modeController.toggle()">
-		<span class="title-label">{{ngModel.selected.name}}</span>
-    </div>
-    <div class="menu super-menu mini l-mode-selector-menu"
-         ng-show="modeController.isActive()">
-        <mct-include key="'mode-menu'"
-                     ng-model="ngModel">
-        </mct-include>
-    </div>
-</span>

platform/features/conductor/core/res/templates/time-conductor.html

@@ -1,117 +0,0 @@
-<!-- Parent holder for time conductor. follow-mode | fixed-mode -->
-<div ng-controller="TimeConductorController as tcController"
-    class="holder grows flex-elem l-flex-row l-time-conductor {{tcController.isFixed ? 'fixed-mode' : 'realtime-mode'}} {{timeSystemModel.selected.metadata.key}}-time-system"
-        ng-class="{'status-panning': tcController.panning}">
-    <div class="flex-elem holder time-conductor-icon">
-        <div class="hand-little"></div>
-        <div class="hand-big"></div>
-    </div>
-
-    <div class="flex-elem holder grows l-flex-col l-time-conductor-inner">
-        <!-- Holds inputs and ticks -->
-        <div class="l-time-conductor-inputs-and-ticks l-row-elem flex-elem no-margin">
-            <form class="l-time-conductor-inputs-holder"
-                  ng-submit="tcController.isFixed ? tcController.setBoundsFromView(boundsModel) : tcController.setOffsetsFromView(boundsModel)">
-                <span class="l-time-range-w start-w">
-                    <span class="l-time-conductor-inputs">
-                        <span class="l-time-range-input-w start-date">
-                            <span class="title"></span>
-                            <mct-control key="'datetime-field'"
-                                         structure="{
-                                             format: timeSystemModel.format,
-                                             validate: tcController.validation.validateStart
-                                         }"
-                                         ng-model="boundsModel"
-                                         ng-blur="tcController.setBoundsFromView(boundsModel)"
-                                         field="'start'"
-                                         class="time-range-input">
-                            </mct-control>
-                        </span>
-                            <span class="l-time-range-input-w time-delta start-delta"
-                              ng-class="{'hide':tcController.isFixed}">
-                                -
-                            <mct-control key="'datetime-field'"
-                                         structure="{
-                                            format: timeSystemModel.durationFormat,
-                                            validate: tcController.validation.validateStartOffset
-                                         }"
-                                         ng-model="boundsModel"
-                                         ng-blur="tcController.setOffsetsFromView(boundsModel)"
-                                         field="'startOffset'"
-                                         class="s-input-inline hrs-min-input">
-                            </mct-control>
-                        </span>
-                    </span>
-                </span>
-                <span class="l-time-range-w end-w">
-                    <span class="l-time-conductor-inputs">
-                        <span class="l-time-range-input-w end-date"
-                              ng-controller="ToggleController as t2">
-                            <span class="title"></span>
-                            <mct-control key="'datetime-field'"
-                                         structure="{
-                                             format: timeSystemModel.format,
-                                             validate: tcController.validation.validateEnd
-                                         }"
-                                         ng-model="boundsModel"
-                                         ng-blur="tcController.setBoundsFromView(boundsModel)"
-                                         ng-disabled="!tcController.isFixed"
-                                         field="'end'"
-                                         class="time-range-input">
-                            </mct-control>
-                        </span>
-                        <span class="l-time-range-input-w time-delta end-delta"
-                              ng-class="{'hide': tcController.isFixed}">
-                                +
-                            <mct-control key="'datetime-field'"
-                                         structure="{
-                                            format: timeSystemModel.durationFormat,
-                                            validate: tcController.validation.validateEndOffset
-                                         }"
-                                         ng-model="boundsModel"
-                                         ng-blur="tcController.setOffsetsFromView(boundsModel)"
-                                         field="'endOffset'"
-                                         class="s-input-inline hrs-min-input">
-                            </mct-control>
-                        </span>
-                    </span>
-                </span>
-
-                <input type="submit" class="invisible">
-            </form>
-            <conductor-axis class="mobile-hide" view-service="tcController.conductorViewService"></conductor-axis>
-        </div>
-
-        <!-- Holds time system and session selectors, and zoom control -->
-        <div class="l-time-conductor-controls l-row-elem l-flex-row flex-elem">
-            <mct-include
-                key="'mode-selector'"
-                ng-model="tcController.menu"
-                class="holder flex-elem menus-up mode-selector">
-            </mct-include>
-            <mct-control
-                    key="'menu-button'"
-                    class="holder flex-elem menus-up time-system"
-                    structure="{
-                        text: timeSystemModel.selected.name,
-                        click: tcController.setTimeSystemFromView,
-                        options: tcController.timeSystemsForClocks[tcController.menu.selected.key]
-                    }">
-            </mct-control>
-            <!-- Zoom control -->
-            <div ng-if="tcController.zoom"
-                 class="l-time-conductor-zoom-w grows flex-elem l-flex-row">
-                {{currentZoom}}
-                <span class="time-conductor-zoom-current-range flex-elem flex-fixed holder">{{timeUnits}}</span>
-                <input class="time-conductor-zoom flex-elem" type="range"
-                       ng-model="tcController.currentZoom"
-                       ng-mouseUp="tcController.onZoomStop(tcController.currentZoom)"
-                       ng-change="tcController.onZoom(tcController.currentZoom)"
-                       min="0.01"
-                       step="0.01"
-                       max="0.99" />
-            </div>
-        </div>
-
-    </div>
-</div>

platform/features/conductor/core/res/templates/time-of-interest.html

@@ -1,12 +0,0 @@
-<div class="abs angular-controller"
-     ng-controller="TimeOfInterestController as toi">
-    <div class="l-flex-row l-toi">
-        <span class="flex-elem l-flex-row l-toi-buttons">
-            <a class="flex-elem t-button-resync icon-button" title="Re-sync Time of Interest"
-               ng-click="toi.resync()"></a>
-            <a class="flex-elem t-button-unpin icon-button" title="Unset Time of Interest"
-               ng-click="toi.dismiss()"></a>
-        </span>
-        <span class="flex-elem l-toi-val">{{toi.toiText}}</span>
-    </div>
-</div>

platform/features/conductor/core/src/ui/ConductorAxisController.js

@@ -1,236 +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(
-    [
-        "d3-selection",
-        "d3-scale",
-        "d3-axis"
-    ],
-    function (d3Selection, d3Scale, d3Axis) {
-        var PADDING = 1;
-
-        /**
-         * Controller that renders a horizontal time scale spanning the current bounds defined in the time conductor.
-         * Used by the mct-conductor-axis directive
-         * @constructor
-         */
-        function ConductorAxisController(openmct, formatService, scope, element) {
-            // Dependencies
-            this.formatService = formatService;
-            this.timeAPI = openmct.time;
-
-            this.scope = scope;
-
-            this.bounds = this.timeAPI.bounds();
-
-            //Bind all class functions to 'this'
-            Object.keys(ConductorAxisController.prototype).filter(function (key) {
-                return typeof ConductorAxisController.prototype[key] === 'function';
-            }).forEach(function (key) {
-                this[key] = ConductorAxisController.prototype[key].bind(this);
-            }.bind(this));
-
-            this.initialize(element);
-        }
-
-        /**
-         * @private
-         */
-        ConductorAxisController.prototype.destroy = function () {
-            this.timeAPI.off('timeSystem', this.changeTimeSystem);
-            this.timeAPI.off('bounds', this.changeBounds);
-            this.viewService.off("zoom", this.onZoom);
-            this.viewService.off("zoom-stop", this.onZoomStop);
-        };
-
-        /**
-         * @private
-         */
-        ConductorAxisController.prototype.initialize = function (element) {
-            this.target = element[0].firstChild;
-            var height = this.target.offsetHeight;
-            var vis = d3Selection.select(this.target)
-                .append("svg:svg")
-                .attr("width", "100%")
-                .attr("height", height);
-
-            this.xAxis = d3Axis.axisTop();
-
-            // draw x axis with labels. CSS is used to position them.
-            this.axisElement = vis.append("g");
-
-            if (this.timeAPI.timeSystem() !== undefined) {
-                this.changeTimeSystem(this.timeAPI.timeSystem());
-                this.setScale();
-            }
-
-            //Respond to changes in conductor
-            this.timeAPI.on("timeSystem", this.changeTimeSystem);
-            this.timeAPI.on("bounds", this.changeBounds);
-
-            this.scope.$on("$destroy", this.destroy);
-
-            this.viewService.on("zoom", this.onZoom);
-            this.viewService.on("zoom-stop", this.onZoomStop);
-        };
-
-        /**
-         * @private
-         */
-        ConductorAxisController.prototype.changeBounds = function (bounds) {
-            this.bounds = bounds;
-            if (!this.zooming) {
-                this.setScale();
-            }
-        };
-
-        /**
-         * Set the scale of the axis, based on current conductor bounds.
-         */
-        ConductorAxisController.prototype.setScale = function () {
-            var width = this.target.offsetWidth;
-            var timeSystem = this.timeAPI.timeSystem();
-            var bounds = this.bounds;
-
-            if (timeSystem.isUTCBased) {
-                this.xScale = this.xScale || d3Scale.scaleUtc();
-                this.xScale.domain([new Date(bounds.start), new Date(bounds.end)]);
-            } else {
-                this.xScale = this.xScale || d3Scale.scaleLinear();
-                this.xScale.domain([bounds.start, bounds.end]);
-            }
-
-            this.xAxis.scale(this.xScale);
-
-            this.xScale.range([PADDING, width - PADDING * 2]);
-            this.axisElement.call(this.xAxis);
-
-            this.msPerPixel = (bounds.end - bounds.start) / width;
-        };
-
-        /**
-         * When the time system changes, update the scale and formatter used for showing times.
-         * @param timeSystem
-         */
-        ConductorAxisController.prototype.changeTimeSystem = function (timeSystem) {
-            var key = timeSystem.timeFormat;
-            if (key !== undefined) {
-                var format = this.formatService.getFormat(key);
-                var bounds = this.timeAPI.bounds();
-
-                //The D3 scale used depends on the type of time system as d3
-                // supports UTC out of the box.
-                if (timeSystem.isUTCBased) {
-                    this.xScale = d3Scale.scaleUtc();
-                } else {
-                    this.xScale = d3Scale.scaleLinear();
-                }
-
-                this.xAxis.scale(this.xScale);
-
-                //Define a custom format function
-                this.xAxis.tickFormat(function (tickValue) {
-                    // Normalize date representations to numbers
-                    if (tickValue instanceof Date) {
-                        tickValue = tickValue.getTime();
-                    }
-                    return format.format(tickValue, {
-                        min: bounds.start,
-                        max: bounds.end
-                    });
-                });
-                this.axisElement.call(this.xAxis);
-            }
-        };
-
-        /**
-         * The user has stopped panning the time conductor scale element.
-         * @event panStop
-         */
-        /**
-         * Called on release of mouse button after dragging the scale left or right.
-         * @fires platform.features.conductor.ConductorAxisController~panStop
-         */
-        ConductorAxisController.prototype.panStop = function () {
-            //resync view bounds with time conductor bounds
-            this.viewService.emit("pan-stop");
-            this.timeAPI.bounds(this.bounds);
-        };
-
-        /**
-         * Rescales the axis when the user zooms. Although zoom ultimately results in a bounds change once the user
-         * releases the zoom slider, dragging the slider will not immediately change the conductor bounds. It will
-         * however immediately update the scale and the bounds displayed in the UI.
-         * @private
-         * @param {ZoomLevel}
-         */
-        ConductorAxisController.prototype.onZoom = function (zoom) {
-            this.zooming = true;
-
-            this.bounds = zoom.bounds;
-            this.setScale();
-        };
-
-        /**
-         * @private
-         */
-        ConductorAxisController.prototype.onZoomStop = function (zoom) {
-            this.zooming = false;
-        };
-
-        /**
-         * @event platform.features.conductor.ConductorAxisController~pan
-         * Fired when the time conductor is panned
-         */
-        /**
-         * Initiate panning via a click + drag gesture on the time conductor
-         * scale. Panning triggers a "pan" event
-         * @param {number} delta the offset from the original click event
-         * @see TimeConductorViewService#
-         * @fires platform.features.conductor.ConductorAxisController~pan
-         */
-        ConductorAxisController.prototype.pan = function (delta) {
-            if (this.timeAPI.clock() === undefined) {
-                var deltaInMs = delta[0] * this.msPerPixel;
-                var bounds = this.timeAPI.bounds();
-                var start = Math.floor((bounds.start - deltaInMs) / 1000) * 1000;
-                var end = Math.floor((bounds.end - deltaInMs) / 1000) * 1000;
-                this.bounds = {
-                    start: start,
-                    end: end
-                };
-                this.setScale();
-                this.viewService.emit("pan", this.bounds);
-            }
-        };
-
-        /**
-         * Invoked on element resize. Will rebuild the scale based on the new dimensions of the element.
-         */
-        ConductorAxisController.prototype.resize = function () {
-            this.setScale();
-        };
-
-        return ConductorAxisController;
-    }
-);

platform/features/conductor/core/src/ui/ConductorAxisControllerSpec.js

@@ -1,178 +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([
-    './ConductorAxisController',
-    'zepto',
-    'd3-selection',
-    'd3-scale'
-], function (
-    ConductorAxisController,
-    $,
-    d3Selection,
-    d3Scale
-) {
-    describe("The ConductorAxisController", function () {
-        var controller,
-            mockConductor,
-            mockConductorViewService,
-            mockFormatService,
-            mockScope,
-            mockElement,
-            mockTarget,
-            mockBounds,
-            element,
-            mockTimeSystem,
-            mockFormat;
-
-        function getCallback(target, name) {
-            return target.calls.all().filter(function (call) {
-                return call.args[0] === name;
-            })[0].args[1];
-        }
-
-        beforeEach(function () {
-            mockScope = jasmine.createSpyObj("scope", [
-                "$on"
-            ]);
-
-            //Add some HTML elements
-            mockTarget = {
-                offsetWidth: 0,
-                offsetHeight: 0
-            };
-            mockElement = {
-                firstChild: mockTarget
-            };
-            mockBounds = {
-                start: 100,
-                end: 200
-            };
-            mockConductor = jasmine.createSpyObj("conductor", [
-                "timeSystem",
-                "bounds",
-                "on",
-                "off",
-                "clock"
-            ]);
-            mockConductor.bounds.and.returnValue(mockBounds);
-
-            mockFormatService = jasmine.createSpyObj("formatService", [
-                "getFormat"
-            ]);
-
-            mockConductorViewService = jasmine.createSpyObj("conductorViewService", [
-                "on",
-                "off",
-                "emit"
-            ]);
-
-            spyOn(d3Scale, 'scaleUtc').and.callThrough();
-            spyOn(d3Scale, 'scaleLinear').and.callThrough();
-
-            element = $('<div style="width: 100px;"><div style="width: 100%;"></div></div>');
-            $(document).find('body').append(element);
-            ConductorAxisController.prototype.viewService = mockConductorViewService;
-            controller = new ConductorAxisController({time: mockConductor}, mockFormatService, mockScope, element);
-
-            mockTimeSystem = {};
-            mockFormat = jasmine.createSpyObj("format", [
-                "format"
-            ]);
-
-            mockTimeSystem.timeFormat = "mockFormat";
-            mockFormatService.getFormat.and.returnValue(mockFormat);
-            mockConductor.timeSystem.and.returnValue(mockTimeSystem);
-            mockTimeSystem.isUTCBased = false;
-        });
-
-        it("listens for changes to time system and bounds", function () {
-            expect(mockConductor.on).toHaveBeenCalledWith("timeSystem", controller.changeTimeSystem);
-            expect(mockConductor.on).toHaveBeenCalledWith("bounds", controller.changeBounds);
-        });
-
-        it("on scope destruction, deregisters listeners", function () {
-            expect(mockScope.$on).toHaveBeenCalledWith("$destroy", controller.destroy);
-            controller.destroy();
-            expect(mockConductor.off).toHaveBeenCalledWith("timeSystem", controller.changeTimeSystem);
-            expect(mockConductor.off).toHaveBeenCalledWith("bounds", controller.changeBounds);
-        });
-
-        describe("when the time system changes", function () {
-            it("uses a UTC scale for UTC time systems", function () {
-                mockTimeSystem.isUTCBased = true;
-                controller.changeTimeSystem(mockTimeSystem);
-
-                expect(d3Scale.scaleUtc).toHaveBeenCalled();
-                expect(d3Scale.scaleLinear).not.toHaveBeenCalled();
-            });
-
-            it("uses a linear scale for non-UTC time systems", function () {
-                mockTimeSystem.isUTCBased = false;
-                controller.changeTimeSystem(mockTimeSystem);
-                expect(d3Scale.scaleLinear).toHaveBeenCalled();
-                expect(d3Scale.scaleUtc).not.toHaveBeenCalled();
-            });
-
-            it("sets axis domain to time conductor bounds", function () {
-                mockTimeSystem.isUTCBased = false;
-                controller.setScale();
-                expect(controller.xScale.domain()).toEqual([mockBounds.start, mockBounds.end]);
-            });
-
-            it("uses the format specified by the time system to format tick" +
-                " labels", function () {
-                controller.changeTimeSystem(mockTimeSystem);
-                expect(mockFormat.format).toHaveBeenCalled();
-            });
-
-            it('responds to zoom events', function () {
-                expect(mockConductorViewService.on).toHaveBeenCalledWith("zoom", controller.onZoom);
-                var cb = getCallback(mockConductorViewService.on, "zoom");
-                spyOn(controller, 'setScale').and.callThrough();
-                cb({bounds: {start: 0, end: 100}});
-                expect(controller.setScale).toHaveBeenCalled();
-            });
-
-            it('adjusts scale on pan', function () {
-                spyOn(controller, 'setScale').and.callThrough();
-                controller.pan(100);
-                expect(controller.setScale).toHaveBeenCalled();
-            });
-
-            it('emits event on pan', function () {
-                spyOn(controller, 'setScale').and.callThrough();
-                controller.pan(100);
-                expect(mockConductorViewService.emit).toHaveBeenCalledWith("pan", jasmine.any(Object));
-            });
-
-            it('cleans up listeners on destruction', function () {
-                controller.destroy();
-                expect(mockConductor.off).toHaveBeenCalledWith("bounds", controller.changeBounds);
-                expect(mockConductor.off).toHaveBeenCalledWith("timeSystem", controller.changeTimeSystem);
-
-                expect(mockConductorViewService.off).toHaveBeenCalledWith("zoom", controller.onZoom);
-            });
-
-        });
-    });
-});

platform/features/conductor/core/src/ui/ConductorAxisDirective.js

@@ -1,56 +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(['./ConductorAxisController'], function (ConductorAxisController) {
-    function ConductorAxisDirective() {
-        /**
-         * The mct-conductor-axis renders a horizontal axis with regular
-         * labelled 'ticks'. It requires 'start' and 'end' integer values to
-         * be specified as attributes.
-         */
-        return {
-            controller: [
-                'openmct',
-                'formatService',
-                '$scope',
-                '$element',
-                ConductorAxisController
-            ],
-            controllerAs: 'axis',
-            scope: {
-                viewService: "="
-            },
-            bindToController: true,
-
-            restrict: 'E',
-            priority: 1000,
-
-            template: '<div class="l-axis-holder" ' +
-            '    mct-drag-down="axis.panStart()"' +
-            '    mct-drag-up="axis.panStop(delta)"' +
-            '    mct-drag="axis.pan(delta)"' +
-            '    mct-resize="axis.resize()"></div>'
-        };
-    }
-
-    return ConductorAxisDirective;
-});

platform/features/conductor/core/src/ui/ConductorTOIController.js

@@ -1,123 +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(
-    ["zepto"],
-    function ($) {
-
-        /**
-         * Controller for the Time of Interest indicator in the conductor itself. Sets the horizontal position of the
-         * TOI indicator based on the current value of the TOI, and the width of the TOI conductor.
-         * @memberof platform.features.conductor
-         */
-        function ConductorTOIController($scope, openmct) {
-            this.timeAPI = openmct.time;
-
-            //Bind all class functions to 'this'
-            Object.keys(ConductorTOIController.prototype).filter(function (key) {
-                return typeof ConductorTOIController.prototype[key] === 'function';
-            }).forEach(function (key) {
-                this[key] = ConductorTOIController.prototype[key].bind(this);
-            }.bind(this));
-
-            this.timeAPI.on('timeOfInterest', this.changeTimeOfInterest);
-            this.viewService.on('zoom', this.setOffsetFromZoom);
-            this.viewService.on('pan', this.setOffsetFromBounds);
-
-            var timeOfInterest = this.timeAPI.timeOfInterest();
-            if (timeOfInterest) {
-                this.changeTimeOfInterest(timeOfInterest);
-            }
-
-            $scope.$on('$destroy', this.destroy);
-        }
-
-        /**
-         * @private
-         */
-        ConductorTOIController.prototype.destroy = function () {
-            this.timeAPI.off('timeOfInterest', this.changeTimeOfInterest);
-            this.viewService.off('zoom', this.setOffsetFromZoom);
-            this.viewService.off('pan', this.setOffsetFromBounds);
-        };
-
-        /**
-         * Given some bounds, set horizontal position of TOI indicator based
-         * on current conductor TOI value. Bounds are provided so that
-         * ephemeral bounds from zoom and pan events can be used as well
-         * as current conductor bounds, allowing TOI to be updated in
-         * realtime during scroll and zoom.
-         * @param {TimeConductorBounds} bounds
-         */
-        ConductorTOIController.prototype.setOffsetFromBounds = function (bounds) {
-            var toi = this.timeAPI.timeOfInterest();
-            if (toi !== undefined) {
-                var offset = toi - bounds.start;
-                var duration = bounds.end - bounds.start;
-                this.left = offset / duration * 100;
-                this.pinned = true;
-            } else {
-                this.left = 0;
-                this.pinned = false;
-            }
-        };
-
-        /**
-         * @private
-         */
-        ConductorTOIController.prototype.setOffsetFromZoom = function (zoom) {
-            return this.setOffsetFromBounds(zoom.bounds);
-        };
-
-        /**
-         * Invoked when time of interest changes. Will set the horizontal offset of the TOI indicator.
-         * @private
-         */
-        ConductorTOIController.prototype.changeTimeOfInterest = function () {
-            var bounds = this.timeAPI.bounds();
-            if (bounds) {
-                this.setOffsetFromBounds(bounds);
-            }
-        };
-
-        /**
-         * On a mouse click event within the TOI element, convert position within element to a time of interest, and
-         * set the time of interest on the conductor.
-         * @param e The angular $event object
-         */
-        ConductorTOIController.prototype.setTOIFromPosition = function (e) {
-            //TOI is set using the alt key modified + primary click
-            if (e.altKey) {
-                var element = $(e.currentTarget);
-                var width = element.width();
-                var relativeX = e.pageX - element.offset().left;
-                var percX = relativeX / width;
-                var bounds = this.timeAPI.bounds();
-                var timeRange = bounds.end - bounds.start;
-
-                this.timeAPI.timeOfInterest(timeRange * percX + bounds.start);
-            }
-        };
-
-        return ConductorTOIController;
-    }
-);

platform/features/conductor/core/src/ui/ConductorTOIControllerSpec.js

@@ -1,153 +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([
-    './ConductorTOIController'
-], function (
-    ConductorTOIController
-) {
-    var mockConductor;
-    var mockConductorViewService;
-    var mockScope;
-    var mockAPI;
-    var conductorTOIController;
-
-    function getNamedCallback(thing, name) {
-        return thing.calls.all().filter(function (call) {
-            return call.args[0] === name;
-        }).map(function (call) {
-            return call.args;
-        })[0][1];
-    }
-
-    describe("The ConductorTOIController", function () {
-        beforeEach(function () {
-            mockConductor = jasmine.createSpyObj("conductor", [
-                "bounds",
-                "timeOfInterest",
-                "on",
-                "off"
-            ]);
-            mockAPI = {time: mockConductor};
-
-            mockConductorViewService = jasmine.createSpyObj("conductorViewService", [
-                "on",
-                "off"
-            ]);
-
-            mockScope = jasmine.createSpyObj("openMCT", [
-                "$on"
-            ]);
-            ConductorTOIController.prototype.viewService = mockConductorViewService;
-            conductorTOIController = new ConductorTOIController(mockScope, mockAPI);
-        });
-
-        it("listens to changes in the time of interest on the conductor", function () {
-            expect(mockConductor.on).toHaveBeenCalledWith("timeOfInterest", jasmine.any(Function));
-        });
-
-        describe("when responding to changes in the time of interest", function () {
-            var toiCallback;
-            beforeEach(function () {
-                var bounds = {
-                    start: 0,
-                    end: 200
-                };
-                mockConductor.bounds.and.returnValue(bounds);
-                toiCallback = getNamedCallback(mockConductor.on, "timeOfInterest");
-            });
-
-            it("calculates the correct horizontal offset based on bounds and current TOI", function () {
-                //Expect time of interest position to be 50% of element width
-                mockConductor.timeOfInterest.and.returnValue(100);
-                toiCallback();
-                expect(conductorTOIController.left).toBe(50);
-
-                //Expect time of interest position to be 25% of element width
-                mockConductor.timeOfInterest.and.returnValue(50);
-                toiCallback();
-                expect(conductorTOIController.left).toBe(25);
-
-                //Expect time of interest position to be 0% of element width
-                mockConductor.timeOfInterest.and.returnValue(0);
-                toiCallback();
-                expect(conductorTOIController.left).toBe(0);
-
-                //Expect time of interest position to be 100% of element width
-                mockConductor.timeOfInterest.and.returnValue(200);
-                toiCallback();
-                expect(conductorTOIController.left).toBe(100);
-            });
-
-            it("renders the TOI indicator visible", function () {
-                expect(conductorTOIController.pinned).toBeFalsy();
-                mockConductor.timeOfInterest.and.returnValue(100);
-                toiCallback();
-                expect(conductorTOIController.pinned).toBe(true);
-            });
-        });
-
-        it("responds to zoom events", function () {
-            var mockZoom = {
-                bounds: {
-                    start: 500,
-                    end: 1000
-                }
-            };
-            expect(mockConductorViewService.on).toHaveBeenCalledWith("zoom", jasmine.any(Function));
-
-            // Should correspond to horizontal offset of 50%
-            mockConductor.timeOfInterest.and.returnValue(750);
-            var zoomCallback = getNamedCallback(mockConductorViewService.on, "zoom");
-            zoomCallback(mockZoom);
-            expect(conductorTOIController.left).toBe(50);
-        });
-
-        it("responds to pan events", function () {
-            var mockPanBounds = {
-                start: 1000,
-                end: 3000
-            };
-
-            expect(mockConductorViewService.on).toHaveBeenCalledWith("pan", jasmine.any(Function));
-
-            // Should correspond to horizontal offset of 25%
-            mockConductor.timeOfInterest.and.returnValue(1500);
-            var panCallback = getNamedCallback(mockConductorViewService.on, "pan");
-            panCallback(mockPanBounds);
-            expect(conductorTOIController.left).toBe(25);
-        });
-
-
-        it("Cleans up all listeners when controller destroyed", function () {
-            var zoomCB = getNamedCallback(mockConductorViewService.on, "zoom");
-            var panCB = getNamedCallback(mockConductorViewService.on, "pan");
-            var toiCB = getNamedCallback(mockConductor.on, "timeOfInterest");
-
-            expect(mockScope.$on).toHaveBeenCalledWith("$destroy", jasmine.any(Function));
-            getNamedCallback(mockScope.$on, "$destroy")();
-            expect(mockConductorViewService.off).toHaveBeenCalledWith("zoom", zoomCB);
-            expect(mockConductorViewService.off).toHaveBeenCalledWith("pan", panCB);
-            expect(mockConductor.off).toHaveBeenCalledWith("timeOfInterest", toiCB);
-        });
-    });
-});

platform/features/conductor/core/src/ui/ConductorTOIDirective.js

@@ -1,63 +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(['./ConductorTOIController'], function (ConductorTOIController) {
-    /**
-     * A directive that encapsulates the TOI specific behavior of the Time Conductor UI.
-     * @constructor
-     */
-    function ConductorTOIDirective() {
-        /**
-         * The mct-conductor-axis renders a horizontal axis with regular
-         * labelled 'ticks'. It requires 'start' and 'end' integer values to
-         * be specified as attributes.
-         */
-        return {
-            controller: [
-                '$scope',
-                'openmct',
-                ConductorTOIController
-            ],
-            controllerAs: 'toi',
-            scope: {
-                viewService: "="
-            },
-            bindToController: true,
-
-            restrict: 'E',
-            priority: 1000,
-
-            template:
-                '<div class="l-data-visualization-holder l-row-elem flex-elem">' +
-                '   <a class="l-page-button s-icon-button icon-pointer-left"></a>' +
-                '   <div class="l-data-visualization" ng-click="toi.setTOIFromPosition($event)">' +
-                '       <mct-include key="\'time-of-interest\'" class="l-toi-holder show-val" ' +
-                '       ng-class="{ pinned: toi.pinned, \'val-to-left\': toi.left > 80 }" ' +
-                '       ng-style="{\'left\': toi.left + \'%\'}"></mct-include>' +
-                '   </div>' +
-                '   <a class="l-page-button align-right s-icon-button icon-pointer-right"></a>' +
-                '</div>'
-        };
-    }
-
-    return ConductorTOIDirective;
-});

platform/features/conductor/core/src/ui/NumberFormatSpec.js

@@ -1,49 +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(['./NumberFormat'], function (NumberFormat) {
-    describe("The NumberFormat class", function () {
-        var format;
-        beforeEach(function () {
-            format = new NumberFormat();
-        });
-
-        it("The format function takes a string and produces a number", function () {
-            var text = format.format(1);
-            expect(text).toBe("1");
-            expect(typeof text).toBe("string");
-        });
-
-        it("The parse function takes a string and produces a number", function () {
-            var number = format.parse("1");
-            expect(number).toBe(1);
-            expect(typeof number).toBe("number");
-        });
-
-        it("validates that the input is a number", function () {
-            expect(format.validate("1")).toBe(true);
-            expect(format.validate(1)).toBe(true);
-            expect(format.validate("1.1")).toBe(true);
-            expect(format.validate("abc")).toBe(false);
-        });
-    });
-});

platform/features/conductor/core/src/ui/TimeConductorController.js

@@ -1,554 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    [
-        'moment',
-        './TimeConductorValidation',
-        './TimeConductorViewService'
-    ],
-    function (
-        moment,
-        TimeConductorValidation,
-        TimeConductorViewService
-    ) {
-
-        var timeUnitsMegastructure = [
-            ["Decades", function (r) {
-                return r.years() > 15;
-            }],
-            ["Years", function (r) {
-                return r.years() > 1;
-            }],
-            ["Months", function (r) {
-                return r.years() === 1 || r.months() > 1;
-            }],
-            ["Days", function (r) {
-                return r.months() === 1 || r.days() > 1;
-            }],
-            ["Hours", function (r) {
-                return r.days() === 1 || r.hours() > 1;
-            }],
-            ["Minutes", function (r) {
-                return r.hours() === 1 || r.minutes() > 1;
-            }],
-            ["Seconds", function (r) {
-                return r.minutes() === 1 || r.seconds() > 1;
-            }],
-            ["Milliseconds", function (r) {
-                return true;
-            }]
-        ];
-
-        /**
-         * Controller for the Time Conductor UI element. The Time Conductor
-         * includes form fields for specifying time bounds and relative time
-         * offsets for queries, as well as controls for selection mode,
-         * time systems, and zooming.
-         * @memberof platform.features.conductor
-         * @constructor
-         */
-        function TimeConductorController(
-            $scope,
-            $window,
-            openmct,
-            formatService,
-            config
-        ) {
-
-            //Bind functions that are used as callbacks to 'this'.
-            [
-                "selectMenuOption",
-                "onPan",
-                "onPanStop",
-                "setViewFromBounds",
-                "setViewFromClock",
-                "setViewFromOffsets",
-                "setViewFromTimeSystem",
-                "setTimeSystemFromView",
-                "destroy"
-            ].forEach(function (name) {
-                this[name] = this[name].bind(this);
-            }.bind(this));
-
-            this.$scope = $scope;
-            this.$window = $window;
-            this.timeAPI = openmct.time;
-            this.conductorViewService = new TimeConductorViewService(openmct);
-            this.validation = new TimeConductorValidation(this.timeAPI);
-            this.formatService = formatService;
-            this.config = config;
-            this.timeSystemsForClocks = {};
-            this.$scope.timeSystemModel = {};
-            this.$scope.boundsModel = {};
-
-            this.timeSystems = this.timeAPI.getAllTimeSystems().reduce(function (map, timeSystem) {
-                map[timeSystem.key] = timeSystem;
-                return map;
-            }, {});
-
-            this.isFixed = this.timeAPI.clock() === undefined;
-
-            var options = this.optionsFromConfig(config);
-            this.menu = {
-                selected: undefined,
-                options: options,
-                select: this.selectMenuOption
-            };
-
-            //Set the initial state of the UI from the conductor state
-            var timeSystem = this.timeAPI.timeSystem();
-            if (timeSystem) {
-                this.setViewFromTimeSystem(timeSystem);
-            }
-
-            this.setViewFromClock(this.timeAPI.clock());
-
-            var offsets = this.timeAPI.clockOffsets();
-            if (offsets) {
-                this.setViewFromOffsets(offsets);
-            }
-
-            var bounds = this.timeAPI.bounds();
-            if (bounds && bounds.start !== undefined && bounds.end !== undefined) {
-                this.setViewFromBounds(bounds);
-            }
-
-            this.conductorViewService.on('pan', this.onPan);
-            this.conductorViewService.on('pan-stop', this.onPanStop);
-
-            //Respond to any subsequent conductor changes
-            this.timeAPI.on('bounds', this.setViewFromBounds);
-            this.timeAPI.on('timeSystem', this.setViewFromTimeSystem);
-            this.timeAPI.on('clock', this.setViewFromClock);
-            this.timeAPI.on('clockOffsets', this.setViewFromOffsets);
-            this.$scope.$on('$destroy', this.destroy);
-        }
-
-        /**
-         * Given a key for a clock, retrieve the clock object.
-         * @private
-         * @param key
-         * @returns {Clock}
-         */
-        TimeConductorController.prototype.getClock = function (key) {
-            return this.timeAPI.getAllClocks().filter(function (clock) {
-                return clock.key === key;
-            })[0];
-        };
-
-        /**
-         * Activate the selected menu option. Menu options correspond to clocks.
-         * A distinction is made to avoid confusion between the menu options and
-         * their metadata, and actual {@link Clock} objects.
-         *
-         * @private
-         * @param newOption
-         */
-        TimeConductorController.prototype.selectMenuOption = function (newOption) {
-            if (this.menu.selected.key === newOption.key) {
-                return;
-            }
-            this.menu.selected = newOption;
-
-            var config = this.getConfig(this.timeAPI.timeSystem(), newOption.clock);
-            if (!config) {
-                // Clock does not support this timeSystem, fallback to first
-                // option provided for clock.
-                config = this.config.menuOptions.filter(function (menuOption) {
-                    return menuOption.clock === (newOption.clock && newOption.clock.key);
-                })[0];
-            }
-
-            if (config.clock) {
-                this.timeAPI.clock(config.clock, config.clockOffsets);
-                this.timeAPI.timeSystem(config.timeSystem);
-            } else {
-                this.timeAPI.stopClock();
-                this.timeAPI.timeSystem(config.timeSystem, config.bounds);
-            }
-        };
-
-        /**
-         * From the provided configuration, build the available menu options.
-         * @private
-         * @param config
-         * @returns {*[]}
-         */
-        TimeConductorController.prototype.optionsFromConfig = function (config) {
-            /*
-             * "Fixed Mode" is always the first available option.
-             */
-            var options = [{
-                key: 'fixed',
-                name: 'Fixed Timespan Mode',
-                description: 'Query and explore data that falls between two fixed datetimes.',
-                cssClass: 'icon-calendar'
-            }];
-            var clocks = {};
-            var timeSystemsForClocks = this.timeSystemsForClocks;
-
-            (config.menuOptions || []).forEach(function (menuOption) {
-                var clockKey = menuOption.clock || 'fixed';
-                var clock = this.getClock(clockKey);
-
-                if (clock !== undefined) {
-                    clocks[clock.key] = clock;
-                }
-
-                var timeSystem = this.timeSystems[menuOption.timeSystem];
-                if (timeSystem !== undefined) {
-                    timeSystemsForClocks[clockKey] = timeSystemsForClocks[clockKey] || [];
-                    timeSystemsForClocks[clockKey].push(timeSystem);
-                }
-            }, this);
-
-            /*
-             * Populate the clocks menu with metadata from the available clocks
-             */
-            Object.values(clocks).forEach(function (clock) {
-                options.push({
-                    key: clock.key,
-                    name: clock.name,
-                    description: "Monitor streaming data in real-time. The Time " +
-                    "Conductor and displays will automatically advance themselves based on this clock. " + clock.description,
-                    cssClass: clock.cssClass || 'icon-clock',
-                    clock: clock
-                });
-            }.bind(this));
-
-            return options;
-        };
-
-        /**
-         * When bounds change, set UI values from the new bounds.
-         * @param {TimeBounds} bounds the bounds
-         */
-        TimeConductorController.prototype.setViewFromBounds = function (bounds) {
-            if (!this.zooming && !this.panning) {
-                this.$scope.boundsModel.start = bounds.start;
-                this.$scope.boundsModel.end = bounds.end;
-
-                if (this.supportsZoom()) {
-                    var config = this.getConfig(this.timeAPI.timeSystem(), this.timeAPI.clock());
-                    this.currentZoom = this.toSliderValue(bounds.end - bounds.start, config.zoomOutLimit, config.zoomInLimit);
-                    this.toTimeUnits(bounds.end - bounds.start);
-                }
-
-                /*
-                    Ensure that a digest occurs, capped at the browser's refresh
-                    rate.
-                 */
-                if (!this.pendingUpdate) {
-                    this.pendingUpdate = true;
-                    this.$window.requestAnimationFrame(function () {
-                        this.pendingUpdate = false;
-                        this.$scope.$digest();
-                    }.bind(this));
-                }
-            }
-        };
-
-        /**
-         * Retrieve any configuration defined for the provided time system and
-         * clock
-         * @private
-         * @param timeSystem
-         * @param clock
-         * @returns {object} The Time Conductor configuration corresponding to
-         * the provided combination of time system and clock
-         */
-        TimeConductorController.prototype.getConfig = function (timeSystem, clock) {
-            var clockKey = clock && clock.key;
-            var timeSystemKey = timeSystem && timeSystem.key;
-
-            var option = this.config.menuOptions.filter(function (menuOption) {
-                return menuOption.timeSystem === timeSystemKey && menuOption.clock === clockKey;
-            })[0];
-            return option;
-        };
-
-        /**
-         * When the clock offsets change, update the values in the UI
-         * @param {ClockOffsets} offsets
-         * @private
-         */
-        TimeConductorController.prototype.setViewFromOffsets = function (offsets) {
-            this.$scope.boundsModel.startOffset = Math.abs(offsets.start);
-            this.$scope.boundsModel.endOffset = offsets.end;
-        };
-
-        /**
-         * When form values for bounds change, update the bounds in the Time API
-         * to trigger an application-wide bounds change.
-         * @param {object} boundsModel
-         */
-        TimeConductorController.prototype.setBoundsFromView = function (boundsModel) {
-            var bounds = this.timeAPI.bounds();
-            if (boundsModel.start !== bounds.start || boundsModel.end !== bounds.end) {
-                this.timeAPI.bounds({
-                    start: boundsModel.start,
-                    end: boundsModel.end
-                });
-            }
-        };
-
-        /**
-         * When form values for bounds change, update the bounds in the Time API
-         * to trigger an application-wide bounds change.
-         * @param {object} formModel
-         */
-        TimeConductorController.prototype.setOffsetsFromView = function (boundsModel) {
-            if (this.validation.validateStartOffset(boundsModel.startOffset) && this.validation.validateEndOffset(boundsModel.endOffset)) {
-                var offsets = {
-                    start: 0 - boundsModel.startOffset,
-                    end: boundsModel.endOffset
-                };
-                var existingOffsets = this.timeAPI.clockOffsets();
-
-                if (offsets.start !== existingOffsets.start || offsets.end !== existingOffsets.end) {
-                    //Sychronize offsets between form and time API
-                    this.timeAPI.clockOffsets(offsets);
-                }
-            }
-        };
-
-        /**
-         * @private
-         * @returns {boolean}
-         */
-        TimeConductorController.prototype.supportsZoom = function () {
-            var config = this.getConfig(this.timeAPI.timeSystem(), this.timeAPI.clock());
-            return config && (config.zoomInLimit !== undefined && config.zoomOutLimit !== undefined);
-        };
-
-        /**
-         * Update the UI state to reflect a change in clock. Provided conductor
-         * configuration will be checked for compatibility between the new clock
-         * and the currently selected time system. If configuration is not available,
-         * an attempt will be made to default to a time system that is compatible
-         * with the new clock
-         *
-         * @private
-         * @param {Clock} clock
-         */
-        TimeConductorController.prototype.setViewFromClock = function (clock) {
-            var newClockKey = clock ? clock.key : 'fixed';
-            var timeSystems = this.timeSystemsForClocks[newClockKey];
-            var menuOption = this.menu.options.filter(function (option) {
-                return option.key === (newClockKey);
-            })[0];
-
-            this.menu.selected = menuOption;
-
-            //Try to find currently selected time system in time systems for clock
-            var selectedTimeSystem = timeSystems.filter(function (timeSystem) {
-                return timeSystem.key === this.$scope.timeSystemModel.selected.key;
-            }.bind(this))[0];
-
-            var config = this.getConfig(selectedTimeSystem, clock);
-
-            if (selectedTimeSystem === undefined) {
-                selectedTimeSystem = timeSystems[0];
-                config = this.getConfig(selectedTimeSystem, clock);
-
-                if (clock === undefined) {
-                    this.timeAPI.timeSystem(selectedTimeSystem, config.bounds);
-                } else {
-                    //When time system changes, some start bounds need to be provided
-                    this.timeAPI.timeSystem(selectedTimeSystem, {
-                        start: clock.currentValue() + config.clockOffsets.start,
-                        end: clock.currentValue() + config.clockOffsets.end
-                    });
-                }
-            }
-
-            this.isFixed = clock === undefined;
-
-            if (clock === undefined) {
-                this.setViewFromBounds(this.timeAPI.bounds());
-            }
-
-            this.zoom = this.supportsZoom();
-            this.$scope.timeSystemModel.options = timeSystems;
-        };
-
-        /**
-         * Respond to time system selection from UI
-         *
-         * Allows time system to be changed by key. This supports selection
-         * from the menu. Resolves a TimeSystem object and then invokes
-         * TimeConductorController#setTimeSystem
-         * @param key
-         * @see TimeConductorController#setTimeSystem
-         */
-        TimeConductorController.prototype.setTimeSystemFromView = function (key) {
-            var clock = this.menu.selected.clock;
-            var timeSystem = this.timeSystems[key];
-            var config = this.getConfig(timeSystem, clock);
-
-            this.$scope.timeSystemModel.selected = timeSystem;
-            this.$scope.timeSystemModel.format = timeSystem.timeFormat;
-
-            if (clock === undefined) {
-                this.timeAPI.timeSystem(timeSystem, config.bounds);
-            } else {
-                this.timeAPI.clock(clock, config.clockOffsets);
-                this.timeAPI.timeSystem(timeSystem);
-            }
-        };
-
-        /**
-         * Handles time system change from time conductor
-         *
-         * Sets the selected time system. Will populate form with the default
-         * bounds and offsets defined in the selected time system.
-         *
-         * @param newTimeSystem
-         */
-        TimeConductorController.prototype.setViewFromTimeSystem = function (timeSystem) {
-            var oldKey = (this.$scope.timeSystemModel.selected || {}).key;
-            var timeSystemModel = this.$scope.timeSystemModel;
-
-            if (timeSystem && (timeSystem.key !== oldKey)) {
-                var config = this.getConfig(timeSystem, this.timeAPI.clock());
-
-                timeSystemModel.selected = timeSystem;
-                timeSystemModel.format = timeSystem.timeFormat;
-                timeSystemModel.durationFormat = timeSystem.durationFormat;
-
-                if (this.supportsZoom()) {
-                    timeSystemModel.minZoom = config.zoomOutLimit;
-                    timeSystemModel.maxZoom = config.zoomInLimit;
-                }
-            }
-            this.zoom = this.supportsZoom();
-        };
-
-        /**
-         * Takes a time span and calculates a slider increment value, used
-         * to set the horizontal offset of the slider.
-         * @private
-         * @param {number} timeSpan a duration of time, in ms
-         * @returns {number} a value between 0.01 and 0.99, in increments of .01
-         */
-        TimeConductorController.prototype.toSliderValue = function (timeSpan, zoomOutLimit, zoomInLimit) {
-            var perc = timeSpan / (zoomOutLimit - zoomInLimit);
-            return 1 - Math.pow(perc, 1 / 4);
-        };
-
-        /**
-         * Given a time span, set a label for the units of time that it,
-         * roughly, represents. Leverages
-         * @param {TimeSpan} timeSpan
-         */
-        TimeConductorController.prototype.toTimeUnits = function (timeSpan) {
-            var timeSystem = this.timeAPI.timeSystem();
-            if (timeSystem && timeSystem.isUTCBased) {
-                var momentified = moment.duration(timeSpan);
-
-                this.$scope.timeUnits = timeUnitsMegastructure.filter(function (row) {
-                    return row[1](momentified);
-                })[0][0];
-            }
-        };
-
-        /**
-         * Zooming occurs when the user manipulates the zoom slider.
-         * Zooming updates the scale and bounds fields immediately, but does
-         * not trigger a bounds change to other views until the mouse button
-         * is released.
-         * @param bounds
-         */
-        TimeConductorController.prototype.onZoom = function (sliderValue) {
-            var config = this.getConfig(this.timeAPI.timeSystem(), this.timeAPI.clock());
-            var timeSpan = Math.pow((1 - sliderValue), 4) * (config.zoomOutLimit - config.zoomInLimit);
-
-            var zoom = this.conductorViewService.zoom(timeSpan);
-            this.zooming = true;
-
-            this.$scope.boundsModel.start = zoom.bounds.start;
-            this.$scope.boundsModel.end = zoom.bounds.end;
-            this.toTimeUnits(zoom.bounds.end - zoom.bounds.start);
-
-            if (zoom.offsets) {
-                this.setViewFromOffsets(zoom.offsets);
-            }
-        };
-
-        /**
-         * Fired when user has released the zoom slider
-         * @event platform.features.conductor.TimeConductorController~zoomStop
-         */
-        /**
-         * Invoked when zoom slider is released by user. Will update the time conductor with the new bounds, triggering
-         * a global bounds change event.
-         * @fires platform.features.conductor.TimeConductorController~zoomStop
-         */
-        TimeConductorController.prototype.onZoomStop = function () {
-            if (this.timeAPI.clock() !== undefined) {
-                this.setOffsetsFromView(this.$scope.boundsModel);
-            }
-            this.setBoundsFromView(this.$scope.boundsModel);
-
-            this.zooming = false;
-            this.conductorViewService.emit('zoom-stop');
-        };
-
-        /**
-         * Panning occurs when the user grabs the conductor scale and drags
-         * it left or right to slide the window of time represented by the
-         * conductor. Panning updates the scale and bounds fields
-         * immediately, but does not trigger a bounds change to other views
-         * until the mouse button is released.
-         * @param {TimeConductorBounds} bounds
-         */
-        TimeConductorController.prototype.onPan = function (bounds) {
-            this.panning = true;
-            this.$scope.boundsModel.start = bounds.start;
-            this.$scope.boundsModel.end = bounds.end;
-        };
-
-        /**
-         * Called when the user releases the mouse button after panning.
-         */
-        TimeConductorController.prototype.onPanStop = function () {
-            this.panning = false;
-        };
-
-        /**
-         * @private
-         */
-        TimeConductorController.prototype.destroy = function () {
-            this.timeAPI.off('bounds', this.setViewFromBounds);
-            this.timeAPI.off('timeSystem', this.setViewFromTimeSystem);
-            this.timeAPI.off('clock', this.setViewFromClock);
-            this.timeAPI.off('follow', this.setFollow);
-            this.timeAPI.off('clockOffsets', this.setViewFromOffsets);
-
-            this.conductorViewService.off('pan', this.onPan);
-            this.conductorViewService.off('pan-stop', this.onPanStop);
-        };
-
-        return TimeConductorController;
-    }
-);