diff --git a/.jshintrc b/.jshintrc
index ec94c41acd..5b5f7236a3 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -15,7 +15,8 @@
"predef": [
"define",
"Promise",
- "WeakMap"
+ "WeakMap",
+ "Map"
],
"shadow": "outer",
"strict": "implied",
diff --git a/API.md b/API.md
index 3c4ef726c5..b51d9038a6 100644
--- a/API.md
+++ b/API.md
@@ -1,76 +1,150 @@
-# Open MCT API
+# Building Applications With Open MCT
-The Open MCT framework public api can be utilized by building the application
-(`gulp install`) and then copying the file from `dist/main.js` to your
-directory of choice.
+## Scope and purpose of this document
-Open MCT supports AMD, CommonJS, and loading via a script tag; it's easy to use
-in your project. The [`openmct`]{@link module:openmct} module is exported
-via AMD and CommonJS, and is also exposed as `openmct` in the global scope
-if loaded via a script tag.
+This document is intended to serve as a reference for developing an application
+based on Open MCT. It will provide details of the API functions necessary to extend the
+Open MCT platform meet common use cases such as integrating with a telemetry source.
-## Overview
+The best place to start is with the [Open MCT Tutorials](https://github.com/nasa/openmct-tutorial).
+These will walk you through the process of getting up and running with Open MCT,
+as well as addressing some common developer use cases.
-Open MCT's goal is to allow you to browse, create, edit, and visualize all of
-the domain knowledge you need on a daily basis.
+## Building From Source
-To do this, the main building block provided by Open MCT is the _domain object_.
-The temperature sensor on the starboard solar panel,
-an overlay plot comparing the results of all temperature sensor,
-the command dictionary for a spacecraft,
-the individual commands in that dictionary, your "my documents" folder:
+The latest version of Open MCT is available from [our GitHub repository](https://github.com/nasa/openmct).
+If you have `git`, and `node` installed, you can build Open MCT with the commands
+```
+git clone https://github.com/nasa/openmct.git
+cd openmct
+npm install
+```
+
+These commands will fetch the Open MCT source from our GitHub repository, and build
+a minified version that can be included in your application. The output of the
+build process is placed in a `dist` folder under the openmct source directory,
+which can be copied out to another location as needed. The contents of this
+folder will include a minified javascript file named `openmct.js` as well as
+assets such as html, css, and images necessary for the UI.
+
+## Starting an Open MCT application
+
+To start a minimally functional Open MCT application, it is necessary to include
+the Open MCT distributable, enable some basic plugins, and bootstrap the application.
+The tutorials walk through the process of getting Open MCT up and running from scratch,
+but provided below is a minimal HTML template that includes Open MCT, installs
+some basic plugins, and bootstraps the application. It assumes that Open MCT is
+installed under an `openmct` subdirectory, as described in [Building From Source](#building-from-source).
+
+This approach includes openmct using a simple script tag, resulting in a global
+variable named `openmct`. This `openmct` object is used subsequently to make API
+calls.
+
+Open MCT is packaged as a UMD (Universal Module Definition) module, so common
+script loaders are also supported.
+
+```html
+
+
+
+ Open MCT
+
+
+
+
+
+
+```
+
+The Open MCT library included above requires certain assets such as html templates,
+images, and css. If you installed Open MCT from GitHub as described in the section
+on [Building from Source](#building-from-source) then these assets will have been
+downloaded along with the Open MCT javascript library. You can specify the
+location of these assets by calling `openmct.setAssetPath()`. Typically this will
+be the same location as the `openmct.js` library is included from.
+
+There are some plugins bundled with the application that provide UI, persistence,
+and other default configuration which are necessary to be able to do anything with
+the application initially. Any of these plugins can, in principle, be replaced with a custom
+plugin. The included plugins are documented in the [Included Plugins](#included-plugins)
+section.
+
+## Plugins
+
+### Defining and Installing a New Plugin
+
+```javascript
+openmct.install(function install(openmctAPI) {
+ // Do things here
+ // ...
+});
+```
+
+New plugins are installed in Open MCT by calling `openmct.install`, and providing
+a plugin installation function. This function will be invoked on application
+startup with one parameter - the openmct API object. A common approach used in
+the Open MCT codebase is to define a plugin as a function that returns this
+installation function. This allows configuration to be specified when the plugin is included.
+
+eg.
+```javascript
+openmct.install(openmct.plugins.Elasticsearch("http://localhost:8002/openmct"));
+```
+This approach can be seen in all of the [plugins provided with Open MCT](https://github.com/nasa/openmct/blob/master/src/plugins/plugins.js).
+
+## Domain Objects and Identifiers
+
+_Domain Objects_ are the basic entities that represent domain knowledge in Open MCT.
+The temperature sensor on a solar panel, an overlay plot comparing
+the results of all temperature sensors, the command dictionary for a spacecraft,
+the individual commands in that dictionary, the "My Items" folder:
All of these things are domain objects.
-Domain objects have Types, so a specific instrument temperature sensor is a
-"Telemetry Point," and turning on a drill for a certain duration of time is
-an "Activity". Types allow you to form an ontology of knowledge and provide
-an abstraction for grouping, visualizing, and interpreting data.
+A _Domain Object_ is simply a javascript object with some standard attributes.
+An example of a _Domain Object_ is the "My Items" object which is a folder in
+which a user can persist any objects that they create. The My Items object
+looks like this:
-And then we have Views. Views allow you to visualize domain objects. Views can
-apply to specific domain objects; they may also apply to certain types of
-domain objects, or they may apply to everything. Views are simply a method
-of visualizing domain objects.
-
-Regions allow you to specify what views are displayed for specific types of
-domain objects in response to different user actions. For instance, you may
-want to display a different view while editing, or you may want to update the
-toolbar display when objects are selected. Regions allow you to map views to
-specific user actions.
-
-Domain objects can be mutated and persisted, developers can create custom
-actions and apply them to domain objects, and many more things can be done.
-For more information, read on!
-
-## Running Open MCT
-
-Once the [`openmct`](@link module:openmct) module has been loaded, you can
-simply invoke [`start`]{@link module:openmct.MCT#start} to run Open MCT:
-
-
-```
-openmct.start();
+```javascript
+{
+ identifier: {
+ namespace: ""
+ key: "mine"
+ }
+ name:"My Items",
+ type:"folder",
+ location:"ROOT",
+ composition: []
+}
```
-Generally, however, you will want to configure Open MCT by adding plugins
-before starting it. It is important to install plugins and configure Open MCT
-_before_ calling [`start`]{@link module:openmct.MCT#start}; Open MCT is not
-designed to be reconfigured once started.
+### Object Attributes
-## Configuring Open MCT
+The main attributes to note are the `identifier`, and `type` attributes.
+* `identifier`: A composite key that provides a universally unique identifier for
+this object. The `namespace` and `key` are used to identify the object. The `key`
+must be unique within the namespace.
+* `type`: All objects in Open MCT have a type. Types allow you to form an
+ontology of knowledge and provide an abstraction for grouping, visualizing, and
+interpreting data. Details on how to define a new object type are provided below.
-The [`openmct`]{@link module:openmct} module (more specifically, the
-[`MCT`]{@link module:openmct.MCT} class, of which `openmct` is an instance)
-exposes a variety of methods to allow the application to be configured,
-extended, and customized before running.
+Open MCT uses a number of builtin types. Typically you are going to want to
+define your own if extending Open MCT.
-Short examples follow; see the linked documentation for further details.
+### Domain Object Types
-### Adding Domain Object Types
+Custom types may be registered via the `addType` function on the opencmt Type
+registry.
-Custom types may be registered via
-[`openmct.types`]{@link module:openmct.MCT#types}:
-
-```
+eg.
+```javascript
openmct.types.addType('my-type', {
label: "My Type",
description: "This is a type that I added!",
@@ -78,66 +152,98 @@ openmct.types.addType('my-type', {
});
```
-### Adding Views
+The `addType` function accepts two arguments:
+* A `string` key identifying the type. This key is used when specifying a type
+for an object.
+* An object type specification. An object type definition supports the following
+attributes
+ * `label`: a `string` naming this object type
+ * `description`: a `string` specifying a longer-form description of this type
+ * `initialize`: a `function` which initializes the model for new domain objects
+ of this type. This can be used for setting default values on an object when
+ it is instantiated.
+ * `creatable`: A `boolean` indicating whether users should be allowed to create
+ this type (default: `false`). This will determine whether the type appears
+ in the `Create` menu.
+ * `cssClass`: A `string` specifying a CSS class to apply to each representation
+ of this object. This is used for specifying an icon to appear next to each
+ object of this type.
-Custom views may be registered based on the region in the application
-where they should appear:
+The [Open MCT Tutorials](https://github.com/openmct/openmct-tutorial) provide a
+step-by-step examples of writing code for Open MCT that includes a [section on
+defining a new object type](https://github.com/nasa/openmct-tutorial#step-3---providing-objects).
-* [`openmct.mainViews`]{@link module:openmct.MCT#mainViews} is a registry
- of views of domain objects which should appear in the main viewing area.
-* [`openmct.inspectors`]{@link module:openmct.MCT#inspectors} is a registry
- of views of domain objects and/or active selections, which should appear in
- the Inspector.
-* [`openmct.toolbars`]{@link module:openmct.MCT#toolbars} is a registry
- of views of domain objects and/or active selections, which should appear in
- the toolbar area while editing.
-* [`openmct.indicators`]{@link module:openmct.MCT#inspectors} is a registry
- of views which should appear in the status area of the application.
+## Root Objects
-Example:
+In many cases, you'd like a certain object (or a certain hierarchy of objects)
+to be accessible from the top level of the application (the tree on the left-hand
+side of Open MCT.) For example, it is typical to expose a telemetry dictionary
+as a hierarchy of telemetry-providing domain objects in this fashion.
-```
-openmct.mainViews.addProvider({
- canView: function (domainObject) {
- return domainObject.type === 'my-type';
- },
- view: function (domainObject) {
- return new MyView(domainObject);
- }
-});
+To do so, use the `addRoot` method of the object API.
+
+eg.
+```javascript
+openmct.objects.addRoot({
+ namespace: "my-namespace",
+ key: "my-key"
+ });
```
-### Adding a Root-level Object
-
-In many cases, you'd like a certain object (or a certain hierarchy of
-objects) to be accessible from the top level of the application (the
-tree on the left-hand side of Open MCT.) It is typical to expose a telemetry
-dictionary as a hierarchy of telemetry-providing domain objects in this
-fashion.
-
-To do so, use the [`addRoot`]{@link module:openmct.ObjectAPI#addRoot} method
-of the [object API]{@link module:openmct.ObjectAPI}:
-
-```
-openmct.objects.addRoot({ key: "my-key", namespace: "my-namespace" });
-```
+The `addRoot` function takes a single [object identifier](#domain-objects-and-identifiers)
+as an argument.
Root objects are loaded just like any other objects, i.e. via an object
provider.
-### Adding Composition Providers
+## Object Providers
-The "composition" of a domain object is the list of objects it contains,
-as shown (for example) in the tree for browsing. Open MCT provides a
+An Object Provider is used to build _Domain Objects_, typically retrieved from
+some source such as a persistence store or telemetry dictionary. In order to
+integrate telemetry from a new source an object provider will need to be created
+that can build objects representing telemetry points exposed by the telemetry
+source. The API call to define a new object provider is fairly straightforward.
+Here's a very simple example:
+
+```javascript
+openmct.objects.addProvider('example.namespace', {
+ get: function (identifier) {
+ return Promise.resolve({
+ identifier: identifier,
+ name: 'Example Object',
+ type: 'example-object-type'
+ });
+ }
+});
+```
+The `addProvider` function takes two arguments:
+
+* `namespace`: A `string` representing the namespace that this object provider
+will provide objects for.
+* `provider`: An `object` with a single function, `get`. This function accepts an
+[Identifier](#domain-objects-and-identifiers) for the object to be provided.
+It is expected that the `get` function will return a
+[Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)
+that resolves with the object being requested.
+
+In future, object providers will support other methods to enable other operations
+with persistence stores, such as creating, updating, and deleting objects.
+
+## Composition Providers
+
+The _composition_ of a domain object is the list of objects it contains, as shown
+(for example) in the tree for browsing. Open MCT provides a
[default solution](#default-composition-provider) for composition, but there
may be cases where you want to provide the composition of a certain object
(or type of object) dynamically.
-For instance, you may want to populate a hierarchy under a custom root-level
-object based on the contents of a telemetry dictionary.
-To do this, you can add a new CompositionProvider:
+### Adding Composition Providers
-```
+You may want to populate a hierarchy under a custom root-level object based on
+the contents of a telemetry dictionary. To do this, you can add a new
+Composition Provider:
+
+```javascript
openmct.composition.addProvider({
appliesTo: function (domainObject) {
return domainObject.type === 'my-type';
@@ -147,20 +253,27 @@ openmct.composition.addProvider({
}
});
```
+The `addProvider` function accepts a Composition Provider object as its sole
+argument. A Composition Provider is a javascript object exposing two functions:
+* `appliesTo`: A `function` that accepts a `domainObject` argument, and returns
+a `boolean` value indicating whether this composition provider applies to the
+given object.
+* `load`: A `function` that accepts a `domainObject` as an argument, and returns
+a `Promise` that resolves with an array of [Identifier](#domain-objects-and-identifiers).
+These identifiers will be used to fetch Domain Objects from an [Object Provider](#object-provider)
-#### Default Composition Provider
+### Default Composition Provider
-The default composition provider applies to any domain object with
-a `composition` property. The value of `composition` should be an
-array of identifiers, e.g.:
+The default composition provider applies to any domain object with a `composition`
+property. The value of `composition` should be an array of identifiers, e.g.:
-```js
+```javascript
var domainObject = {
name: "My Object",
type: 'folder',
composition: [
{
- key: '412229c3-922c-444b-8624-736d85516247',
+ id: '412229c3-922c-444b-8624-736d85516247',
namespace: 'foo'
},
{
@@ -171,169 +284,146 @@ var domainObject = {
};
```
-### Adding Telemetry Providers
+## Telemetry Providers
-When connecting to a new telemetry source, you will want to register a new
-[telemetry provider]{@link module:openmct.TelemetryAPI~TelemetryProvider}
-with the [telemetry API]{@link module:openmct.TelemetryAPI#addProvider}:
+When connecting to a new telemetry source, you will need to register a new
+_Telemetry Provider_. A _Telemetry Provider_ retrieves telemetry data from some telemetry
+source, and exposes them in a way that can be used by Open MCT. A telemetry
+provider typically can support a one off __request__ for a batch of telemetry data,
+or it can provide the ability to __subscribe__ to receive new telemetry data when
+it becomes available, or both.
-```
+```javascript
openmct.telemetry.addProvider({
- canProvideTelemetry: function (domainObject) {
- return domainObject.type === 'my-type';
+ supportsRequest: function (domainObject) {
+ //...
},
- properties: function (domainObject) {
- return [
- { key: 'value', name: "Temperature", units: "degC" },
- { key: 'time', name: "UTC" }
- ];
+ supportsSubscribe: function (domainObject) {
+ //...
},
- request: function (domainObject, options) {
- var telemetryId = domainObject.myTelemetryId;
- return myAdapter.request(telemetryId, options.start, options.end);
+ request: function (domainObject, options) {
+ //...
},
- subscribe: function (domainObject, callback) {
- var telemetryId = domainObject.myTelemetryId;
- myAdapter.subscribe(telemetryId, callback);
- return myAdapter.unsubscribe.bind(myAdapter, telemetryId, callback);
+ subscribe: function (domainObject, callback, options) {
+ //...
}
-});
+})
```
+A telemetry provider is an object with the following functions defined:
+
+* `supportsRequest`: An __optional__ `function` that accepts a
+[Domain Object](#domain-objects-and-identifiers) and returns a `boolean` value
+indicating whether or not this provider supports telemetry requests for the
+given object. If this returns `true` then a `request` function must be defined.
+* `supportsSubscribe`: An __optional__ `function` that accepts a
+[Domain Object](#domain-objects-and-identifiers) and returns a `boolean` value
+indicating whether or not this provider supports telemetry subscriptions. If this
+returns `true` then a `subscribe` function must also be defined. As with `request`,
+the return value will typically be conditional, and based on attributes of
+`domainObject` such as its identifier.
+* `request`: A `function` that returns a `Promise` that will resolve with an `Array`
+of telemetry in a single query. This function accepts as arguments a
+[Domain Object](#domain-objects-and-identifiers) and an object containing some
+[request options](#telemetry-requests).
+* `subscribe`: A `function` that accepts a [Domain Object](#domain-objects-and-identifiers),
+a callback `function`, and a [telemetry request](#telemetry-requests). The
+callback is invoked whenever telemetry is available, and
+
+
The implementations for `request` and `subscribe` can vary depending on the
nature of the endpoint which will provide telemetry. In the example above,
-it is assumed that `myAdapter` contains the specific implementations
-(HTTP requests, WebSocket connections, etc.) associated with some telemetry
+it is assumed that `myAdapter` contains the implementation details
+(such as HTTP requests, WebSocket connections, etc.) associated with some telemetry
source.
-## Using Open MCT
+For a step-by-step guide to building a telemetry adapter, please see the
+[Open MCT Tutorials](https://github.com/larkin/openmct-tutorial).
-When implementing new features, it is useful and sometimes necessary to
-utilize functionality exposed by Open MCT.
-
-### Retrieving Composition
-
-To limit which objects are loaded at any given time, the composition of
-a domain object must be requested asynchronously:
-
-```
-openmct.composition(myObject).load().then(function (childObjects) {
- childObjects.forEach(doSomething);
-});
+### Telemetry Requests
+Telemetry requests support time bounded queries. A call to a _Telemetry Provider_'s
+`request` function will include an `options` argument. These are simply javascript
+objects with attributes for the request parameters. An example of a telemetry
+request object with a start and end time is included below:
+```javascript
+{
+ start: 1487981997240,
+ end: 1487982897240
+}
```
-### Support Common Gestures
+### Telemetry Data
-Custom views may also want to support common gestures using the
-[gesture API]{@link module:openmct.GestureAPI}. For instance, to make
-a view (or part of a view) selectable:
+Telemetry data is provided to Open MCT by _[Telemetry Providers](#telemetry-providers)_
+in the form of javascript objects. A collection of telemetry values (for example,
+retrieved in response to a `request`) is represented by an `Array` of javascript
+objects. These telemetry javascript objects are simply key value pairs.
-```
-openmct.gestures.selectable(myHtmlElement, myDomainObject);
+Typically a telemetry datum will have some timestamp associated with it. This
+time stamp should have a key that corresponds to some time system supported by
+Open MCT. If the `UTCTimeSystem` plugin is installed, then the key `utc` can be used.
+
+An example of a telemetry provider request function that returns a collection of
+mock telemtry data is below:
+
+```javascript
+openmct.telemetry.addProvider({
+ supportsRequest: function (domainObject) {
+ return true
+ },
+ request: function (domainObject, options) {
+ return Promise.resolve([
+ {
+ 'utc': Date.now() - 2000,
+ 'value': 1,
+ },
+ {
+ 'utc': Date.now() - 1000,
+ 'value': 2,
+ },
+ {
+ 'utc': Date.now(),
+ 'value': 3,
+ }
+ ]);
+ }
+})
```
-### Working with Domain Objects
-
-The [object API]{@link module:openmct.ObjectAPI} provides useful methods
-for working with domain objects.
-
-To make changes to a domain object, use the
-[`mutate`]{@link module:openmct.ObjectAPI#mutate} method:
-
-```
-openmct.objects.mutate(myDomainObject, "name", "New name!");
-```
-
-Making modifications in this fashion allows other usages of the domain
-object to remain up to date using the
-[`observe`]{@link module:openmct.ObjectAPI#observe} method:
-
-```
-openmct.objects.observe(myDomainObject, "name", function (newName) {
- myLabel.textContent = newName;
-});
-```
-
-### Using Telemetry
-
-Very often in Open MCT, you wish to work with telemetry data (for instance,
-to display it in a custom visualization.)
-
-
-### Synchronizing with the Time Conductor
-
-Views which wish to remain synchronized with the state of Open MCT's
-time conductor should utilize
-[`openmct.conductor`]{@link module:openmct.TimeConductor}:
-
-```
-openmct.conductor.on('bounds', function (newBounds) {
- requestTelemetry(newBounds.start, newBounds.end).then(displayTelemetry);
-});
-```
-
-## Plugins
-
-While you can register new features with Open MCT directly, it is generally
-more useful to package these as a plugin. A plugin is a function that takes
-[`openmct`]{@link module:openmct} as an argument, and performs configuration
-upon `openmct` when invoked.
-
-### Installing Plugins
-
-To install plugins, use the [`install`]{@link module:openmct.MCT#install}
-method:
-
-```
-openmct.install(myPlugin);
-```
-
-The plugin will be invoked to configure Open MCT before it is started.
-
-### Included Plugins
+## Included Plugins
Open MCT is packaged along with a few general-purpose plugins:
* `openmct.plugins.CouchDB` is an adapter for using CouchDB for persistence
of user-created objects. This is a constructor that takes the URL for the
CouchDB database as a parameter, e.g.
- `openmct.install(new openmct.plugins.CouchDB('http://localhost:5984/openmct'))`
+```javascript
+openmct.install(openmct.plugins.CouchDB('http://localhost:5984/openmct'))
+```
* `openmct.plugins.Elasticsearch` is an adapter for using Elasticsearch for
persistence of user-created objects. This is a
constructor that takes the URL for the Elasticsearch instance as a
- parameter, e.g.
- `openmct.install(new openmct.plugins.CouchDB('http://localhost:9200'))`.
- Domain objects will be indexed at `/mct/domain_object`.
-* `openmct.plugins.espresso` and `openmct.plugins.snow` are two different
+ parameter. eg.
+```javascript
+openmct.install(openmct.plugins.CouchDB('http://localhost:9200'))
+```
+* `openmct.plugins.Espresso` and `openmct.plugins.Snow` are two different
themes (dark and light) available for Open MCT. Note that at least one
of these themes must be installed for Open MCT to appear correctly.
-* `openmct.plugins.localStorage` provides persistence of user-created
+* `openmct.plugins.LocalStorage` provides persistence of user-created
objects in browser-local storage. This is particularly useful in
development environments.
-* `openmct.plugins.myItems` adds a top-level folder named "My Items"
+* `openmct.plugins.MyItems` adds a top-level folder named "My Items"
when the application is first started, providing a place for a
user to store created items.
-* `openmct.plugins.utcTimeSystem` provides support for using the time
- conductor with UTC time.
+* `openmct.plugins.UTCTimeSystem` provides a default time system for Open MCT.
Generally, you will want to either install these plugins, or install
different plugins that provide persistence and an initial folder
-hierarchy. Installation is as described [above](#installing-plugins):
+hierarchy.
+eg.
+```javascript
+openmct.install(openmct.plugins.LocalStorage());
+openmct.install(openmct.plugins.MyItems());
```
-openmct.install(openmct.plugins.localStorage);
-openmct.install(openmct.plugins.myItems);
-```
-
-### Writing Plugins
-
-Plugins configure Open MCT, and should utilize the
-[`openmct`]{@link module:openmct} module to do so, as summarized above in
-"Configuring Open MCT" and "Using Open MCT" above.
-
-### Distributing Plugins
-
-Hosting or downloading plugins is outside of the scope of this documentation.
-We recommend distributing plugins as UMD modules which export a single
-function.
-
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 29dbbc46cc..7e7e04102d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -43,9 +43,9 @@ the check-in process. These roles are:
Three basic types of branches may be included in the above repository:
-1. Master branch.
-2. Topic branches.
-3. Developer branches.
+1. Master branch
+2. Topic branches
+3. Developer branches
Branches which do not fit into the above categories may be created and used
during the course of development for various reasons, such as large-scale
@@ -107,7 +107,7 @@ back into the master branch is to file a Pull Request. The contributions
should meet code, test, and commit message standards as described below,
and the pull request should include a completed author checklist, also
as described below. Pull requests may be assigned to specific team
-members when appropriate (e.g. to draw to a specific person's attention.)
+members when appropriate (e.g. to draw to a specific person's attention).
Code review should take place using discussion features within the pull
request. When the reviewer is satisfied, they should add a comment to
@@ -130,26 +130,26 @@ settings. This is verified by the command line build.
JavaScript sources in Open MCT should:
* Use four spaces for indentation. Tabs should not be used.
-* Include JSDoc for any exposed API (e.g. public methods, constructors.)
+* Include JSDoc for any exposed API (e.g. public methods, constructors).
* Include non-JSDoc comments as-needed for explaining private variables,
methods, or algorithms when they are non-obvious.
* Define one public class per script, expressed as a constructor function
returned from an AMD-style module.
* Follow “Java-like” naming conventions. These includes:
* Classes should use camel case, first letter capitalized
- (e.g. SomeClassName.)
+ (e.g. SomeClassName).
* Methods, variables, fields, and function names should use camel case,
- first letter lower-case (e.g. someVariableName.) Constants
- (variables or fields which are meant to be declared and initialized
- statically, and never changed) should use only capital letters, with
- underscores between words (e.g. SOME_CONSTANT.)
- * File name should be the name of the exported class, plus a .js extension
- (e.g. SomeClassName.js)
+ first letter lower-case (e.g. someVariableName).
+ * Constants (variables or fields which are meant to be declared and
+ initialized statically, and never changed) should use only capital
+ letters, with underscores between words (e.g. SOME_CONSTANT).
+ * File names should be the name of the exported class, plus a .js extension
+ (e.g. SomeClassName.js).
* Avoid anonymous functions, except when functions are short (a few lines)
and/or their inclusion makes sense within the flow of the code
- (e.g. as arguments to a forEach call.)
+ (e.g. as arguments to a forEach call).
* Avoid deep nesting (especially of functions), except where necessary
- (e.g. due to closure scope.)
+ (e.g. due to closure scope).
* End with a single new-line character.
* Expose public methods by declaring them on the class's prototype.
* Within a given function's scope, do not mix declarations and imperative
@@ -234,7 +234,7 @@ Commit messages should:
 line of white space.
* Contain a short (usually one word) reference to the feature or subsystem
the commit effects, in square brackets, at the start of the subject line
- (e.g. `[Documentation] Draft of check-in process`)
+ (e.g. `[Documentation] Draft of check-in process`).
* Contain a reference to a relevant issue number in the body of the commit.
* This is important for traceability; while branch names also provide this,
you cannot tell from looking at a commit what branch it was authored on.
@@ -250,9 +250,9 @@ Commit messages should:
Commit messages should not:
* Exceed 54 characters in length on the subject line.
-* Exceed 72 characters in length in the body of the commit.
+* Exceed 72 characters in length in the body of the commit,
* Except where necessary to maintain the structure of machine-readable or
- machine-generated text (e.g. error messages)
+ machine-generated text (e.g. error messages).
See [Contributing to a Project](http://git-scm.com/book/ch5-2.html) from
Pro Git by Shawn Chacon and Ben Straub for a bit of the rationale behind
@@ -260,7 +260,7 @@ these standards.
## Issue Reporting
-Issues are tracked at https://github.com/nasa/openmct/issues
+Issues are tracked at https://github.com/nasa/openmct/issues.
Issues should include:
@@ -284,7 +284,7 @@ Issue severity is categorized as follows (in ascending order):
The following check lists should be completed and attached to pull requests
when they are filed (author checklist) and when they are merged (reviewer
-checklist.)
+checklist).
### Author Checklist
diff --git a/LICENSES.md b/LICENSES.md
index 94a7fecf13..b95375aefd 100644
--- a/LICENSES.md
+++ b/LICENSES.md
@@ -1,6 +1,6 @@
# Open MCT Licenses
-Open MCT, Copyright (c) 2014-2016, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
+Open MCT, 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.
diff --git a/README.md b/README.md
index 8761314a0b..804c224779 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Open MCT [](http://www.apache.org/licenses/LICENSE-2.0)
-Open MCT is a next-generation mission control framework for visualization of data on desktop and mobile devices. It is developed at NASA's Ames Research Center, and is being used by NASA for data analysis of spacecraft missions, as well as planning and operation of experimental rover systems. As a generalizable and open source framework, Open MCT could be used as the basis for building applications for planning, operation, and analysis of any systems producing telemetry data.
+Open MCT (Open Mission Control Technologies) is a next-generation mission control framework for visualization of data on desktop and mobile devices. It is developed at NASA's Ames Research Center, and is being used by NASA for data analysis of spacecraft missions, as well as planning and operation of experimental rover systems. As a generalizable and open source framework, Open MCT could be used as the basis for building applications for planning, operation, and analysis of any systems producing telemetry data.
Please visit our [Official Site](https://nasa.github.io/openmct/) and [Getting Started Guide](https://nasa.github.io/openmct/getting-started/)
@@ -55,7 +55,7 @@ Documentation is available on the [Open MCT website](https://nasa.github.io/open
### Examples
The clearest examples for developing Open MCT plugins are in the
-[tutorials](https://nasa.github.io/openmct/docs/tutorials/) provided in
+[tutorials](https://github.com/nasa/openmct-tutorial) provided in
our documentation.
For a practical example of a telemetry adapter, see David Hudson's
diff --git a/bower.json b/bower.json
index 161ee04186..ed3dbaf899 100644
--- a/bower.json
+++ b/bower.json
@@ -22,7 +22,6 @@
"eventemitter3": "^1.2.0",
"lodash": "3.10.1",
"almond": "~0.3.2",
- "d3": "~4.1.0",
"html2canvas": "^0.4.1"
}
}
diff --git a/build-docs.sh b/build-docs.sh
index 22e87949bf..6738cbc8be 100755
--- a/build-docs.sh
+++ b/build-docs.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#*****************************************************************************
-#* Open MCT, Copyright (c) 2014-2016, United States Government
+#* Open MCT, Copyright (c) 2014-2017, United States Government
#* as represented by the Administrator of the National Aeronautics and Space
#* Administration. All rights reserved.
#*
diff --git a/docs/gendocs.js b/docs/gendocs.js
index 8d257625d0..b96b2c997e 100644
--- a/docs/gendocs.js
+++ b/docs/gendocs.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
diff --git a/docs/src/architecture/framework.md b/docs/src/architecture/framework.md
index e269e38f61..78adb98158 100644
--- a/docs/src/architecture/framework.md
+++ b/docs/src/architecture/framework.md
@@ -131,7 +131,7 @@ Keeping that in mind, there are a few useful patterns supported by the
framework that are useful to keep in mind.
The specific service infrastructure provided by the platform is described
-in the [Platform Architecture](Platform.md).
+in the [Platform Architecture](platform.md).
## Extension Categories
diff --git a/docs/src/guide/index.md b/docs/src/guide/index.md
index c4d52c9501..5bf5c34b37 100644
--- a/docs/src/guide/index.md
+++ b/docs/src/guide/index.md
@@ -1339,41 +1339,6 @@ are supported:
Open MCT defines several Angular directives that are intended for use both
internally within the platform, and by plugins.
-## Chart
-
-The `mct-chart` directive is used to support drawing of simple charts. It is
-present to support the Plot view, and its functionality is limited to the
-functionality that is relevant for that view.
-
-This directive is used at the element level and takes one attribute, `draw`
-which is an Angular expression which will should evaluate to a drawing object.
-This drawing object should contain the following properties:
-
-* `dimensions`: The size, in logical coordinates, of the chart area. A
-two-element array or numbers.
-* `origin`: The position, in logical coordinates, of the lower-left corner of
-the chart area. A two-element array or numbers.
-* `lines`: An array of lines (e.g. as a plot line) to draw, where each line is
-expressed as an object containing:
- * `buffer`: A Float32Array containing points in the line, in logical
- coordinates, in sequential x,y pairs.
- * `color`: The color of the line, as a four-element RGBA array, where
- each element is a number in the range of 0.0-1.0.
- * `points`: The number of points in the line.
-* `boxes`: An array of rectangles to draw in the chart area. Each is an object
-containing:
- * `start`: The first corner of the rectangle, as a two-element array of
- numbers, in logical coordinates.
- * `end`: The opposite corner of the rectangle, as a two-element array of
- numbers, in logical coordinates. color : The color of the line, as a
- four-element RGBA array, where each element is a number in the range of
- 0.0-1.0.
-
-While `mct-chart` is intended to support plots specifically, it does perform
-some useful management of canvas objects (e.g. choosing between WebGL and Canvas
-2D APIs for drawing based on browser support) so its usage is recommended when
-its supported drawing primitives are sufficient for other charting tasks.
-
## Container
The `mct-container` is similar to the `mct-include` directive insofar as it allows
@@ -2296,10 +2261,7 @@ The platform understands the following policy categories (specifiable as the
* `action`: Determines whether or not a given action is allowable. The candidate
argument here is an Action; the context is its action context object.
-* `composition`: Determines whether or not domain objects of a given type are
-allowed to contain domain objects of another type. The candidate argument here
-is the container's `Type`; the context argument is the `Type` of the object to be
-contained.
+* `composition`: Determines whether or not a given domain object(first argument, `parent`) can contain a candidate child object (second argument, `child`).
* `view`: Determines whether or not a view is applicable for a domain object.
The candidate argument is the view's extension definition; the context argument
is the `DomainObject` to be viewed.
diff --git a/docs/src/tutorials/index.md b/docs/src/tutorials/index.md
index 52263278ed..c60e05a0f3 100644
--- a/docs/src/tutorials/index.md
+++ b/docs/src/tutorials/index.md
@@ -156,7 +156,7 @@ has been finalized.
#### Before
```html
Hello, world! I am the default route.
My controller has told me: "{{phrase}}"
-
\ No newline at end of file
+
diff --git a/example/builtins/src/ExampleController.js b/example/builtins/src/ExampleController.js
index 621b8bf819..95a2d4fc8f 100644
--- a/example/builtins/src/ExampleController.js
+++ b/example/builtins/src/ExampleController.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -39,4 +39,4 @@ define(
return ExampleController;
}
-);
\ No newline at end of file
+);
diff --git a/example/builtins/src/ExampleDirective.js b/example/builtins/src/ExampleDirective.js
index 877436ed7b..2624f0b317 100644
--- a/example/builtins/src/ExampleDirective.js
+++ b/example/builtins/src/ExampleDirective.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -63,4 +63,4 @@ define(
return ExampleDirective;
}
-);
\ No newline at end of file
+);
diff --git a/example/builtins/src/ExampleService.js b/example/builtins/src/ExampleService.js
index 2ffa07a947..d719151596 100644
--- a/example/builtins/src/ExampleService.js
+++ b/example/builtins/src/ExampleService.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -43,4 +43,4 @@ define(
return ExampleService;
}
-);
\ No newline at end of file
+);
diff --git a/example/composite/bundle.js b/example/composite/bundle.js
index 21ab3dfa8a..c432ca8148 100644
--- a/example/composite/bundle.js
+++ b/example/composite/bundle.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
diff --git a/example/composite/src/SomeAggregator.js b/example/composite/src/SomeAggregator.js
index b8db9ead77..e922c7f412 100644
--- a/example/composite/src/SomeAggregator.js
+++ b/example/composite/src/SomeAggregator.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -47,4 +47,4 @@ define(
return SomeAggregator;
}
-);
\ No newline at end of file
+);
diff --git a/example/composite/src/SomeDecorator.js b/example/composite/src/SomeDecorator.js
index 3fb7c0698c..33be63b31d 100644
--- a/example/composite/src/SomeDecorator.js
+++ b/example/composite/src/SomeDecorator.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -45,4 +45,4 @@ define(
return SomeDecorator;
}
-);
\ No newline at end of file
+);
diff --git a/example/composite/src/SomeOtherDecorator.js b/example/composite/src/SomeOtherDecorator.js
index caaf6a2bc4..14cc5050da 100644
--- a/example/composite/src/SomeOtherDecorator.js
+++ b/example/composite/src/SomeOtherDecorator.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -45,4 +45,4 @@ define(
return SomeOtherDecorator;
}
-);
\ No newline at end of file
+);
diff --git a/example/composite/src/SomeOtherExample.js b/example/composite/src/SomeOtherExample.js
index 5118011198..2bda95e686 100644
--- a/example/composite/src/SomeOtherExample.js
+++ b/example/composite/src/SomeOtherExample.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -43,4 +43,4 @@ define(
return SomeOtherExample;
}
-);
\ No newline at end of file
+);
diff --git a/example/composite/src/SomeOtherProvider.js b/example/composite/src/SomeOtherProvider.js
index 1cd9e358c8..f08761d424 100644
--- a/example/composite/src/SomeOtherProvider.js
+++ b/example/composite/src/SomeOtherProvider.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -45,4 +45,4 @@ define(
return SomeOtherProvider;
}
-);
\ No newline at end of file
+);
diff --git a/example/composite/src/SomeProvider.js b/example/composite/src/SomeProvider.js
index eafef10244..a8fdbb2dcf 100644
--- a/example/composite/src/SomeProvider.js
+++ b/example/composite/src/SomeProvider.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -45,4 +45,4 @@ define(
return SomeProvider;
}
-);
\ No newline at end of file
+);
diff --git a/example/eventGenerator/bundle.js b/example/eventGenerator/bundle.js
index 157fa62542..16a5512e66 100644
--- a/example/eventGenerator/bundle.js
+++ b/example/eventGenerator/bundle.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -49,7 +49,7 @@ define([
{
"key": "eventGenerator",
"name": "Event Message Generator",
- "cssclass": "icon-folder-new",
+ "cssClass": "icon-folder-new",
"description": "For development use. Creates sample event message data that mimics a live data stream.",
"priority": 10,
"features": "creation",
diff --git a/example/eventGenerator/src/EventTelemetry.js b/example/eventGenerator/src/EventTelemetry.js
index 31bda1f3f8..781723657c 100644
--- a/example/eventGenerator/src/EventTelemetry.js
+++ b/example/eventGenerator/src/EventTelemetry.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -60,4 +60,4 @@ define(
return EventTelemetry;
}
-);
\ No newline at end of file
+);
diff --git a/example/eventGenerator/src/EventTelemetryProvider.js b/example/eventGenerator/src/EventTelemetryProvider.js
index b2de59ad8e..1768984ba0 100644
--- a/example/eventGenerator/src/EventTelemetryProvider.js
+++ b/example/eventGenerator/src/EventTelemetryProvider.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -118,4 +118,4 @@ define(
return EventTelemetryProvider;
}
-);
\ No newline at end of file
+);
diff --git a/example/export/ExportTelemetryAsCSVAction.js b/example/export/ExportTelemetryAsCSVAction.js
index 111b869d94..f638ae7bcd 100644
--- a/example/export/ExportTelemetryAsCSVAction.js
+++ b/example/export/ExportTelemetryAsCSVAction.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
diff --git a/example/export/bundle.js b/example/export/bundle.js
index 5322d53a83..75e1937153 100644
--- a/example/export/bundle.js
+++ b/example/export/bundle.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -36,7 +36,7 @@ define([
"name": "Export Telemetry as CSV",
"implementation": ExportTelemetryAsCSVAction,
"category": "contextual",
- "cssclass": "icon-download",
+ "cssClass": "icon-download",
"depends": [ "exportService" ]
}
]
diff --git a/example/extensions/bundle.js b/example/extensions/bundle.js
index bf52f9092f..aaf65cc697 100644
--- a/example/extensions/bundle.js
+++ b/example/extensions/bundle.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
diff --git a/example/extensions/src/SomeExample.js b/example/extensions/src/SomeExample.js
index 925c3fc5e1..baaf523d7c 100644
--- a/example/extensions/src/SomeExample.js
+++ b/example/extensions/src/SomeExample.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -49,4 +49,4 @@ define(
return SomeExample;
}
-);
\ No newline at end of file
+);
diff --git a/example/forms/bundle.js b/example/forms/bundle.js
index f9e32db2cb..b2c4150fcc 100644
--- a/example/forms/bundle.js
+++ b/example/forms/bundle.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
diff --git a/example/forms/res/templates/exampleForm.html b/example/forms/res/templates/exampleForm.html
index a315d7c9c9..f1f58d32bc 100644
--- a/example/forms/res/templates/exampleForm.html
+++ b/example/forms/res/templates/exampleForm.html
@@ -1,5 +1,5 @@
-
\ No newline at end of file
+
diff --git a/platform/commonUI/about/res/templates/license-apache.html b/platform/commonUI/about/res/templates/license-apache.html
index 044813a425..953ecec943 100644
--- a/platform/commonUI/about/res/templates/license-apache.html
+++ b/platform/commonUI/about/res/templates/license-apache.html
@@ -1,5 +1,5 @@
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/platform/commonUI/about/res/templates/licenses-export-md.html b/platform/commonUI/about/res/templates/licenses-export-md.html
index 4982c49a39..edc760bfc8 100644
--- a/platform/commonUI/about/res/templates/licenses-export-md.html
+++ b/platform/commonUI/about/res/templates/licenses-export-md.html
@@ -1,5 +1,5 @@
-
diff --git a/platform/commonUI/general/res/templates/controls/action-group.html b/platform/commonUI/general/res/templates/controls/action-group.html
index 012442090c..d31d9bb792 100644
--- a/platform/commonUI/general/res/templates/controls/action-group.html
+++ b/platform/commonUI/general/res/templates/controls/action-group.html
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
diff --git a/platform/commonUI/general/res/templates/controls/time-controller.html b/platform/commonUI/general/res/templates/controls/time-controller.html
index 5e85c2d9bc..368e90d444 100644
--- a/platform/commonUI/general/res/templates/controls/time-controller.html
+++ b/platform/commonUI/general/res/templates/controls/time-controller.html
@@ -1,5 +1,5 @@
\ No newline at end of file
+
diff --git a/platform/features/conductor/core/src/timeSystems/LocalClock.js b/platform/features/conductor/core/src/timeSystems/LocalClock.js
index 09ddd35612..a9465a9701 100644
--- a/platform/features/conductor/core/src/timeSystems/LocalClock.js
+++ b/platform/features/conductor/core/src/timeSystems/LocalClock.js
@@ -31,7 +31,7 @@ define(['./TickSource'], function (TickSource) {
this.metadata = {
key: 'local',
mode: 'realtime',
- cssclass: 'icon-clock',
+ cssClass: 'icon-clock',
label: 'Real-time',
name: 'Real-time Mode',
description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.'
diff --git a/platform/features/conductor/core/src/ui/ConductorAxisController.js b/platform/features/conductor/core/src/ui/ConductorAxisController.js
index b99eaa0e6e..7d4c2df7da 100644
--- a/platform/features/conductor/core/src/ui/ConductorAxisController.js
+++ b/platform/features/conductor/core/src/ui/ConductorAxisController.js
@@ -22,9 +22,11 @@
define(
[
- "d3"
+ "d3-selection",
+ "d3-scale",
+ "d3-axis"
],
- function (d3) {
+ function (d3Selection, d3Scale, d3Axis) {
var PADDING = 1;
/**
@@ -70,12 +72,12 @@ define(
ConductorAxisController.prototype.initialize = function (element) {
this.target = element[0].firstChild;
var height = this.target.offsetHeight;
- var vis = d3.select(this.target)
+ var vis = d3Selection.select(this.target)
.append("svg:svg")
.attr("width", "100%")
.attr("height", height);
- this.xAxis = d3.axisTop();
+ this.xAxis = d3Axis.axisTop();
// draw x axis with labels and move to the bottom of the chart area
this.axisElement = vis.append("g")
@@ -115,10 +117,10 @@ define(
var bounds = this.bounds;
if (timeSystem.isUTCBased()) {
- this.xScale = this.xScale || d3.scaleUtc();
+ this.xScale = this.xScale || d3Scale.scaleUtc();
this.xScale.domain([new Date(bounds.start), new Date(bounds.end)]);
} else {
- this.xScale = this.xScale || d3.scaleLinear();
+ this.xScale = this.xScale || d3Scale.scaleLinear();
this.xScale.domain([bounds.start, bounds.end]);
}
@@ -145,9 +147,9 @@ define(
//The D3 scale used depends on the type of time system as d3
// supports UTC out of the box.
if (timeSystem.isUTCBased()) {
- this.xScale = d3.scaleUtc();
+ this.xScale = d3Scale.scaleUtc();
} else {
- this.xScale = d3.scaleLinear();
+ this.xScale = d3Scale.scaleLinear();
}
this.xAxis.scale(this.xScale);
diff --git a/platform/features/conductor/core/src/ui/ConductorAxisControllerSpec.js b/platform/features/conductor/core/src/ui/ConductorAxisControllerSpec.js
index 2dbbb42c4b..6cc9677a16 100644
--- a/platform/features/conductor/core/src/ui/ConductorAxisControllerSpec.js
+++ b/platform/features/conductor/core/src/ui/ConductorAxisControllerSpec.js
@@ -23,11 +23,13 @@
define([
'./ConductorAxisController',
'zepto',
- 'd3'
+ 'd3-selection',
+ 'd3-scale'
], function (
ConductorAxisController,
$,
- d3
+ d3Selection,
+ d3Scale
) {
describe("The ConductorAxisController", function () {
var controller,
@@ -84,8 +86,8 @@ define([
"emit"
]);
- spyOn(d3, 'scaleUtc').andCallThrough();
- spyOn(d3, 'scaleLinear').andCallThrough();
+ spyOn(d3Scale, 'scaleUtc').andCallThrough();
+ spyOn(d3Scale, 'scaleLinear').andCallThrough();
element = $('');
$(document).find('body').append(element);
@@ -122,15 +124,15 @@ define([
mockTimeSystem.isUTCBased.andReturn(true);
controller.changeTimeSystem(mockTimeSystem);
- expect(d3.scaleUtc).toHaveBeenCalled();
- expect(d3.scaleLinear).not.toHaveBeenCalled();
+ expect(d3Scale.scaleUtc).toHaveBeenCalled();
+ expect(d3Scale.scaleLinear).not.toHaveBeenCalled();
});
it("uses a linear scale for non-UTC time systems", function () {
mockTimeSystem.isUTCBased.andReturn(false);
controller.changeTimeSystem(mockTimeSystem);
- expect(d3.scaleLinear).toHaveBeenCalled();
- expect(d3.scaleUtc).not.toHaveBeenCalled();
+ expect(d3Scale.scaleLinear).toHaveBeenCalled();
+ expect(d3Scale.scaleUtc).not.toHaveBeenCalled();
});
it("sets axis domain to time conductor bounds", function () {
diff --git a/platform/features/conductor/core/src/ui/NumberFormat.js b/platform/features/conductor/core/src/ui/NumberFormat.js
index ac3f40cb7b..87e6f5944c 100644
--- a/platform/features/conductor/core/src/ui/NumberFormat.js
+++ b/platform/features/conductor/core/src/ui/NumberFormat.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
diff --git a/platform/features/conductor/core/src/ui/TimeConductorController.js b/platform/features/conductor/core/src/ui/TimeConductorController.js
index 5b600de3e2..da75dddb92 100644
--- a/platform/features/conductor/core/src/ui/TimeConductorController.js
+++ b/platform/features/conductor/core/src/ui/TimeConductorController.js
@@ -40,7 +40,16 @@ define(
* @memberof platform.features.conductor
* @constructor
*/
- function TimeConductorController($scope, $window, $location, openmct, conductorViewService, timeSystems, formatService) {
+ function TimeConductorController(
+ $scope,
+ $window,
+ $location,
+ openmct,
+ conductorViewService,
+ formatService,
+ DEFAULT_MODE,
+ SHOW_TIMECONDUCTOR
+ ) {
var self = this;
@@ -60,10 +69,14 @@ define(
this.validation = new TimeConductorValidation(this.conductor);
this.formatService = formatService;
+ //Check if the default mode defined is actually available
+ if (this.modes[DEFAULT_MODE] === undefined) {
+ DEFAULT_MODE = 'fixed';
+ }
+ this.DEFAULT_MODE = DEFAULT_MODE;
+
// Construct the provided time system definitions
- this.timeSystems = timeSystems.map(function (timeSystemConstructor) {
- return timeSystemConstructor();
- });
+ this.timeSystems = conductorViewService.systems;
this.initializeScope();
var searchParams = JSON.parse(JSON.stringify(this.$location.search()));
@@ -94,6 +107,8 @@ define(
//Respond to any subsequent conductor changes
this.conductor.on('bounds', this.changeBounds);
this.conductor.on('timeSystem', this.changeTimeSystem);
+
+ this.$scope.showTimeConductor = SHOW_TIMECONDUCTOR;
}
/**
@@ -139,7 +154,7 @@ define(
//Set mode from url if changed
if (searchParams[SEARCH.MODE] === undefined ||
searchParams[SEARCH.MODE] !== this.$scope.modeModel.selectedKey) {
- this.setMode(searchParams[SEARCH.MODE] || "fixed");
+ this.setMode(searchParams[SEARCH.MODE] || this.DEFAULT_MODE);
}
if (searchParams[SEARCH.TIME_SYSTEM] &&
diff --git a/platform/features/conductor/core/src/ui/TimeConductorControllerSpec.js b/platform/features/conductor/core/src/ui/TimeConductorControllerSpec.js
index 9606205cfc..1ea5fa1b29 100644
--- a/platform/features/conductor/core/src/ui/TimeConductorControllerSpec.js
+++ b/platform/features/conductor/core/src/ui/TimeConductorControllerSpec.js
@@ -130,8 +130,10 @@ define(['./TimeConductorController'], function (TimeConductorController) {
mockLocation,
{conductor: mockTimeConductor},
mockConductorViewService,
- mockTimeSystems,
- mockFormatService
+ mockFormatService,
+ 'fixed',
+ true
+
);
tsListener = getListener(mockTimeConductor.on, "timeSystem");
@@ -244,7 +246,6 @@ define(['./TimeConductorController'], function (TimeConductorController) {
var ts1Metadata;
var ts2Metadata;
var ts3Metadata;
- var mockTimeSystemConstructors;
beforeEach(function () {
mode = "realtime";
@@ -276,11 +277,7 @@ define(['./TimeConductorController'], function (TimeConductorController) {
];
//Wrap in mock constructors
- mockTimeSystemConstructors = mockTimeSystems.map(function (mockTimeSystem) {
- return function () {
- return mockTimeSystem;
- };
- });
+ mockConductorViewService.systems = mockTimeSystems;
controller = new TimeConductorController(
mockScope,
@@ -288,8 +285,9 @@ define(['./TimeConductorController'], function (TimeConductorController) {
mockLocation,
{conductor: mockTimeConductor},
mockConductorViewService,
- mockTimeSystemConstructors,
- mockFormatService
+ mockFormatService,
+ "fixed",
+ true
);
});
@@ -434,12 +432,7 @@ define(['./TimeConductorController'], function (TimeConductorController) {
}
};
- mockTimeSystems.push(function () {
- return timeSystem;
- });
- mockTimeSystems.push(function () {
- return otherTimeSystem;
- });
+ mockConductorViewService.systems = [timeSystem, otherTimeSystem];
urlBounds = {
start: 100,
@@ -467,8 +460,9 @@ define(['./TimeConductorController'], function (TimeConductorController) {
mockLocation,
{conductor: mockTimeConductor},
mockConductorViewService,
- mockTimeSystems,
- mockFormatService
+ mockFormatService,
+ "fixed",
+ true
);
spyOn(controller, "setMode");
diff --git a/platform/features/conductor/core/src/ui/TimeConductorViewService.js b/platform/features/conductor/core/src/ui/TimeConductorViewService.js
index a0e86ac6d8..2a4229e116 100644
--- a/platform/features/conductor/core/src/ui/TimeConductorViewService.js
+++ b/platform/features/conductor/core/src/ui/TimeConductorViewService.js
@@ -60,7 +60,7 @@ define(
this.availModes = {
'fixed': {
key: 'fixed',
- cssclass: 'icon-calendar',
+ cssClass: 'icon-calendar',
label: 'Fixed',
name: 'Fixed Timespan Mode',
description: 'Query and explore data that falls between two fixed datetimes.'
@@ -81,7 +81,7 @@ define(
if (timeSystemsForMode('realtime').length > 0) {
var realtimeMode = {
key: 'realtime',
- cssclass: 'icon-clock',
+ cssClass: 'icon-clock',
label: 'Real-time',
name: 'Real-time Mode',
description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.'
@@ -93,7 +93,7 @@ define(
if (timeSystemsForMode('lad').length > 0) {
var ladMode = {
key: 'lad',
- cssclass: 'icon-database',
+ cssClass: 'icon-database',
label: 'LAD',
name: 'LAD Mode',
description: 'Latest Available Data mode monitors real-time streaming data as it comes in. The Time Conductor and displays will only advance when data becomes available.'
diff --git a/platform/features/conductor/utcTimeSystem/bundle.js b/platform/features/conductor/utcTimeSystem/bundle.js
index df9a6c0d38..3cd29cf438 100644
--- a/platform/features/conductor/utcTimeSystem/bundle.js
+++ b/platform/features/conductor/utcTimeSystem/bundle.js
@@ -22,7 +22,7 @@
define([
"./src/UTCTimeSystem",
- 'legacyRegistry'
+ "legacyRegistry"
], function (
UTCTimeSystem,
legacyRegistry
diff --git a/platform/features/conductor/utcTimeSystem/src/UTCTimeSystem.js b/platform/features/conductor/utcTimeSystem/src/UTCTimeSystem.js
index 1c4e317682..a933761eac 100644
--- a/platform/features/conductor/utcTimeSystem/src/UTCTimeSystem.js
+++ b/platform/features/conductor/utcTimeSystem/src/UTCTimeSystem.js
@@ -25,7 +25,7 @@ define([
'../../core/src/timeSystems/LocalClock'
], function (TimeSystem, LocalClock) {
var FIFTEEN_MINUTES = 15 * 60 * 1000,
- DEFAULT_PERIOD = 1000;
+ DEFAULT_PERIOD = 100;
/**
* This time system supports UTC dates and provides a ticking clock source.
@@ -38,12 +38,12 @@ define([
/**
* Some metadata, which will be used to identify the time system in
* the UI
- * @type {{key: string, name: string, cssclass: string}}
+ * @type {{key: string, name: string, cssClass: string}}
*/
this.metadata = {
'key': 'utc',
'name': 'UTC',
- 'cssclass': 'icon-clock'
+ 'cssClass': 'icon-clock'
};
this.fmts = ['utc'];
diff --git a/platform/features/fixed/bundle.js b/platform/features/fixed/bundle.js
index 9f98750178..edc52d48f6 100644
--- a/platform/features/fixed/bundle.js
+++ b/platform/features/fixed/bundle.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -36,7 +36,7 @@ define([
{
"key": "fixed-display",
"name": "Fixed Position Display",
- "cssclass": "icon-box-with-dashed-lines",
+ "cssClass": "icon-box-with-dashed-lines",
"type": "telemetry.fixed",
"template": fixedTemplate,
"uses": [
@@ -49,28 +49,28 @@ define([
"items": [
{
"method": "add",
- "cssclass": "icon-plus",
+ "cssClass": "icon-plus",
"control": "menu-button",
"text": "Add",
"options": [
{
"name": "Box",
- "cssclass": "icon-box",
+ "cssClass": "icon-box",
"key": "fixed.box"
},
{
"name": "Line",
- "cssclass": "icon-line-horz",
+ "cssClass": "icon-line-horz",
"key": "fixed.line"
},
{
"name": "Text",
- "cssclass": "icon-T",
+ "cssClass": "icon-T",
"key": "fixed.text"
},
{
"name": "Image",
- "cssclass": "icon-image",
+ "cssClass": "icon-image",
"key": "fixed.image"
}
]
@@ -81,50 +81,50 @@ define([
"items": [
{
"method": "order",
- "cssclass": "icon-layers",
+ "cssClass": "icon-layers",
"control": "menu-button",
"title": "Layering",
"description": "Move the selected object above or below other objects",
"options": [
{
"name": "Move to Top",
- "cssclass": "icon-arrow-double-up",
+ "cssClass": "icon-arrow-double-up",
"key": "top"
},
{
"name": "Move Up",
- "cssclass": "icon-arrow-up",
+ "cssClass": "icon-arrow-up",
"key": "up"
},
{
"name": "Move Down",
- "cssclass": "icon-arrow-down",
+ "cssClass": "icon-arrow-down",
"key": "down"
},
{
"name": "Move to Bottom",
- "cssclass": "icon-arrow-double-down",
+ "cssClass": "icon-arrow-double-down",
"key": "bottom"
}
]
},
{
"property": "fill",
- "cssclass": "icon-paint-bucket",
+ "cssClass": "icon-paint-bucket",
"title": "Fill color",
"description": "Set fill color",
"control": "color"
},
{
"property": "stroke",
- "cssclass": "icon-line-horz",
+ "cssClass": "icon-line-horz",
"title": "Border color",
"description": "Set border color",
"control": "color"
},
{
"property": "color",
- "cssclass": "icon-T",
+ "cssClass": "icon-T",
"title": "Text color",
"description": "Set text color",
"mandatory": true,
@@ -132,20 +132,20 @@ define([
},
{
"property": "url",
- "cssclass": "icon-image",
+ "cssClass": "icon-image",
"control": "dialog-button",
"title": "Image Properties",
"description": "Edit image properties",
"dialog": {
"control": "textfield",
"name": "Image URL",
- "cssclass": "l-input-lg",
+ "cssClass": "l-input-lg",
"required": true
}
},
{
"property": "text",
- "cssclass": "icon-gear",
+ "cssClass": "icon-gear",
"control": "dialog-button",
"title": "Text Properties",
"description": "Edit text properties",
@@ -157,14 +157,14 @@ define([
},
{
"method": "showTitle",
- "cssclass": "icon-two-parts-both",
+ "cssClass": "icon-two-parts-both",
"control": "button",
"title": "Show title",
"description": "Show telemetry element title"
},
{
"method": "hideTitle",
- "cssclass": "icon-two-parts-one-only",
+ "cssClass": "icon-two-parts-one-only",
"control": "button",
"title": "Hide title",
"description": "Hide telemetry element title"
@@ -176,7 +176,7 @@ define([
{
"method": "remove",
"control": "button",
- "cssclass": "icon-trash"
+ "cssClass": "icon-trash"
}
]
}
@@ -188,7 +188,7 @@ define([
{
"key": "telemetry.fixed",
"name": "Fixed Position Display",
- "cssclass": "icon-box-with-dashed-lines",
+ "cssClass": "icon-box-with-dashed-lines",
"description": "Collect and display telemetry elements in " +
"alphanumeric format in a simple canvas workspace. " +
"Elements can be positioned and sized. " +
@@ -215,12 +215,12 @@ define([
{
"name": "Horizontal grid (px)",
"control": "textfield",
- "cssclass": "l-input-sm l-numeric"
+ "cssClass": "l-input-sm l-numeric"
},
{
"name": "Vertical grid (px)",
"control": "textfield",
- "cssclass": "l-input-sm l-numeric"
+ "cssClass": "l-input-sm l-numeric"
}
],
"pattern": "^(\\d*[1-9]\\d*)?$",
diff --git a/platform/features/imagery/bundle.js b/platform/features/imagery/bundle.js
index 63a12fd582..107de8ed6a 100644
--- a/platform/features/imagery/bundle.js
+++ b/platform/features/imagery/bundle.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -41,7 +41,7 @@ define([
{
"name": "Imagery",
"key": "imagery",
- "cssclass": "icon-image",
+ "cssClass": "icon-image",
"template": imageryTemplate,
"priority": "preferred",
"needs": [
diff --git a/platform/features/imagery/src/controllers/ImageryController.js b/platform/features/imagery/src/controllers/ImageryController.js
index 71e5268a10..2f30532c5e 100644
--- a/platform/features/imagery/src/controllers/ImageryController.js
+++ b/platform/features/imagery/src/controllers/ImageryController.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
diff --git a/platform/features/imagery/src/directives/MCTBackgroundImage.js b/platform/features/imagery/src/directives/MCTBackgroundImage.js
index 21cc288126..b47232868e 100644
--- a/platform/features/imagery/src/directives/MCTBackgroundImage.js
+++ b/platform/features/imagery/src/directives/MCTBackgroundImage.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
diff --git a/platform/features/imagery/src/policies/ImageryViewPolicy.js b/platform/features/imagery/src/policies/ImageryViewPolicy.js
index ed290d1152..ecc1505f36 100644
--- a/platform/features/imagery/src/policies/ImageryViewPolicy.js
+++ b/platform/features/imagery/src/policies/ImageryViewPolicy.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
diff --git a/platform/features/imagery/test/controllers/ImageryControllerSpec.js b/platform/features/imagery/test/controllers/ImageryControllerSpec.js
index 7e263dd2c0..3d3c3c00b1 100644
--- a/platform/features/imagery/test/controllers/ImageryControllerSpec.js
+++ b/platform/features/imagery/test/controllers/ImageryControllerSpec.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
diff --git a/platform/features/imagery/test/directives/MCTBackgroundImageSpec.js b/platform/features/imagery/test/directives/MCTBackgroundImageSpec.js
index 5ac9fd1a66..700a38dc43 100644
--- a/platform/features/imagery/test/directives/MCTBackgroundImageSpec.js
+++ b/platform/features/imagery/test/directives/MCTBackgroundImageSpec.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
diff --git a/platform/features/imagery/test/policies/ImageryViewPolicySpec.js b/platform/features/imagery/test/policies/ImageryViewPolicySpec.js
index cd6897a43f..5e69cb331c 100644
--- a/platform/features/imagery/test/policies/ImageryViewPolicySpec.js
+++ b/platform/features/imagery/test/policies/ImageryViewPolicySpec.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
diff --git a/platform/features/layout/bundle.js b/platform/features/layout/bundle.js
index 134b0f68a4..70e7314b11 100644
--- a/platform/features/layout/bundle.js
+++ b/platform/features/layout/bundle.js
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
+ * Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -56,7 +56,7 @@ define([
{
"key": "layout",
"name": "Display Layout",
- "cssclass": "icon-layout",
+ "cssClass": "icon-layout",
"type": "layout",
"template": layoutTemplate,
"editable": true,
@@ -65,7 +65,7 @@ define([
{
"key": "fixed",
"name": "Fixed Position",
- "cssclass": "icon-box-with-dashed-lines",
+ "cssClass": "icon-box-with-dashed-lines",
"type": "telemetry.panel",
"template": fixedTemplate,
"uses": [
@@ -77,7 +77,7 @@ define([
"items": [
{
"method": "add",
- "cssclass": "icon-plus",
+ "cssClass": "icon-plus",
"control": "menu-button",
"text": "Add",
"title": "Add",
@@ -85,22 +85,22 @@ define([
"options": [
{
"name": "Box",
- "cssclass": "icon-box",
+ "cssClass": "icon-box",
"key": "fixed.box"
},
{
"name": "Line",
- "cssclass": "icon-line-horz",
+ "cssClass": "icon-line-horz",
"key": "fixed.line"
},
{
"name": "Text",
- "cssclass": "icon-T",
+ "cssClass": "icon-T",
"key": "fixed.text"
},
{
"name": "Image",
- "cssclass": "icon-image",
+ "cssClass": "icon-image",
"key": "fixed.image"
}
]
@@ -111,50 +111,50 @@ define([
"items": [
{
"method": "order",
- "cssclass": "icon-layers",
+ "cssClass": "icon-layers",
"control": "menu-button",
"title": "Layering",
"description": "Move the selected object above or below other objects",
"options": [
{
"name": "Move to Top",
- "cssclass": "icon-arrow-double-up",
+ "cssClass": "icon-arrow-double-up",
"key": "top"
},
{
"name": "Move Up",
- "cssclass": "icon-arrow-up",
+ "cssClass": "icon-arrow-up",
"key": "up"
},
{
"name": "Move Down",
- "cssclass": "icon-arrow-down",
+ "cssClass": "icon-arrow-down",
"key": "down"
},
{
"name": "Move to Bottom",
- "cssclass": "icon-arrow-double-down",
+ "cssClass": "icon-arrow-double-down",
"key": "bottom"
}
]
},
{
"property": "fill",
- "cssclass": "icon-paint-bucket",
+ "cssClass": "icon-paint-bucket",
"title": "Fill color",
"description": "Set fill color",
"control": "color"
},
{
"property": "stroke",
- "cssclass": "icon-line-horz",
+ "cssClass": "icon-line-horz",
"title": "Border color",
"description": "Set border color",
"control": "color"
},
{
"property": "color",
- "cssclass": "icon-T",
+ "cssClass": "icon-T",
"title": "Text color",
"description": "Set text color",
"mandatory": true,
@@ -162,20 +162,20 @@ define([
},
{
"property": "url",
- "cssclass": "icon-image",
+ "cssClass": "icon-image",
"control": "dialog-button",
"title": "Image Properties",
"description": "Edit image properties",
"dialog": {
"control": "textfield",
"name": "Image URL",
- "cssclass": "l-input-lg",
+ "cssClass": "l-input-lg",
"required": true
}
},
{
"property": "text",
- "cssclass": "icon-gear",
+ "cssClass": "icon-gear",
"control": "dialog-button",
"title": "Text Properties",
"description": "Edit text properties",
@@ -187,14 +187,14 @@ define([
},
{
"method": "showTitle",
- "cssclass": "icon-two-parts-both",
+ "cssClass": "icon-two-parts-both",
"control": "button",
"title": "Show title",
"description": "Show telemetry element title"
},
{
"method": "hideTitle",
- "cssclass": "icon-two-parts-one-only",
+ "cssClass": "icon-two-parts-one-only",
"control": "button",
"title": "Hide title",
"description": "Hide telemetry element title"
@@ -206,7 +206,7 @@ define([
{
"method": "remove",
"control": "button",
- "cssclass": "icon-trash",
+ "cssClass": "icon-trash",
"title": "Delete",
"description": "Delete the selected item"
}
@@ -237,9 +237,7 @@ define([
"$scope",
"$q",
"dialogService",
- "telemetryHandler",
- "telemetryFormatter",
- "throttle"
+ "openmct"
]
}
],
@@ -275,7 +273,7 @@ define([
{
"key": "layout",
"name": "Display Layout",
- "cssclass": "icon-layout",
+ "cssClass": "icon-layout",
"description": "Assemble other objects and components together into a reusable screen layout. Working in a simple canvas workspace, simply drag in the objects you want, position and size them. Save your design and view or edit it at any time.",
"priority": 900,
"features": "creation",
@@ -291,12 +289,12 @@ define([
{
"name": "Horizontal grid (px)",
"control": "textfield",
- "cssclass": "l-input-sm l-numeric"
+ "cssClass": "l-input-sm l-numeric"
},
{
"name": "Vertical grid (px)",
"control": "textfield",
- "cssclass": "l-input-sm l-numeric"
+ "cssClass": "l-input-sm l-numeric"
}
],
"key": "layoutGrid",
@@ -307,7 +305,7 @@ define([
{
"key": "telemetry.panel",
"name": "Telemetry Panel",
- "cssclass": "icon-telemetry-panel",
+ "cssClass": "icon-telemetry-panel",
"description": "A panel for collecting telemetry elements.",
"priority": 899,
"delegates": [
@@ -330,12 +328,12 @@ define([
{
"name": "Horizontal grid (px)",
"control": "textfield",
- "cssclass": "l-input-sm l-numeric"
+ "cssClass": "l-input-sm l-numeric"
},
{
"name": "Vertical grid (px)",
"control": "textfield",
- "cssclass": "l-input-sm l-numeric"
+ "cssClass": "l-input-sm l-numeric"
}
],
"pattern": "^(\\d*[1-9]\\d*)?$",
diff --git a/platform/features/layout/res/templates/elements/box.html b/platform/features/layout/res/templates/elements/box.html
index 892d8ca1af..00449901c5 100644
--- a/platform/features/layout/res/templates/elements/box.html
+++ b/platform/features/layout/res/templates/elements/box.html
@@ -1,5 +1,5 @@
-
diff --git a/platform/forms/res/templates/controls/checkbox.html b/platform/forms/res/templates/controls/checkbox.html
index 2029e52555..3cb69a4f07 100644
--- a/platform/forms/res/templates/controls/checkbox.html
+++ b/platform/forms/res/templates/controls/checkbox.html
@@ -1,5 +1,5 @@
-