[plot] set minimum marquee size

Users must draw a marquee box with diagonal size of atleast 7.5
pixels.  This prevents clicks from being translated to zooms on
the plot.  Because startMarquee triggers a plot history update.
endMarquee must remove the plot history update when preventing
marqueeZoom.  This has a side effect of causing a requery for
data, but is a simple enough solution for now.

Fixes #2002.

API.md

@@ -1,3 +1,57 @@
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+**Table of Contents** 
+
+- [Building Applications With Open MCT](#building-applications-with-open-mct)
+  - [Scope and purpose of this document](#scope-and-purpose-of-this-document)
+  - [Building From Source](#building-from-source)
+  - [Starting an Open MCT application](#starting-an-open-mct-application)
+  - [Plugins](#plugins)
+    - [Defining and Installing a New Plugin](#defining-and-installing-a-new-plugin)
+  - [Domain Objects and Identifiers](#domain-objects-and-identifiers)
+    - [Object Attributes](#object-attributes)
+    - [Domain Object Types](#domain-object-types)
+  - [Root Objects](#root-objects)
+  - [Object Providers](#object-providers)
+  - [Composition Providers](#composition-providers)
+    - [Adding Composition Providers](#adding-composition-providers)
+    - [Default Composition Provider](#default-composition-provider)
+  - [Telemetry API](#telemetry-api)
+    - [Integrating Telemetry Sources](#integrating-telemetry-sources)
+      - [Telemetry Metadata](#telemetry-metadata)
+        - [Values](#values)
+          - [Value Hints](#value-hints)
+        - [The Time Conductor and Telemetry](#the-time-conductor-and-telemetry)
+      - [Telemetry Providers](#telemetry-providers)
+      - [Telemetry Requests and Responses.](#telemetry-requests-and-responses)
+      - [Request Strategies **draft**](#request-strategies-draft)
+        - [`latest` request strategy](#latest-request-strategy)
+        - [`minmax` request strategy](#minmax-request-strategy)
+      - [Telemetry Formats **draft**](#telemetry-formats-draft)
+        - [Registering Formats](#registering-formats)
+      - [Telemetry Data](#telemetry-data)
+        - [Telemetry Datums](#telemetry-datums)
+      - [Limit Evaluators **draft**](#limit-evaluators-draft)
+    - [Telemetry Consumer APIs **draft**](#telemetry-consumer-apis-draft)
+  - [Time API](#time-api)
+    - [Time Systems and Bounds](#time-systems-and-bounds)
+      - [Defining and Registering Time Systems](#defining-and-registering-time-systems)
+      - [Getting and Setting the Active Time System](#getting-and-setting-the-active-time-system)
+    - [Time Bounds](#time-bounds)
+    - [Clocks](#clocks)
+      - [Defining and registering clocks](#defining-and-registering-clocks)
+      - [Getting and setting active clock](#getting-and-setting-active-clock)
+      - [Stopping an active clock](#stopping-an-active-clock)
+      - [Clock Offsets](#clock-offsets)
+    - [Time Events](#time-events)
+      - [List of Time Events](#list-of-time-events)
+    - [The Time Conductor](#the-time-conductor)
+      - [Time Conductor Configuration](#time-conductor-configuration)
+      - [Example conductor configuration](#example-conductor-configuration)
+  - [Included Plugins](#included-plugins)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
 # Building Applications With Open MCT
 
 ## Scope and purpose of this document
@@ -154,7 +208,7 @@ registry.
 
 eg.
 ```javascript
-openmct.types.addType('my-type', {
+openmct.types.addType('example.my-type', {
     name: "My Type",
     description: "This is a type that I added!",
     creatable: true
@@ -162,8 +216,9 @@ openmct.types.addType('my-type', {
 ```
 
 The `addType` function accepts two arguments:
-* A `string` key identifying the type. This key is used when specifying a type 
-for an object.
+* A `string` key identifying the type. This key is used when specifying a type
+for an object.  We recommend prefixing your types with a namespace to avoid
+conflicts with other plugins.
 * An object type specification. An object type definition supports the following 
 attributes      
     * `name`: a `string` naming this object type
@@ -194,7 +249,7 @@ To do so, use the `addRoot` method of the object API.
 eg.
 ```javascript
 openmct.objects.addRoot({
-        namespace: "my-namespace",
+        namespace: "example.namespace",
         key: "my-key"
     });
 ```
@@ -235,13 +290,12 @@ 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.
+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
+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.
@@ -255,7 +309,7 @@ Composition Provider:
 ```javascript
 openmct.composition.addProvider({
     appliesTo: function (domainObject) {
-        return domainObject.type === 'my-type';
+        return domainObject.type === 'example.my-type';
     },
     load: function (domainObject) {
         return Promise.resolve(myDomainObjects);
@@ -273,8 +327,9 @@ These identifiers will be used to fetch Domain Objects from an [Object 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.:
 
 ```javascript
 var domainObject = {
@@ -295,13 +350,17 @@ var domainObject = {
 
 ## Telemetry API
 
-The Open MCT telemetry API provides two main sets of interfaces-- one for integrating telemetry data into Open MCT, and another for developing Open MCT visualization plugins utilizing telemetry API.  
+The Open MCT telemetry API provides two main sets of interfaces-- one for
+integrating telemetry data into Open MCT, and another for developing Open MCT
+visualization plugins utilizing the telemetry API.  
 
-The APIs for visualization plugins are still a work in progress and docs may change at any time.  However, the APIs for integrating telemetry metadata into Open MCT are stable and documentation is included below.
+The APIs for visualization plugins are still a work in progress and docs may
+change at any time.  However, the APIs for integrating telemetry metadata into
+Open MCT are stable and documentation is included below.
 
 ### Integrating Telemetry Sources
 
-There are two main tasks for integrating telemetry sources-- describing telemetry objects with relevant metadata, and then providing telemetry data for those objects.  You'll use an [Object Provider](#object-providers) to provide objects with the necessary [Telemetry Metadata](#telemetry-metadata), and then register a [Telemetry Provider](#telemetry-providers) to retrieve telemetry data for those objects.
+There are two main tasks for integrating telemetry sources-- describing telemetry objects with relevant metadata, and then providing telemetry data for those objects.  You'll use an [Object Provider](#object-providers) to provide objects with the necessary [Telemetry Metadata](#telemetry-metadata), and then register a [Telemetry Provider](#telemetry-providers) to retrieve telemetry data for those objects.  Alternatively, you can register a telemetry metadata provider to provide the necessary telemetry metadata.
 
 For a step-by-step guide to building a telemetry adapter, please see the 
 [Open MCT Tutorials](https://github.com/nasa/openmct-tutorial).
@@ -355,7 +414,7 @@ attribute      | type   | flags    | notes
 ---            |  ---   |  ---     | ---
 `key`          | string | required | unique identifier for this field.  
 `hints`        | object | required | Hints allow views to intelligently select relevant attributes for display, and are required for most views to function.  See section on "Value Hints" below.
-`name`         | string | optional | a human readible label for this field.  If omitted, defaults to `key`.
+`name`         | string | optional | a human readable label for this field.  If omitted, defaults to `key`.
 `source`       | string | optional | identifies the property of a datum where this value is stored.  If omitted, defaults to `key`.
 `format`       | string | optional | a specific format identifier, mapping to a formatter.  If omitted, uses a default formatter.  For enumerations, use `enum`.  For timestamps, use `utc` if you are using utc dates, otherwise use a key mapping to your custom date format.  
 `units`        | string | optional | the units of this value, e.g. `km`, `seconds`, `parsecs`
@@ -383,14 +442,18 @@ In order for the time conductor to work, there will always be an active "time sy
 
 #### Telemetry Providers
 
-Telemetry providers are responsible for providing historical and real time telemetry data for telemetry objects.  Each telemetry provider determines which objects it can provide telemetry for, and then must implement methods to provide telemetry for those objects.
+Telemetry providers are responsible for providing historical and real-time telemetry data for telemetry objects.  Each telemetry provider determines which objects it can provide telemetry for, and then must implement methods to provide telemetry for those objects.
 
 A telemetry provider is a javascript object with up to four methods:
 
 * `supportsSubscribe(domainObject, callback, options)` optional.  Must be implemented to provide realtime telemetry.  Should return `true` if the provider supports subscriptions for the given domain object (and request options).
 * `subscribe(domainObject, callback, options)` required if `supportsSubscribe` is implemented.  Establish a subscription for realtime data for the given domain object.  Should invoke `callback` with a single telemetry datum every time data is received.  Must return an unsubscribe function.  Multiple views can subscribe to the same telemetry object, so it should always return a new unsubscribe function.
 * `supportsRequest(domainObject, options)` optional.  Must be implemented to provide historical telemetry.  Should return `true` if the provider supports historical requests for the given domain object.
-* `request(domainObject, options)` required if `supportsRequest` is implemented.  Must return a promise for an array of telemetry datums that fulfills the request.  The `options` argument will include a `start`, `end`, and `domain` attribute representing the query bounds.  For more request properties, see Request Properties below.
+* `request(domainObject, options)` required if `supportsRequest` is implemented.  Must return a promise for an array of telemetry datums that fulfills the request.  The `options` argument will include a `start`, `end`, and `domain` attribute representing the query bounds.  See [Telemetry Requests and Responses](#telemetry-requests-and-responses) for more info on how to respond to requests.
+* `supportsMetadata(domainObject)` optional.  Implement and return `true` for objects that you want to provide dynamic metadata for.
+* `getMetadata(domainObject)` required if `supportsMetadata` is implemented.  Must return a valid telemetry metadata definition that includes at least one valueMetadata definition.
+* `supportsLimits(domainObject)` optional.  Implement and return `true` for domain objects that you want to provide a limit evaluator for.
+* `getLimitEvaluator(domainObject)` required if `supportsLimits` is implemented.  Must return a valid LimitEvaluator for a given domain object.
 
 Telemetry providers are registered by calling `openmct.telemetry.addProvider(provider)`, e.g.
 
@@ -398,14 +461,15 @@ Telemetry providers are registered by calling `openmct.telemetry.addProvider(pro
 openmct.telemetry.addProvider({
     supportsRequest: function (domainObject, options) { /*...*/ },
     request: function (domainObject, options) { /*...*/ },
-    supportsSubscribe: function (domainObject, callback, options) { /*...*/ },
-    subscribe: function (domainObject, callback, options) { /*...*/ }
 })
 ```
 
-#### Telemetry Requests
+Note: it is not required to implement all of the methods on every provider.  Depending on the complexity of your implementation, it may be helpful to instantiate and register your realtime, historical, and metadata providers separately.
+
+#### Telemetry Requests and Responses.
 
 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,
@@ -414,7 +478,53 @@ Telemetry requests support time bounded queries. A call to a _Telemetry Provider
 }
 ```
 
-#### Telemetry Formats
+In this case, the `domain` is the currently selected time-system, and the start and end dates are valid dates in that time system.
+
+A telemetry provider's `request` method should return a promise for an array of telemetry datums.  These datums must be sorted by `domain` in ascending order.
+
+#### Request Strategies **draft**
+
+To improve performance views may request a certain strategy for data reduction.  These are intended to improve visualization performance by reducing the amount of data needed to be sent to the client.  These strategies will be indicated by additional parameters in the request options.  You may choose to handle them or ignore them.  
+
+Note: these strategies are currently being tested in core plugins and may change based on developer feedback.
+
+##### `latest` request strategy
+
+This request is a "depth based" strategy.  When a view is only capable of
+displaying a single value (or perhaps the last ten values), then it can
+use the `latest` request strategy with a `size` parameter that specifies
+the number of results it desires.  The `size` parameter is a hint; views
+must not assume the response will have the exact number of results requested.
+
+example:
+```javascript
+{
+    start: 1487981997240,
+    end: 1487982897240,
+    domain: 'utc',
+    strategy: 'latest',
+    size: 1
+}
+```
+
+This strategy says "I want the lastest data point in this time range".  A provider which recognizes this request should return only one value-- the latest-- in the requested time range.  Depending on your back-end implementation, performing these queries in bulk can be a large performance increase.  These are generally issued by views that are only capable of displaying a single value and only need to show the latest value.
+
+##### `minmax` request strategy
+
+example:
+```javascript
+{
+    start: 1487981997240,
+    end: 1487982897240,
+    domain: 'utc',
+    strategy: 'minmax',
+    size: 720
+}
+```
+
+MinMax queries are issued by plots, and may be issued by other types as well.  The aim is to reduce the amount of data returned but still faithfully represent the full extent of the data.  In order to do this, the view calculates the maximum data resolution it can display (i.e. the number of horizontal pixels in a plot) and sends that as the `size`.  The response should include at least one minimum and one maximum value per point of resolution.
+
+#### Telemetry Formats **draft**
 
 Telemetry format objects define how to interpret and display telemetry data. 
 They have a simple structure:
@@ -484,6 +594,17 @@ The key-value pairs of this object are described by the telemetry metadata of
 a domain object, as discussed in the [Telemetry Metadata](#telemetry-metadata)
 section.
 
+#### Limit Evaluators **draft**
+
+Limit evaluators allow a telemetry integrator to define how limits should be 
+applied to telemetry from a given domain object.  For an example of a limit 
+evaluator, take a look at `examples/generator/SinewaveLimitProvider.js`.
+
+### Telemetry Consumer APIs **draft**
+
+The APIs for requesting telemetry from Open MCT -- e.g. for use in custom views -- are currently in draft state and are being revised.  If you'd like to experiement with them before they are finalized, please contact the team via the contact-us link on our website.
+
+
 ## Time API
 
 Open MCT provides API for managing the temporal state of the application.
@@ -591,7 +712,7 @@ openmct.time.bounds({start: now - ONE_HOUR, now);
 To respond to bounds change events, listen for the [`'bounds'`](#time-events)
 event.
 
-## Clocks
+### Clocks
 
 The Time API can be set to follow a clock source which will cause the bounds
 to be updated automatically whenever the clock source "ticks". A clock is simply
@@ -610,7 +731,7 @@ be defined to tick on some remote timing source.
 The values provided by clocks are simple `number`s, which are interpreted in the
 context of the active [Time System](#defining-and-registering-time-systems).
 
-### Defining and registering clocks
+#### Defining and registering clocks
 
 A clock is an object that defines certain required metadata and functions:
 
@@ -724,7 +845,7 @@ __Note:__ Setting the clock offsets will trigger an immediate bounds change, as
 new bounds will be calculated based on the `currentValue()` of the active clock. 
 Clock offsets are only relevant when a clock source is active.
 
-## Time Events
+### Time Events
 
 The Time API is a standard event emitter; you can register callbacks for events using the `on` method and remove callbacks for events with the `off` method.
 
@@ -766,7 +887,7 @@ The events emitted by the Time API are:
   * `clockOffsets`: The new [clock offsets](#clock-offsets).
 
 
-## The Time Conductor
+### The Time Conductor
 
 The Time Conductor provides a user interface for managing time bounds in Open 
 MCT. It allows a user to select from configured time systems and clocks, and to set bounds and clock offsets.

bower.json

@@ -25,4 +25,4 @@
     "html2canvas": "^0.4.1",
     "moment-timezone": "^0.5.13"
   }
-}
+}

circle.yml

@@ -1,6 +1,6 @@
 machine:
   node:
-    version: 4.7.0
+    version: 8.11.0
 
 dependencies:
   pre:
@@ -24,4 +24,4 @@ test:
 general:
   branches:
     ignore:
-      - gh-pages
+      - gh-pages

example/generator/GeneratorMetadataProvider.js

@@ -0,0 +1,108 @@
+define([
+    'lodash'
+], function (
+    _
+) {
+
+    var METADATA_BY_TYPE = {
+        'generator': {
+            values: [
+                {
+                    key: "name",
+                    name: "Name"
+                },
+                {
+                    key: "utc",
+                    name: "Time",
+                    format: "utc",
+                    hints: {
+                        domain: 1
+                    }
+                },
+                {
+                    key: "yesterday",
+                    name: "Yesterday",
+                    format: "utc",
+                    hints: {
+                        domain: 2
+                    }
+                },
+                {
+                    key: "sin",
+                    name: "Sine",
+                    hints: {
+                        range: 1
+                    }
+                },
+                {
+                    key: "cos",
+                    name: "Cosine",
+                    hints: {
+                        range: 2
+                    }
+                }
+            ]
+        },
+        'example.state-generator': {
+            values: [
+                {
+                    key: "name",
+                    name: "Name"
+                },
+                {
+                    key: "utc",
+                    name: "Time",
+                    format: "utc",
+                    hints: {
+                        domain: 1
+                    }
+                },
+                {
+                    key: "state",
+                    source: "value",
+                    name: "State",
+                    format: "enum",
+                    enumerations: [
+                        {
+                            value: 0,
+                            string: "OFF"
+                        },
+                        {
+                            value: 1,
+                            string: "ON"
+                        }
+                    ],
+                    hints: {
+                        range: 1
+                    }
+                },
+                {
+                    key: "value",
+                    name: "Value",
+                    hints: {
+                        range: 2
+                    }
+                }
+            ]
+        }
+    }
+
+    function GeneratorMetadataProvider() {
+
+    }
+
+    GeneratorMetadataProvider.prototype.supportsMetadata = function (domainObject) {
+        return METADATA_BY_TYPE.hasOwnProperty(domainObject.type);
+    };
+
+    GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) {
+        return _.extend(
+                {},
+                domainObject.telemetry,
+                METADATA_BY_TYPE[domainObject.type]
+            );
+    };
+
+    return GeneratorMetadataProvider;
+
+});

example/generator/GeneratorProvider.js

@@ -66,7 +66,7 @@ define([
             if (request && request.hasOwnProperty(prop)) {
                 workerRequest[prop] = request[prop];
             }
-            if (!workerRequest[prop]) {
+            if (!workerRequest.hasOwnProperty(prop)) {
                 workerRequest[prop] = REQUEST_DEFAULTS[prop];
             }
             workerRequest[prop] = Number(workerRequest[prop]);

example/generator/SinewaveLimitCapability.js

@@ -1,87 +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";
-
-        var RED = 0.9,
-            YELLOW = 0.5,
-            LIMITS = {
-                rh: {
-                    cssClass: "s-limit-upr s-limit-red",
-                    low: RED,
-                    high: Number.POSITIVE_INFINITY,
-                    name: "Red High"
-                },
-                rl: {
-                    cssClass: "s-limit-lwr s-limit-red",
-                    high: -RED,
-                    low: Number.NEGATIVE_INFINITY,
-                    name: "Red Low"
-                },
-                yh: {
-                    cssClass: "s-limit-upr s-limit-yellow",
-                    low: YELLOW,
-                    high: RED,
-                    name: "Yellow High"
-                },
-                yl: {
-                    cssClass: "s-limit-lwr s-limit-yellow",
-                    low: -RED,
-                    high: -YELLOW,
-                    name: "Yellow Low"
-                }
-            };
-
-        function SinewaveLimitCapability(domainObject) {
-            return {
-                limits: function (range) {
-                    return LIMITS;
-                },
-                evaluate: function (datum, range) {
-                    range = range || 'sin';
-                    if (datum[range] > RED) {
-                        return LIMITS.rh;
-                    }
-                    if (datum[range] < -RED) {
-                        return LIMITS.rl;
-                    }
-                    if (datum[range] > YELLOW) {
-                        return LIMITS.yh;
-                    }
-                    if (datum[range] < -YELLOW) {
-                        return LIMITS.yl;
-                    }
-                }
-            };
-        }
-
-        SinewaveLimitCapability.appliesTo = function (model) {
-            return model.type === 'generator';
-        };
-
-        return SinewaveLimitCapability;
-    }
-);

example/generator/SinewaveLimitProvider.js

@@ -0,0 +1,88 @@
+/*****************************************************************************
+ * 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 (
+
+) {
+
+    var RED = 0.9,
+        YELLOW = 0.5,
+        LIMITS = {
+            rh: {
+                cssClass: "s-limit-upr s-limit-red",
+                low: RED,
+                high: Number.POSITIVE_INFINITY,
+                name: "Red High"
+            },
+            rl: {
+                cssClass: "s-limit-lwr s-limit-red",
+                high: -RED,
+                low: Number.NEGATIVE_INFINITY,
+                name: "Red Low"
+            },
+            yh: {
+                cssClass: "s-limit-upr s-limit-yellow",
+                low: YELLOW,
+                high: RED,
+                name: "Yellow High"
+            },
+            yl: {
+                cssClass: "s-limit-lwr s-limit-yellow",
+                low: -RED,
+                high: -YELLOW,
+                name: "Yellow Low"
+            }
+        };
+
+    function SinewaveLimitProvider() {
+
+    }
+
+    SinewaveLimitProvider.prototype.supportsLimits = function (domainObject) {
+        return domainObject.type === 'generator';
+    };
+
+    SinewaveLimitProvider.prototype.getLimitEvaluator = function (domainObject) {
+        return {
+            evaluate: function (datum, valueMetadata) {
+                var range = valueMetadata ? valueMetadata.key : 'sin'
+                if (datum[range] > RED) {
+                    return LIMITS.rh;
+                }
+                if (datum[range] < -RED) {
+                    return LIMITS.rl;
+                }
+                if (datum[range] > YELLOW) {
+                    return LIMITS.yh;
+                }
+                if (datum[range] < -YELLOW) {
+                    return LIMITS.yl;
+                }
+            }
+        };
+    };
+
+    return SinewaveLimitProvider;
+});

example/generator/plugin.js

@@ -23,31 +23,17 @@
 
 define([
     "./GeneratorProvider",
-    "./SinewaveLimitCapability",
-    "./StateGeneratorProvider"
+    "./SinewaveLimitProvider",
+    "./StateGeneratorProvider",
+    "./GeneratorMetadataProvider"
 ], function (
     GeneratorProvider,
-    SinewaveLimitCapability,
-    StateGeneratorProvider
+    SinewaveLimitProvider,
+    StateGeneratorProvider,
+    GeneratorMetadataProvider
 ) {
 
-    var legacyExtensions = {
-        "capabilities": [
-            {
-                "key": "limit",
-                "implementation": SinewaveLimitCapability
-            }
-        ]
-    };
-
     return function(openmct){
-        //Register legacy extensions for things not yet supported by the new API
-        Object.keys(legacyExtensions).forEach(function (type){
-            var extensionsOfType = legacyExtensions[type];
-            extensionsOfType.forEach(function (extension) {
-                openmct.legacyExtension(type, extension)
-            })
-        });
 
         openmct.types.addType("example.state-generator", {
             name: "State Generator",
@@ -70,47 +56,7 @@ define([
             ],
             initialize: function (object) {
                 object.telemetry = {
-                    duration: 5,
-                    values: [
-                        {
-                            key: "name",
-                            name: "Name"
-                        },
-                        {
-                            key: "utc",
-                            name: "Time",
-                            format: "utc",
-                            hints: {
-                                domain: 1
-                            }
-                        },
-                        {
-                            key: "state",
-                            source: "value",
-                            name: "State",
-                            format: "enum",
-                            enumerations: [
-                                {
-                                    value: 0,
-                                    string: "OFF"
-                                },
-                                {
-                                    value: 1,
-                                    string: "ON"
-                                }
-                            ],
-                            hints: {
-                                range: 1
-                            }
-                        },
-                        {
-                            key: "value",
-                            name: "Value",
-                            hints: {
-                                range: 2
-                            }
-                        }
-                    ]
+                    duration: 5
                 }
             }
         });
@@ -125,63 +71,58 @@ define([
             form: [
                 {
                     name: "Period",
-                    control: "textfield",
+                    control: "numberfield",
                     cssClass: "l-input-sm l-numeric",
                     key: "period",
                     required: true,
                     property: [
                         "telemetry",
                         "period"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
+                    ]
                 },
                 {
                     name: "Amplitude",
-                    control: "textfield",
+                    control: "numberfield",
                     cssClass: "l-input-sm l-numeric",
                     key: "amplitude",
                     required: true,
                     property: [
                         "telemetry",
                         "amplitude"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
+                    ]
                 },
                 {
                     name: "Offset",
-                    control: "textfield",
+                    control: "numberfield",
                     cssClass: "l-input-sm l-numeric",
                     key: "offset",
                     required: true,
                     property: [
                         "telemetry",
                         "offset"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
+                    ]
                 },
                 {
                     name: "Data Rate (hz)",
-                    control: "textfield",
+                    control: "numberfield",
                     cssClass: "l-input-sm l-numeric",
                     key: "dataRateInHz",
                     required: true,
                     property: [
                         "telemetry",
                         "dataRateInHz"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
+                    ]
                 },
                 {
                     name: "Phase (radians)",
-                    control: "textfield",
+                    control: "numberfield",
                     cssClass: "l-input-sm l-numeric",
                     key: "phase",
                     required: true,
                     property: [
                         "telemetry",
                         "phase"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
+                    ]
                 }
             ],
             initialize: function (object) {
@@ -190,48 +131,14 @@ define([
                     amplitude: 1,
                     offset: 0,
                     dataRateInHz: 1,
-                    phase: 0,
-                    values: [
-                        {
-                            key: "name",
-                            name: "Name"
-                        },
-                        {
-                            key: "utc",
-                            name: "Time",
-                            format: "utc",
-                            hints: {
-                                domain: 1
-                            }
-                        },
-                        {
-                            key: "yesterday",
-                            name: "Yesterday",
-                            format: "utc",
-                            hints: {
-                                domain: 2
-                            }
-                        },
-                        {
-                            key: "sin",
-                            name: "Sine",
-                            hints: {
-                                range: 1
-                            }
-                        },
-                        {
-                            key: "cos",
-                            name: "Cosine",
-                            hints: {
-                                range: 2
-                            }
-                        }
-                    ]
+                    phase: 0
                 };
             }
         });
 
         openmct.telemetry.addProvider(new GeneratorProvider());
+        openmct.telemetry.addProvider(new GeneratorMetadataProvider());
+        openmct.telemetry.addProvider(new SinewaveLimitProvider());
     };
 
 });

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

@@ -101,11 +101,11 @@
         padding-top: 1em;
 
         .cols {
-            @include display(flex);
-            @include flex-direction(row);
+            display: flex;
+            flex-direction: row;
 
             .col {
-                @include flex(1 1 auto);
+                flex: 1 1 auto;
                 &:not(:last-child) {
                     $v: $interiorMargin * 4;
                     border-right: 1px solid $colorInteriorBorder;
@@ -199,7 +199,7 @@
                 border-radius: 15%;
                 position: absolute;
                 left: 50%;
-                @include transform(translateX(-50%));
+                transform: translateX(-50%);
             }
         }
     }

index.html

@@ -68,7 +68,6 @@
                 ]
             }));
             openmct.install(openmct.plugins.SummaryWidget());
-            openmct.install(openmct.plugins.Notebook());
             openmct.time.clock('local', {start: -THIRTY_MINUTES, end: 0});
             openmct.time.timeSystem('utc');
             openmct.start();

karma.conf.js

@@ -38,7 +38,6 @@ module.exports = function(config) {
             {pattern: 'node_modules/d3-*/**/*.js', included: false},
             {pattern: 'node_modules/vue/**/*.js', included: false},
             {pattern: 'src/**/*', included: false},
-            {pattern: 'node_modules/@cristian77/**/*.js', included: false},
             {pattern: 'example/**/*.html', included: false},
             {pattern: 'example/**/*.js', included: false},
             {pattern: 'example/**/*.json', included: false},

openmct.js

@@ -49,9 +49,7 @@ requirejs.config({
         "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",
-        "dom-to-image": "node_modules/dom-to-image/src/dom-to-image",
-        "painterro": "node_modules/@cristian77/painterro/build/painterro.min"
+        "d3-time-format": "node_modules/d3-time-format/build/d3-time-format.min"
     },
     "shim": {
         "angular": {
@@ -69,9 +67,6 @@ requirejs.config({
         "moment-duration-format": {
             "deps": ["moment"]
         },
-        "painterro": {
-            "exports": "Painterro"
-        },
         "saveAs": {
             "exports": "saveAs"
         },
@@ -93,9 +88,6 @@ requirejs.config({
         },
         "d3-axis": {
             "exports": "d3-axis"
-        },
-        "dom-to-image": {
-            "exports": "dom-to-image"
         }
     }
 });

package.json

@@ -1,20 +1,18 @@
 {
   "name": "openmct",
-  "version": "0.13.3-SNAPSHOT",
+  "version": "0.14.0-SNAPSHOT",
   "description": "The Open MCT core platform",
   "dependencies": {
-    "@cristian77/painterro": "^0.2.48",
-    "d3-array": "^1.0.2",
-    "d3-axis": "^1.0.4",
-    "d3-collection": "^1.0.2",
-    "d3-color": "^1.0.2",
-    "d3-format": "^1.0.2",
-    "d3-interpolate": "^1.1.3",
-    "d3-scale": "^1.0.4",
-    "d3-selection": "^1.0.3",
-    "d3-time": "^1.0.4",
-    "d3-time-format": "^2.0.3",
-    "dom-to-image": "^2.6.0",
+    "d3-array": "1.2.x",
+    "d3-axis": "1.0.x",
+    "d3-collection": "1.0.x",
+    "d3-color": "1.0.x",
+    "d3-format": "1.2.x",
+    "d3-interpolate": "1.1.x",
+    "d3-scale": "1.0.x",
+    "d3-selection": "1.3.x",
+    "d3-time": "1.0.x",
+    "d3-time-format": "2.1.x",
     "express": "^4.13.1",
     "minimist": "^1.1.1",
     "request": "^2.69.0",

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

@@ -88,12 +88,6 @@ define(
                     commit("Changes from toolbar.");
                 }
             }
-
-            // Avoid attaching scope to this;
-            // http://errors.angularjs.org/1.2.26/ng/cpws
-            this.setSelection = function (s) {
-                scope.selection = s;
-            };
             this.clearExposedToolbar = function () {
                 // Clear exposed toolbar state (if any)
                 if (attrs.toolbar) {
@@ -110,6 +104,7 @@ define(
             this.toolbar = undefined;
             this.toolbarObject = {};
             this.openmct = openmct;
+            this.scope = scope;
 
             // If this representation exposes a toolbar, set up watches
             // to synchronize with it.
@@ -130,26 +125,23 @@ define(
         // Represent a domain object using this definition
         EditToolbarRepresenter.prototype.represent = function (representation) {
             // Get the newest toolbar definition from the view
-            var definition = (representation || {}).toolbar || {},
-                self = this;
+            var definition = (representation || {}).toolbar || {};
 
-            // Initialize toolbar (expose object to parent scope)
-            function initialize(def) {
-                // If we have been asked to expose toolbar state...
-                if (self.attrs.toolbar) {
-                    // Initialize toolbar object
-                    self.toolbar = new EditToolbar(def, self.commit);
-                    // Ensure toolbar state is exposed
-                    self.exposeToolbar();
-                }
+            // If we have been asked to expose toolbar state...
+            if (this.attrs.toolbar) {
+                // Initialize toolbar object
+                this.toolbar = new EditToolbar(definition, this.commit);
+                // Ensure toolbar state is exposed
+                this.exposeToolbar();
             }
 
-            // Expose the toolbar object to the parent scope
-            initialize(definition);
-            // Create a selection scope
-            this.setSelection(new EditToolbarSelection(this.openmct));
-            // Initialize toolbar to an empty selection
-            this.updateSelection([]);
+            // Add toolbar selection to scope.
+            this.scope.selection = new EditToolbarSelection(
+                this.scope,
+                this.openmct
+            );
+            // Initialize toolbar to current selection
+            this.updateSelection(this.scope.selection.all());
         };
 
         // Destroy; remove toolbar object from parent scope

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

@@ -38,24 +38,37 @@ define(
          * @memberof platform/commonUI/edit
          * @constructor
          */
-        function EditToolbarSelection(openmct) {
+        function EditToolbarSelection($scope, openmct) {
             this.selection = [{}];
             this.selecting = false;
             this.selectedObj = undefined;
+            this.openmct = openmct;
+            var self = this;
 
-            openmct.selection.on('change', function (selection) {
+            function setSelection(selection) {
                 var selected = selection[0];
 
                 if (selected && selected.context.toolbar) {
-                    this.select(selected.context.toolbar);
+                    self.select(selected.context.toolbar);
                 } else {
-                    this.deselect();
+                    self.deselect();
                 }
 
                 if (selected && selected.context.viewProxy) {
-                    this.proxy(selected.context.viewProxy);
+                    self.proxy(selected.context.viewProxy);
                 }
-            }.bind(this));
+
+                setTimeout(function () {
+                    $scope.$apply();
+                });
+            }
+
+            $scope.$on("$destroy", function () {
+                self.openmct.selection.off('change', setSelection);
+            });
+
+            this.openmct.selection.on('change', setSelection);
+            setSelection(this.openmct.selection.get());
         }
 
         /**

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

@@ -36,7 +36,7 @@ define(
             beforeEach(function () {
                 mockScope = jasmine.createSpyObj(
                     '$scope',
-                    ['$on', '$watch', '$watchCollection', "commit"]
+                    ['$on', '$watch', '$watchCollection', "commit", "$apply"]
                 );
                 mockElement = {};
                 testAttrs = { toolbar: 'testToolbar' };

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

@@ -30,7 +30,8 @@ define(
                 otherElement,
                 selection,
                 mockSelection,
-                mockOpenMCT;
+                mockOpenMCT,
+                mockScope;
 
             beforeEach(function () {
                 testProxy = { someKey: "some value" };
@@ -46,7 +47,12 @@ define(
                 mockOpenMCT = {
                     selection: mockSelection
                 };
-                selection = new EditToolbarSelection(mockOpenMCT);
+                mockScope = jasmine.createSpyObj('$scope', [
+                    '$on',
+                    '$apply'
+                ]);
+
+                selection = new EditToolbarSelection(mockScope, mockOpenMCT);
                 selection.proxy(testProxy);
             });
 
@@ -103,6 +109,20 @@ define(
                 expect(selection.all()).toEqual([testProxy]);
             });
 
+            it("cleans up selection on scope destroy", function () {
+                expect(mockScope.$on).toHaveBeenCalledWith(
+                    '$destroy',
+                    jasmine.any(Function)
+                );
+
+                mockScope.$on.mostRecentCall.args[1]();
+
+                expect(mockOpenMCT.selection.off).toHaveBeenCalledWith(
+                    'change',
+                    jasmine.any(Function)
+                );
+            });
+
         });
     }
 );

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

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

platform/commonUI/general/res/sass/_app-start.scss

@@ -0,0 +1,11 @@
+// At the last, hide .l-splash-holder and show .holder-all
+.l-splash-holder.fadeout {
+    @include trans-prop-nice($props: opacity, $dur: 1000ms);
+    opacity: 0;
+    pointer-events: none;
+}
+
+.user-environ .holder-all {
+    opacity: 1;
+    pointer-events: inherit;
+}

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

@@ -94,19 +94,19 @@
 /********************************************* FLEX STYLES */
 .l-flex-row,
 .l-flex-col {
-    @include display(flex);
-    @include flex-wrap(nowrap);
+    display: flex;
+    flex-wrap: nowrap;
     .flex-elem {
         min-height: 0; // Needed to allow element to shrink within parent
         position: relative;
         &:not(.grows) {
-            @include flex(0 0 auto);
+            flex: 0 0 auto;
             &.flex-can-shrink {
-                @include flex(0 1 auto);
+                flex: 0 1 auto;
             }
         }
         &.grows {
-            @include flex(1 1 auto);
+            flex: 1 1 auto;
         }
         &.contents-align-right {
             text-align: right;
@@ -114,25 +114,25 @@
     }
     .flex-container {
         // Apply to wrapping elements, mct-includes, etc.
-        @include display(flex);
-        @include flex-wrap(nowrap);
-        @include flex(1 1 auto);
+        display: flex;
+        flex-wrap: nowrap;
+        flex: 1 1 auto;
         min-height:0;
     }
 }
 
 .l-flex-row {
-    @include flex-direction(row);
-    &.flex-elem { @include flex(1 1 auto); }
+    flex-direction: row;
+    &.flex-elem { flex: 1 1 auto; }
     > .flex-elem {
         min-width: 0;
         &.holder:not(:last-child) { margin-right: $interiorMargin; }
     }
-    .flex-container { @include flex-direction(row); }
+    .flex-container { flex-direction: row; }
 }
 
 .l-flex-col {
-    @include flex-direction(column);
+    flex-direction: column;
     > .flex-elem {
         min-height: 0;
         &.holder:not(:last-child) { margin-bottom: $interiorMarginLg; }
@@ -142,15 +142,15 @@
         flex-direction: column;
         //overflow: hidden !important;
     }
-    .flex-container { @include flex-direction(column); }
+    .flex-container { flex-direction: column; }
 }
 
 .flex-fixed {
-    @include flex(0 0 auto);
+    flex: 0 0 auto;
 }
 
 .flex-justify-end {
-    @include justify-content(flex-end);
+    justify-content: flex-end;
 }
 
 /********************************************* POPUPS */

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

@@ -33,14 +33,6 @@
     }
 }
 
-[class*="icon-"].labeled {
-    // Moved from .s-button and generalized
-    &:before {
-        // Fend off label from icon when it's included
-        margin-right: $interiorMarginSm;
-    }
-}
-
 /************************** CHAR UNICODES */
 
 $glyph-icon-alert-rect: '\e900';

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

@@ -83,8 +83,8 @@
             height: auto; width: auto;
             position: absolute;
             left: 0; top: 0; right: 0; bottom: 20%;
-            @include transform-origin(bottom left);
-            @include transform(scale(0.3));
+            transform-origin: bottom left;
+            transform: scale(0.3);
             z-index: 2;
         }
     }

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

@@ -53,7 +53,6 @@
     .l-inspector-part {
         box-sizing: border-box;
         padding-right: $interiorMargin;
-
         .tree .form {
             margin-left: $treeVCW + $interiorMarginLg;
         }
@@ -79,8 +78,7 @@
                 }
             }
             .form-row {
-                // To be replaced with .inspector-config, see below.
-                @include align-items(center);
+                align-items: center;
                 border: none !important;
                 margin-bottom: 0 !important;
                 padding: $interiorMarginSm 0;
@@ -101,12 +99,15 @@
         position: relative;
     }
 
+    ul li {
+        margin-bottom: $interiorMarginLg;
+    }
+
     em.t-inspector-part-header {
         border-radius: $basicCr;
         background-color: $colorInspectorSectionHeaderBg;
         color: $colorInspectorSectionHeaderFg;
-        margin-top: $interiorMarginLg;
-        //margin-bottom: $interiorMargin;
+        margin-bottom: $interiorMargin;
         padding: floor($formTBPad * .75) $formLRPad;
         text-transform: uppercase;
     }
@@ -200,102 +201,3 @@ mct-representation:not(.s-status-editing) .l-inspect {
         pointer-events: inherit;
     }
 }
-
-// NEW COMPACT FORM, FOR USE IN INSPECTOR
-// ul > li > label, control
-// Make a new UL for each form section
-// Allow control-first, controls-below
-
-.l-inspect .tree ul li,
-.inspector-config ul li {
-    padding: 2px 0;
-}
-
-
-.inspector-config {
-    $labelW: 40%;
-    $minW: $labelW;
-    ul {
-        margin-bottom: $interiorMarginLg;
-        li {
-            @include display(flex);
-            @include flex-wrap(wrap);
-            @include align-items(center);
-            label,
-            .control {
-                @include display(flex);
-                min-width: $minW;
-            }
-            label {
-                line-height: inherit;
-                padding: $interiorMarginSm 0;
-                width: $labelW;
-            }
-            .control {
-                @include flex-grow(1);
-            }
-
-            &:not(.section-header) {
-                &:not(.connects-to-previous) {
-                    //border-top: 1px solid $colorFormLines;
-                }
-            }
-
-            &.connects-to-previous {
-                padding-top: 0 !important;
-            }
-
-            &.section-header {
-                margin-top: $interiorMarginLg;
-                border-top: 1px solid $colorFormLines;
-            }
-
-            &.controls-first {
-                .control {
-                    @include flex-grow(0);
-                    margin-right: $interiorMargin;
-                    min-width: 0;
-                    order: 1;
-                    width: auto;
-                }
-                label {
-                    @include flex-grow(1);
-                    order: 2;
-                    width: auto;
-                }
-            }
-            &.controls-under {
-                display: block;
-                .control, label {
-                    display: block;
-                    width: auto;
-                }
-
-                ul li {
-                    border-top: none !important;
-                    padding: 0;
-                }
-            }
-        }
-    }
-
-    .form-error {
-        // Block element that visually flags an error and contains a message
-        background-color: $colorFormFieldErrorBg;
-        color: $colorFormFieldErrorFg;
-        border-radius: $basicCr;
-        display: block;
-        padding: 1px 6px;
-        &:before {
-            content: $glyph-icon-alert-triangle;
-            display: inline;
-            font-family: symbolsfont;
-            margin-right: $interiorMarginSm;
-        }
-    }
-}
-
-.tree .inspector-config {
-    margin-left: $treeVCW + $interiorMarginLg;
-}
-

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

@@ -76,9 +76,11 @@
 @import "items/item";
 @import "mobile/item";
 
-
 /********************************* TO BE MOVED */
 @import "autoflow";
 @import "features/imagery";
 @import "features/time-display";
 @import "widgets";
+
+/********************************* APP STARTUP */
+@import "app-start";

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

@@ -382,7 +382,7 @@
     /* This doesn't work on an element inside an element with absolute positioning that has height: auto */
     //position: relative;
     top: 50%;
-    @include transform(translateY(-50%));
+    transform: translateY(-50%);
 }
 
 @mixin verticalCenterBlock($holderH, $itemH) {

platform/commonUI/general/res/sass/_object-label.scss

@@ -22,8 +22,8 @@
 
 // mct-representation surrounding an object-label key="'label'"
 .rep-object-label {
-    @include flex-direction(row);
-    @include flex(1 1 auto);
+    flex-direction: row;
+    flex: 1 1 auto;
     height: inherit;
     line-height: inherit;
     min-width: 0;

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

@@ -55,7 +55,7 @@
 
 .widget-rule-header {
     @extend .l-flex-row;
-    @include align-items(center);
+    align-items: center;
     margin-bottom: $interiorMargin;
     > .flex-elem {
         &:not(:first-child) {
@@ -103,7 +103,7 @@
 .l-compact-form label {
     $ruleLabelW: 40%;
     $ruleLabelMaxW: 150px;
-    @include display(flex);
+    display: flex;
     max-width: $ruleLabelMaxW;
     width: $ruleLabelW;
 }
@@ -177,8 +177,8 @@
         ul {
             &:last-child { margin: 0; }
             li {
-                @include align-items(flex-start);
-                @include flex-wrap(nowrap);
+                align-items: flex-start;
+                flex-wrap: nowrap;
                 line-height: 230%; // Provide enough space when controls wrap
                 padding: 2px 0;
                 &:not(.widget-rule-header) {
@@ -233,7 +233,7 @@
 
 .l-widget-thumb-wrapper {
     @extend .l-flex-row;
-    @include align-items(center);
+    align-items: center;
     > span { display: block; }
     .grippy-holder,
     .view-control {
@@ -243,18 +243,18 @@
     }
 
     .widget-thumb {
-        @include flex(1 1 auto);
+        flex: 1 1 auto;
         width: 100%;
     }
 }
 
 .rule-title {
-    @include flex(0 1 auto);
+    flex: 0 1 auto;
     color: pullForward($colorBodyFg, 50%);
 }
 
 .rule-description {
-    @include flex(1 1 auto);
+    flex: 1 1 auto;
     @include ellipsize();
     color: pushBack($colorBodyFg, 20%);
 }
@@ -270,4 +270,37 @@
     @extend .s-summary-widget;
     @extend .l-summary-widget;
     padding: $interiorMarginSm $interiorMargin;
+}
+
+// Hide and show elements in the rule-header on hover
+.l-widget-rule,
+.l-widget-test-data-item {
+    .grippy,
+    .l-rule-action-buttons-wrapper,
+    .l-condition-action-buttons-wrapper,
+    .l-widget-test-data-item-action-buttons-wrapper {
+        @include trans-prop-nice($props: opacity, $dur: 500ms);
+        opacity: 0;
+    }
+    &:hover {
+        .grippy,
+        .l-rule-action-buttons-wrapper,
+        .l-widget-test-data-item-action-buttons-wrapper {
+            @include trans-prop-nice($props: opacity, $dur: 0);
+            opacity: 1;
+        }
+    }
+    .l-rule-action-buttons-wrapper {
+          .t-delete {
+            margin-left: 10px;
+          }
+    }
+    .t-condition {
+        &:hover {
+            .l-condition-action-buttons-wrapper {
+                @include trans-prop-nice($props: opacity, $dur: 0);
+                opacity: 1;
+            }
+        }
+    }
 }

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

@@ -34,6 +34,11 @@ $pad: $interiorMargin * $baseRatio;
     line-height: $btnStdH;
     padding: 0 $pad;
 
+    &.labeled:before {
+        // Icon when it's included
+        margin-right: $interiorMarginSm;
+    }
+
 	&.lg {
 		font-size: 1rem;
 	}

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

@@ -338,7 +338,7 @@ input[type="text"].s-input-inline,
     @include btnSubtle($bg: $colorSelectBg);
     @extend .icon-arrow-down; // Context arrow
     display: inline-block;
-    line-height: 180%;
+    padding: 0 $interiorMargin;
     overflow: hidden;
     position: relative;
     select {
@@ -349,17 +349,16 @@ input[type="text"].s-input-inline,
         color: $colorSelectFg;
         cursor: pointer;
         border: none !important;
-        padding: 0 20px 0 $interiorMargin;
-        width: 100%;
+        padding: 4px 25px 2px 0px;
+        width: 130%;
         option {
             margin: $interiorMargin 0; // Firefox
         }
     }
     &:before {
-        @include transform(translateY(-50%));
+        transform: translateY(-50%);
         color: rgba($colorInvokeMenu, percentToDecimal($contrastInvokeMenuPercent));
         display: block;
-        font-size: 0.8em;
         pointer-events: none;
         position: absolute;
         right: $interiorMargin;
@@ -435,7 +434,7 @@ input[type="text"].s-input-inline,
 
     .context-available {
         font-size: 0.7em;
-        @include flex(0 0 1);
+        flex: 0 0 1;
     }
 
     .t-object-alert {
@@ -676,14 +675,14 @@ input[type="range"] {
 .l-calendar {
     $colorMuted: pushBack($colorMenuFg, 30%);
     ul.l-cal-row {
-        @include display(flex);
-        @include flex-flow(row nowrap);
+        display: flex;
+        flex-flow: row nowrap;
         margin-top: 1px;
         &:first-child {
             margin-top: 0;
         }
         li {
-            @include flex(1 0);
+            flex: 1 0;
             margin-left: 1px;
             padding: $interiorMargin;
             text-align: center;
@@ -764,10 +763,10 @@ textarea {
     &:before {
         position: absolute;
         @include trans-prop-nice(transform, 100ms);
-        @include transform-origin(center);
+        transform-origin: center;
     }
     &.expanded:before {
-        @include transform(rotate(90deg));
+        transform: rotate(90deg);
     }
 }
 

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

@@ -157,16 +157,16 @@
 	$lh: $ueFooterH - ($m*2) - 1;
 	box-sizing: border-box;
 	@include ellipsize();
-	@include display(flex);
-	@include flex-direction(row);
-	@include align-items(center);
+	display: flex;
+	flex-direction: row;
+	align-items: center;
 	position: absolute;
 	top: $m; right: auto; bottom: $m; left: 50%;
 	height: auto; width: auto;
 	line-height: $lh;
 	max-width: 300px;
 	padding: 0 $interiorMargin 0 $interiorMargin;
-	@include transform(translateX(-50%));
+	transform: translateX(-50%);
 
 	&.minimized {
         @include transition-property(left, opacity);
@@ -185,7 +185,7 @@
     }
 
 	.banner-elem {
-		@include flex(0 1 auto);
+		flex: 0 1 auto;
 		margin-left: $interiorMargin;
 	}
 	a {
@@ -250,14 +250,14 @@
 // Archetypal message
 .l-message {
     $iconW: 32px;
-    @include display(flex);
-    @include flex-direction(row);
-    @include align-items(stretch);
+    display: flex;
+    flex-direction: row;
+    align-items: stretch;
     padding: $interiorMarginLg;
 
     &:before {
         // Icon
-        @include flex(0 1 auto);
+        flex: 0 1 auto;
         @include txtShdw($shdwStatusIc);
         @extend .icon-bell;
         color: $colorStatusDefault;
@@ -283,9 +283,9 @@
 
 
 .w-message-contents {
-    @include flex(1 1 auto);
-    @include display(flex);
-    @include flex-direction(column);
+    flex: 1 1 auto;
+    display: flex;
+    flex-direction: column;
 
     > div,
     > span {
@@ -294,7 +294,7 @@
     }
 
     .message-body {
-        @include flex(1 1 100%);
+        flex: 1 1 100%;
     }
 }
 
@@ -331,8 +331,8 @@
 // In a list
 .t-message-list {
     @include absPosDefault();
-    @include display(flex);
-    @include flex-direction(column);
+    display: flex;
+    flex-direction: column;
 
     > div,
     > span {
@@ -340,7 +340,7 @@
     }
 
     .w-messages {
-        @include flex(1 1 100%);
+        flex: 1 1 100%;
         overflow-y: auto;
         padding-right: $interiorMargin;
     }
@@ -360,7 +360,7 @@
 @include phonePortrait {
     .t-message-single .l-message,
     .t-message-single.l-message {
-        @include flex-direction(column);
+        flex-direction: column;
         &:before {
             margin-right: 0;
             margin-bottom: $interiorMarginLg;

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

@@ -11,10 +11,11 @@
 	}
 	min-width: 150px;
 	.l-image-main {
+		background-color: $colorPlotBg;
         margin-bottom: $interiorMargin;
 	}
 	.l-image-main-controlbar {
-        &.l-flex-row { @include align-items(center); }
+        &.l-flex-row { align-items: center; }
 	}
 }
 
@@ -75,7 +76,6 @@
 }
 
 .s-image-main {
-    background-color: $colorPlotBg;
 	border: 1px solid transparent;
 	&.paused {
 		@extend .s-unsynced;

platform/commonUI/general/res/sass/forms/_channel-selector.scss

@@ -34,13 +34,10 @@
 	}
 	
 	.btns-add-remove {
-//		background: rgba(#ff0000, 0.3);;
 		margin-top: 150px;
 		.s-button {
 			display: block;
-			//font-size: 1.5em;
 			margin-bottom: $interiorMargin;
-			//padding: 10px;
 			text-align: center;
 		}
 	}

platform/commonUI/general/res/sass/forms/_elems.scss

@@ -45,7 +45,7 @@
         &.grows {
             .l-section-body,
             .form-row {
-                @include flex(1 1 auto);
+                flex: 1 1 auto;
                 .wrapper {
                     height: 100%;
                 }
@@ -87,7 +87,7 @@
 		.controls {
             order: 2;
             position: relative;
-            @include flex(1 1 auto);
+            flex: 1 1 auto;
 
 			.l-composite-control {
 				&.l-checkbox {
@@ -124,16 +124,16 @@
     >.label,
     >.controls {
         line-height: inherit;
-        min-height: inherit;;
+        min-height: inherit;
     }
     >.label {
-        @include flex(1 1 auto);
+        flex: 1 1 auto;
         min-width: 0;
         width: auto;
         order: 2;
     }
     >.controls {
-        @include flex(0 0 auto);
+        flex: 0 0 auto;
         margin-right: $interiorMargin;
         order: 1;
     }
@@ -141,7 +141,7 @@
 
 .l-controls-under.l-flex-row {
     // Change to use column layout
-    @include flex-direction(column);
+    flex-direction: column;
     .flex-elem {
         margin-bottom: $interiorMarginLg;
     }
@@ -190,19 +190,19 @@
     ul {
         margin-bottom: $interiorMarginLg;
         li {
-            @include display(flex);
-            @include flex-wrap(wrap);
-            @include align-items(center);
+            display: flex;
+            flex-wrap: wrap;
+            align-items: center;
             label,
             .control {
-                @include display(flex);
+                display: flex;
             }
             label {
                 line-height: inherit;
                 width: $labelW;
             }
             .controls {
-                @include flex-grow(1);
+                flex-grow: 1;
                 margin-left: $interiorMargin;
                 input[type="text"],
                 input[type="search"],
@@ -232,14 +232,14 @@
 
             &.controls-first {
                 .control {
-                    @include flex-grow(0);
+                    flex-grow: 0;
                     margin-right: $interiorMargin;
                     min-width: 0;
                     order: 1;
                     width: auto;
                 }
                 label {
-                    @include flex-grow(1);
+                    flex-grow: 1;
                     order: 2;
                     width: auto;
                 }

platform/commonUI/general/res/sass/forms/_filter.scss

@@ -101,7 +101,7 @@
         line-height: inherit;
         position: absolute;
         top: 50%;
-        @include transform(translateY(-50%));
+        transform: translateY(-50%);
         z-index: 1;
     }
 

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

@@ -20,7 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 @mixin  spinner($b: 5px, $c: $colorKey) {
-    @include transform-origin(center);
+    transform-origin: center;
     @include animation-name(rotation-centered);
     @include animation-duration(0.5s);
     @include animation-iteration-count(infinite);

platform/commonUI/general/res/sass/items/_item.scss

@@ -85,14 +85,14 @@
 	            z-index: 1;
                 .item-type,
                 .t-item-icon {
-                    @include transform(translateX(-50%) translateY(-55%));
+                    transform: translateX(-50%) translateY(-55%);
                     position: absolute;
                     top: 50%; left: 50%;
                     font-size: $iconD * 0.95;
                     &.l-icon-link {
                         .t-item-icon-glyph {
                             &:after {
-                                @include transform(scale(0.25));
+                                transform: scale(0.25);
                             }
                         }
                     }

platform/commonUI/general/res/sass/mobile/_layout.scss

@@ -131,18 +131,16 @@ body.mobile {
     }
 }
 
-@include phonePortrait() {
-    body.phone {
-        .pane-tree-showing {
-            .pane.left.treeview {
-                width: $proporMenuOnly !important;
-            }
-            .pane.right.items {
-                left: 0 !important;
-                @include transform(translateX($proporMenuOnly));
-                .holder-object-and-inspector {
-                    opacity: 0;
-                }
+body.phone.portrait {
+    .pane-tree-showing {
+        .pane.left.treeview {
+            width: $proporMenuOnly !important;
+        }
+        .pane.right.items {
+            left: 0 !important;
+            transform: translateX($proporMenuOnly);
+            .holder-object-and-inspector {
+                opacity: 0;
             }
         }
     }

platform/commonUI/general/res/sass/mobile/_tree.scss

@@ -34,7 +34,18 @@ body.touch {
 		line-height: $mobileTreeItemH !important;
 		.view-control {
             font-size: 1em;
-            width: ceil($mobileTreeItemH * 0.5);
+            margin-right: $interiorMargin;
+            width: ceil($mobileTreeItemH * 0.75);
+            &.has-children {
+                &:before {
+                    content: $glyph-icon-arrow-down;
+                    left: 50%;
+                    transform: translateX(-50%) rotate(-90deg);
+                }
+                &.expanded:before {
+                    transform: translateX(-50%) rotate(0deg);
+                }
+            }
 		}
 		.t-object-label {
 			line-height: inherit;

platform/commonUI/general/res/sass/overlay/_overlay.scss

@@ -89,7 +89,7 @@
         > .abs.outer-holder {
             @include desktopandtablet {
                 $max: 1280px;
-                @include transform(translateX(-50%) translateY(-50%));
+                transform: translate(-50%, -50%);
                 border-radius: $overlayCr;
                 top: 50%; right: auto; bottom: auto; left: 50%;
                 width: 70%; height: 70%;
@@ -101,7 +101,7 @@
 
                 .editor .form .form-row.l-flex-row  {
                     // Display elements in a columnar view
-                    @include flex-direction(column);
+                    flex-direction: column;
                     > .flex-elem {
                         &:not(:first-child) {
                             margin-top: $interiorMargin;

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

@@ -152,8 +152,8 @@
 		&.l-plot-y-label {
 			$x: -50%;
 			$r: -90deg;
-			@include transform-origin(50% 0);
-			@include transform(translateX($x) rotate($r));
+			transform-origin: 50% 0;
+			transform: translateX($x) rotate($r);
 			display: inline-block;
 			margin-left: $interiorMargin; // Kick off the left edge
 			left: 0;
@@ -172,13 +172,13 @@
 	}
 
     .gl-plot-x-options {
-        @include transform(translateX(-50%));
+        transform: translateX(-50%);
         bottom: 0;
         left: 50%;
     }
 
     .gl-plot-y-options {
-        @include transform(translateY(-50%));
+        transform: translateY(-50%);
         min-width: 150px; // Need this due to enclosure of .select
         top: 50%;
         left: $plotYLabelW + $interiorMargin * 2;

platform/commonUI/general/res/sass/search/_search.scss

@@ -34,7 +34,7 @@
 		$iconEdgeM: 4px;
 		$iconD: $treeSearchInputBarH - ($iconEdgeM*2);
         @extend .icon-magnify;
-		font-size: 0.8rem;
+		font-size: 0.8em;
 		position: relative;
 
 		.search-input {
@@ -60,7 +60,7 @@
 			position: relative;
 			width: 100%;
 			padding-left: $iconD + $interiorMargin !important;
-			padding-right: $iconD + $interiorMargin !important;
+			padding-right: ($iconD * 2) + ($interiorMargin * 2) !important;
 
 			// Make work for mct-control textfield
 			input {
@@ -82,7 +82,8 @@
 		}
 
 		.clear-input {
-			right: $interiorMargin;
+            // Hiding for now with addition of Cancel button
+			right: $iconD + $interiorMargin;
 
 			// Icon is visible only when there is text input
             visibility: hidden;
@@ -97,25 +98,16 @@
 			}
 		}
 
-        &.search-filter-by-type {
-            .search-input {
-                padding-right: ($iconD * 2) + ($interiorMargin * 2) !important; // Allow room for menu-icon
-            }
-            .menu-icon {
-                // 'v' invoke menu icon for filtering by type
-                font-size: 0.8em;
-                padding-right: $iconEdgeM;
-                right: $iconEdgeM;
-                text-align: right;
-                &:hover {
-                    color: pullForward($colorInputIcon, 10%);
-                }
-            }
-            .clear-input {
-                right: $iconD + $interiorMargin;
-            }
-
-        }
+		.menu-icon {
+            // 'v' invoke menu icon
+			font-size: 0.8em;
+			padding-right: $iconEdgeM;
+			right: $iconEdgeM;
+			text-align: right;
+			&:hover {
+				color: pullForward($colorInputIcon, 10%);
+			}
+		}
 
 		.search-menu-holder {
 			float: right;
@@ -160,7 +152,7 @@
             opacity: 1;
         }
 		.load-more-button {
-            @include transform(translateX(-50%));
+            transform: translateX(-50%);
             display: inline-block;
 			margin-top: $interiorMargin;
             padding: 0 $interiorMarginLg;

platform/commonUI/general/res/sass/startup-base.scss

@@ -32,11 +32,7 @@ body, html {
 }
 
 .l-splash-holder {
-    // Main outer holder.
-    @include transition-property(opacity);
-    @include transition-duration(500ms);
-    @include transition-timing-function(ease-in-out);
-    @include transition-delay(1s);
+    // Main outer holder for splash.
     position: absolute;
     top: 0;
     right: 0;
@@ -44,16 +40,18 @@ body, html {
     left: 0;
     z-index: 10000;
     opacity: 1;
-    &.fadeout {
-        opacity: 0;
-        pointer-events: none;
-    }
     .l-splash {
         // The splash element.
         @include splashElem();
     }
 }
 
+.user-environ .holder-all {
+    // Gets shown again by main CSS, once loaded
+    opacity: 0;
+    pointer-events: none;
+}
+
 @media only screen and (max-device-width: 767px) {
     .l-splash-holder .l-splash {
         @include splashElem(0);

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

@@ -142,7 +142,7 @@
         .l-hyperlink.s-button {
             .label {
                 @include ellipsize();
-                @include transform(translateY(-50%));
+                transform: translateY(-50%);
                 padding: 0 $interiorMargin;
                 position: absolute;
                 min-width: 0;

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

@@ -159,20 +159,20 @@ body.desktop .pane .mini-tab-icon.toggle-pane {
 
     &.toggle-tree.anchor-left {
         left: 0;
-        @include transform(translateX(-1 * $paneExpandedOffset));
+        transform: translateX(-1 * $paneExpandedOffset);
         &.collapsed {
-            @include transform(translateX(-1 * $ueCollapsedPaneEdgeM));
+            transform: translateX(-1 * $ueCollapsedPaneEdgeM);
         }
     }
 
     &.toggle-inspect.anchor-right {
         right: 0;
-        @include transform(translateX($paneExpandedOffset));
+        transform: translateX($paneExpandedOffset);
         &.flush-right {
-            @include transform(translateX(($uePaneMiniTabW + ceil($splitterD / 2))));
+            transform: translateX(($uePaneMiniTabW + ceil($splitterD / 2)));
         }
         &.collapsed {
-            @include transform(translateX($ueCollapsedPaneEdgeM));
+            transform: translateX($ueCollapsedPaneEdgeM);
         }
     }
 }

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

@@ -40,10 +40,18 @@ define([
         return type.getCssClass();
     }
 
+    function removePreviousIconClass(el) {
+        $(el).removeClass(function (index, className) {
+            return (className.match (/\bicon-\S+/g) || []).join(' ');
+        });
+    }
+
     TreeLabelView.prototype.updateView = function (domainObject) {
         var titleEl = this.el.find('.t-title-label'),
             iconEl = this.el.find('.t-item-icon');
 
+        removePreviousIconClass(iconEl);
+
         titleEl.text(domainObject ? domainObject.getModel().name : "");
         iconEl.addClass(domainObject ? getClass(domainObject) : "");
 

platform/features/conductor/core/res/sass/_time-conductor-base.scss

@@ -55,7 +55,7 @@
     div[class*="hand"] {
         $handW: 2px;
         $handH: $d * 0.4;
-        @include transform(translate(-50%, -50%));
+        transform: translate(-50%, -50%);
         @include animation-iteration-count(infinite);
         @include animation-timing-function(linear);
         position: absolute;
@@ -258,7 +258,7 @@
         align-items: center;
         margin-top: $interiorMargin;
         .l-time-conductor-zoom-w {
-            @include justify-content(flex-end);
+            justify-content: flex-end;
             .time-conductor-zoom {
                 height: $r3H;
                 min-width: 100px;
@@ -327,7 +327,7 @@
         $i: $glyph-icon-calendar;
         .time-conductor-icon div[class*="hand"] {
             &.hand-little {
-                @include transform(rotate(120deg));
+                transform: rotate(120deg);
             }
         }
         .mode-selector .s-menu-button:before {

platform/features/conductor/core/res/sass/_time-of-interest.scss

@@ -29,7 +29,7 @@ mct-include.l-toi-holder,
 
 mct-include.l-toi-holder {
     $blockerFadeW: $toiBlockerFadeW;
-    @include transform(translateX(-50%));
+    transform: translateX(-50%);
     color: $toiColorBg;
     position: absolute;
     top: 0;
@@ -66,7 +66,7 @@ mct-include.l-toi-holder {
         box-sizing: content-box;
         height: $toiH;
         left: $toiPad * -2;
-        @include transform(translateY(-50%)); top: 50%;
+        transform: translateY(-50%); top: 50%;
         padding: $toiPad;
         z-index: 1;
 
@@ -207,7 +207,7 @@ table {
                             border-radius: 20%;
                             height: auto;
                             padding: $toiPad;
-                            @include transform(translate(-50%, -50%));
+                            transform: translate(-50%, -50%);
                             left: 50%; right: auto; top: 0;
                             .l-toi-buttons {
                                 padding: 1px;
@@ -233,7 +233,7 @@ table {
             z-index: 3;
 
             .l-toi {
-                @include transform(translateY(100%));
+                transform: translateY(100%);
 
             }
 
@@ -257,13 +257,13 @@ table {
         }
 
         &:before {
-            @include transform(translate(-50%, $linesVOffset * -1));
+            transform: translate(-50%, $linesVOffset * -1);
             top: 0px;
             bottom: auto;
         }
 
         &:after {
-            @include transform(translate(-50%, $linesVOffset));
+            transform: translate(-50%, $linesVOffset);
             top: auto;
             bottom: 0px;
         }

platform/features/imagery/src/controllers/ImageryController.js

@@ -92,7 +92,7 @@ define(
                             this.updateHistory(datum);
                             this.updateValues(datum);
                         }.bind(this));
-                    this.requestLad(false);
+
                     this.requestHistory(this.openmct.time.bounds());
                 }.bind(this));
         };
@@ -107,34 +107,13 @@ define(
                         if (this.requestCount > requestId) {
                             return Promise.resolve('Stale request');
                         }
+
                         values.forEach(function (datum) {
                             this.updateHistory(datum);
                         }, this);
-                        this.requestLad(true);
-                    }.bind(this));
-        };
 
-        /**
-         * Makes a request for the most recent datum in the
-         * telelmetry store. Optional addToHistory argument
-         * determines whether the requested telemetry should
-         * be added to history or only used to update the current
-         * image url and timestamp.
-         * @private
-         * @param {boolean} [addToHistory] if true, adds to history
-         */
-        ImageryController.prototype.requestLad = function (addToHistory) {
-            this.openmct.telemetry
-                .request(this.domainObject, {
-                    strategy: 'latest',
-                    size: 1
-                })
-                .then(function (values) {
-                    this.updateValues(values[0]);
-                    if (addToHistory !== false) {
-                        this.updateHistory(values[0]);
-                    }
-                }.bind(this));
+                        this.updateValues(values[values.length - 1]);
+                    }.bind(this));
         };
 
         ImageryController.prototype.stopListening = function () {

platform/features/imagery/test/controllers/ImageryControllerSpec.js

@@ -59,7 +59,8 @@ define(
                         'timeSystem',
                         'clock',
                         'on',
-                        'off'
+                        'off',
+                        'bounds'
                     ]),
                     telemetry: jasmine.createSpyObj('telemetryAPI', [
                         'subscribe',
@@ -118,7 +119,8 @@ define(
 
             describe("when loaded", function () {
                 var callback,
-                    boundsListener;
+                    boundsListener,
+                    bounds;
 
                 beforeEach(function () {
                     waitsFor(function () {
@@ -137,13 +139,9 @@ define(
                     });
                 });
 
-                it("uses LAD telemetry", function () {
+                it("requests history", function () {
                     expect(openmct.telemetry.request).toHaveBeenCalledWith(
-                        newDomainObject,
-                        {
-                            strategy: 'latest',
-                            size: 1
-                        }
+                        newDomainObject, bounds
                     );
                     expect(controller.getTime()).toEqual(prefix + 1434600258123);
                     expect(controller.getImageUrl()).toEqual('some/url');
@@ -204,7 +202,7 @@ define(
                 it("requests telemetry", function () {
                     expect(openmct.telemetry.request).toHaveBeenCalledWith(
                         newDomainObject,
-                        jasmine.any(Object)
+                        bounds
                     );
                 });
 

platform/features/layout/src/FixedController.js

@@ -315,6 +315,8 @@ define(
             this.openmct.time.on("bounds", updateDisplayBounds);
             this.openmct.selection.on('change', setSelection);
             this.$element.on('click', this.bypassSelection.bind(this));
+
+            setSelection(this.openmct.selection.get());
         }
 
         /**
@@ -464,7 +466,7 @@ define(
 
             function filterForTelemetryObjects(objects) {
                 return objects.filter(function (object) {
-                    return self.openmct.telemetry.canProvideTelemetry(object);
+                    return self.openmct.telemetry.isTelemetryObject(object);
                 });
             }
 

platform/features/layout/src/MCTTriggerModal.js

@@ -38,10 +38,6 @@ define([
 '       </div>' +
 '    </div>';
 
-    var NEW_NOTEBOOK_BUTTON_TEMPLATE = '<a class="s-button labeled icon-notebook new-notebook-entry" title="New Notebook Entry">' +
-    '<span class="title-label">New Notebook Entry</span>' +
-    '</a>';
-
     /**
      * MCT Trigger Modal is intended for use in only one location: inside the
      * object-header to allow views in a layout to be popped out in a modal.
@@ -78,28 +74,9 @@ define([
                 closeButton,
                 doneButton,
                 blocker,
-                overlayContainer,
-                notebookButtonEl,
-                notebookButton,
-                actions = $scope.domainObject.getCapability('action'),
-                notebookAction = actions.getActions({'key': 'notebook-new-entry'});
-
-            if (notebookAction) {
-                if (notebookAction.length > 0) {
-                    notebookButtonEl = document.createElement('div');
-                    $(notebookButtonEl).addClass('notebook-button-container');
-                    notebookButtonEl.innerHTML = NEW_NOTEBOOK_BUTTON_TEMPLATE;
-                    notebookButton = frame.querySelector('.object-browse-bar .right');
-                    notebookButton.prepend(notebookButtonEl);
-                    // $(frame.querySelector('.object-holder')).addClass('container-notebook');
-                    notebookButton.addEventListener('click', function () {
-                        notebookAction[0].perform();
-                    });
-                }
-            }
+                overlayContainer;
 
             function openOverlay() {
-
                 // Remove frame classes from being applied in a non-frame context
                 $(frame).removeClass('frame frame-template');
                 overlay = document.createElement('div');
@@ -132,11 +109,7 @@ define([
                 overlay = undefined;
             }
 
-            toggleOverlay = function (event) {
-                if (event) {
-                    event.stopPropagation();
-                }
-
+            toggleOverlay = function () {
                 if (!isOpen) {
                     openOverlay();
                     isOpen = true;

platform/features/layout/test/FixedControllerSpec.js

@@ -150,13 +150,13 @@ define(
                     [
                         'subscribe',
                         'request',
-                        'canProvideTelemetry',
+                        'isTelemetryObject',
                         'getMetadata',
                         'limitEvaluator',
                         'getValueFormatter'
                     ]
                 );
-                mockTelemetryAPI.canProvideTelemetry.andReturn(true);
+                mockTelemetryAPI.isTelemetryObject.andReturn(true);
                 mockTelemetryAPI.request.andReturn(Promise.resolve([]));
 
                 testGrid = [123, 456];
@@ -201,7 +201,7 @@ define(
                     'off',
                     'get'
                 ]);
-                mockSelection.get.andCallThrough();
+                mockSelection.get.andReturn([]);
 
                 mockOpenMCT = {
                     time: mockConductor,
@@ -596,7 +596,7 @@ define(
                 expect(controller.getSelectedElementStyle()).not.toEqual(oldStyle);
             });
 
-            it("cleans up slection on scope destroy", function () {
+            it("cleans up selection on scope destroy", function () {
                 expect(mockScope.$on).toHaveBeenCalledWith(
                     '$destroy',
                     jasmine.any(Function)

platform/features/layout/test/MCTTriggerModalSpec.js

@@ -52,12 +52,6 @@ define([
 
         beforeEach(function () {
             $scope = jasmine.createSpyObj('$scope', ['$on']);
-            $scope.domainObject = { getCapability: function () {
-                return { getActions: function () {
-
-                }};
-            }};
-
             $element = jasmine.createSpyObj('$element', [
                 'parent',
                 'remove',

platform/features/notebook/bundle.js

@@ -1,314 +0,0 @@
-define([
-    "legacyRegistry",
-    "./src/controllers/NotebookController",
-    "./src/controllers/NewEntryController",
-    "./src/controllers/SelectSnapshotController",
-    "./src/controllers/LayoutNotebookController",
-    "./src/directives/MCTSnapshot",
-    "../layout/src/MCTTriggerModal",
-    "./src/directives/EntryDnd",
-    "./src/actions/ViewSnapshot",
-    "./src/actions/AnnotateSnapshot",
-    "./src/actions/RemoveEmbed",
-    "./src/actions/CreateSnapshot",
-    "./src/actions/RemoveSnapshot",
-    "./src/actions/NewEntryContextual",
-    "./src/capabilities/NotebookCapability",
-    "./src/policies/CompositionPolicy",
-    "./src/policies/ViewPolicy",
-    "text!./res/templates/layoutNotebook.html",
-    "text!./res/templates/notebook.html",
-    "text!./res/templates/entry.html",
-    "text!./res/templates/annotation.html",
-    "text!./res/templates/notifications.html",
-    "text!../layout/res/templates/frame.html",
-    "text!./res/templates/controls/embedControl.html",
-    "text!./res/templates/controls/snapSelect.html"
-], function (
-    legacyRegistry,
-    NotebookController,
-    NewEntryController,
-    SelectSnapshotController,
-    LayoutNotebookController,
-    MCTSnapshot,
-    MCTModalNotebook,
-    MCTEntryDnd,
-    ViewSnapshotAction,
-    AnnotateSnapshotAction,
-    RemoveEmbedAction,
-    CreateSnapshotAction,
-    RemoveSnapshotAction,
-    newEntryAction,
-    NotebookCapability,
-    CompositionPolicy,
-    ViewPolicy,
-    layoutNotebookTemplate,
-    notebookTemplate,
-    entryTemplate,
-    annotationTemplate,
-    notificationsTemplate,
-    frameTemplate,
-    embedControlTemplate,
-    snapSelectTemplate
-) {
-    legacyRegistry.register("platform/features/notebook", {
-        "name": "Notebook Plugin",
-        "description": "Create and save timestamped notes with embedded object snapshots.",
-        "extensions":
-        {
-            "types": [
-            {
-                "key": "notebook",
-                "name": "Notebook",
-                "cssClass": "icon-notebook",
-                "description": "Create and save timestamped notes with embedded object snapshots.",
-                "features": ["creation"],
-                "model": {
-                      "entries": [],
-                      "composition": [],
-                      "entryTypes": []
-                  }
-            }
-          ],
-            "views": [
-            {
-                "key": "notebook.view",
-                "type": "notebook",
-                "cssClass": "icon-notebook",
-                "name": "notebook",
-                "template": notebookTemplate,
-                "editable": false,
-                "uses": [
-                      "composition",
-                      "action"
-                  ],
-                "gestures": [
-                    "drop"
-                ]
-            }
-          ],
-            "controllers": [
-             {
-                 "key": "NotebookController",
-                 "implementation": NotebookController,
-                 "depends": ["$scope",
-                             "dialogService",
-                             "popupService",
-                             "agentService",
-                             "objectService",
-                             "navigationService",
-                             "now",
-                             "actionService",
-                             "$timeout",
-                             "$element",
-                             "$sce"
-                             ]
-             },
-             {
-                 "key": "NewEntryController",
-                 "implementation": NewEntryController,
-                 "depends": ["$scope",
-                              "$rootScope"
-                             ]
-             },
-             {
-                 "key": "selectSnapshotController",
-                 "implementation": SelectSnapshotController,
-                 "depends": ["$scope",
-                              "$rootScope"
-                             ]
-             },
-             {
-                 "key": "LayoutNotebookController",
-                 "implementation": LayoutNotebookController,
-                 "depends": ["$scope"]
-             }
-           ],
-            "representations": [
-                {
-                    "key": "draggedEntry",
-                    "template": entryTemplate
-                },
-                {
-                    "key": "frameLayoutNotebook",
-                    "template": frameTemplate
-                }
-            ],
-            "templates": [
-                {
-                    "key": "annotate-snapshot",
-                    "template": annotationTemplate
-                },
-                {
-                    "key": "notificationTemplate",
-                    "template": notificationsTemplate
-                }
-            ],
-            "directives": [
-                {
-                    "key": "mctSnapshot",
-                    "implementation": MCTSnapshot,
-                    "depends": [
-                        "$rootScope",
-                        "$document",
-                        "exportImageService",
-                        "dialogService",
-                        "notificationService"
-                    ]
-                },
-                {
-                    "key": "mctEntryDnd",
-                    "implementation": MCTEntryDnd,
-                    "depends": [
-                        "$rootScope",
-                        "$compile",
-                        "dndService",
-                        "typeService",
-                        "notificationService"
-                    ]
-                },
-                 {
-                    "key": "mctModalNotebook",
-                    "implementation": MCTModalNotebook,
-                    "depends": [
-                        "$document"
-                    ]
-                }
-            ],
-            "actions": [
-                {
-                    "key": "view-snapshot",
-                    "implementation": ViewSnapshotAction,
-                    "name": "View Snapshot",
-                    "description": "View the large image in a modal",
-                    "category": "embed",
-                    "depends": [
-                      "$compile"
-                    ]
-                },
-                {
-                    "key": "annotate-snapshot",
-                    "implementation": AnnotateSnapshotAction,
-                    "name": "Annotate Snapshot",
-                    "cssClass": "icon-pencil labeled",
-                    "description": "Annotate embed's snapshot",
-                    "category": "embed",
-                    "depends": [
-                      "dialogService",
-                      "dndService",
-                      "$rootScope"
-                    ]
-                },
-
-                {
-                    "key": "remove-embed",
-                    "implementation": RemoveEmbedAction,
-                    "name": "Remove...",
-                    "cssClass": "icon-trash labeled",
-                    "description": "Remove this embed",
-                    "category": [
-                        "embed",
-                        "embed-no-snap"
-                    ],
-                    "depends": [
-                      "dialogService"
-                    ]
-                },
-                {
-                    "key": "remove-snapshot",
-                    "implementation": RemoveSnapshotAction,
-                    "name": "Remove Snapshot",
-                    "cssClass": "icon-trash labeled",
-                    "description": "Remove Snapshot of the embed",
-                    "category": "embed",
-                    "depends": [
-                      "dialogService"
-                    ]
-                },
-                {
-                    "key": "create-snapshot",
-                    "implementation": CreateSnapshotAction,
-                    "name": "Create Snapshot",
-                    "description": "Create a snapshot for the embed",
-                    "category": "embed-no-snap",
-                    "priority": "preferred",
-                    "depends": [
-                      "$compile"
-                    ]
-                },
-                {
-                    "key": "notebook-new-entry",
-                    "implementation": newEntryAction,
-                    "name": "New Notebook Entry",
-                    "cssClass": "icon-notebook labeled",
-                    "description": "Add a new entry",
-                    "category": [
-                        "contextual",
-                         "view-control"
-                    ],
-                    "depends": [
-                      "$compile",
-                      "$rootScope",
-                      "dialogService",
-                      "notificationService",
-                      "linkService"
-                    ],
-                    "priority": "preferred"
-                }
-            ],
-            "licenses": [
-                {
-                    "name": "painterro",
-                    "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"
-                }
-            ],
-            "capabilities": [
-                {
-                    "key": "notebook",
-                    "name": "Notebook Capability",
-                    "description": "Provides a capability for looking for a notebook domain object",
-                    "implementation": NotebookCapability,
-                    "depends": [
-                        "typeService"
-                    ]
-                }
-            ],
-            "policies": [
-                {
-                    "category": "composition",
-                    "implementation": CompositionPolicy,
-                    "message": "Objects of this type cannot contain objects of that type."
-                }
-            ],
-            "controls": [
-              {
-                  "key": "embed-control",
-                  "template": embedControlTemplate
-              },
-               {
-                  "key": "snapshot-select",
-                  "template":  snapSelectTemplate
-              }
-            ],
-            "stylesheets": [
-                {
-                    "stylesheetUrl": "css/notebook.css"
-                },
-                {
-                    "stylesheetUrl": "css/notebook-espresso.css",
-                    "theme": "espresso"
-                },
-                {
-                    "stylesheetUrl": "css/notebook-snow.css",
-                    "theme": "snow"
-                }
-          ]
-        }
-    });
-});

platform/features/notebook/res/sass/_notebook-base.scss

@@ -1,271 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-.w-notebook {
-    font-size: 0.8rem;
-    overflow: hidden;
-    position: absolute;
-    top: 0px;
-    right: 0px;
-    bottom: 0px;
-    left: 0px;
-    width: auto;
-    height: auto;
-}
-
-.l-notebook-drag-area {
-    padding: 10px;
-    font-style: italic;
-    cursor: pointer;
-    &:before { margin-right: 7px !important; }
-    .label {
-        @include ellipsize();
-    }
-}
-
-.frame {
-   .icon-notebook {
-        margin-right: 5px;
-    } 
-}
-
-.overlay.l-dialog .title{
-    white-space: normal;
-}
-
-.w-notebook-entries {
-    //@include test($a: 0.1);
-    padding-right: $interiorMarginSm;
-    position: relative;
-    overflow-x: hidden;
-    overflow-y: scroll;
-    .t-entries-list {
-    }
-}
-
-.l-notebook-entry {
-    $p: $interiorMarginSm;
-    box-sizing: border-box;
-    margin-bottom: $p;
-    padding: $p $interiorMargin;
-
-    .s-notebook-entry-time,
-    .s-notebook-entry-text,
-    .notebook-entry-delete {
-        padding-top: $p;
-        padding-bottom: $p;
-    }
-
-    .s-notebook-entry-time {
-        border: 1px solid transparent; // Needed to maintain vertical alignment with s-notebook-entry-text
-    }
-
-    .l-notebook-entry-content{
-        .s-notebook-entry-text {
-            // Contenteditable div that holds text
-            min-height: 24px; // Needed in Firefox when field is blank
-        }
-        .entry-embeds{
-            flex-wrap: wrap;
-        }
-        .snap-thumb {
-            cursor: pointer;
-        }
-    }
-}
-
-.l-entry-embed {
-    $m: $interiorMarginSm;
-    position: relative;
-    margin: $m $m 0 0;
-    padding: $interiorMarginSm;
-
-    &.has-snapshot {
-        &:before {
-            position: absolute;
-            text-shadow: rgba(black, 0.7) 0 1px 5px;
-            z-index: 2;
-        }
-    }
-    .snap-thumb {
-        $d: 50px;
-        width: $d;
-        height: $d;
-        border-radius: 5px;
-        overflow: hidden;
-        img {
-            height: 100%;
-            width: 100%;
-        }
-    }
-
-    .embed-info {
-        margin-left: $interiorMargin;
-        .embed-title {
-            font-weight: bold;
-        }
-    }
-}
-
-.t-contents,
-.snap-annotation {
-    // Todo: don't write this to t-contents, add a l- class
-    overflow: hidden;
-}
-
-.notebook-filters {
-    .select {
-        margin-left: $interiorMargin;
-    }
-}
-
-/********************************************* MOBILE */
-@include phonePortrait() {
-    body.phone {
-        .w-notebook-entry-time-and-content {
-            flex-direction: column !important;
-        }
-        .s-notebook-entry-time,
-        .notebook-entry-delete {
-            padding-top: 0;
-            padding-bottom: 0;
-        }
-    }
-}
-
-/********************************************* PAINTERRO OVERRIDES */
-.annotation-dialog .abs.editor {
-    border-radius: 0;
-}
-
-#snap-annotation {
-    display: flex;
-    flex-direction: column;
-    position: absolute;
-    top: 0; right: 0; bottom: 0; left: 0;
-}
-
-#snap-annotation-wrapper,
-#snap-annotation-bar {
-    position: relative;
-    top: auto; right: auto; bottom: auto; left: auto;
-}
-
-#snap-annotation-wrapper {
-    order: 2;
-    flex: 10 0 auto;
-}
-
-#snap-annotation-bar {
-    order: 1;
-    flex: 0 0 auto;
-    height: auto;
-    background-color: transparent !important;
-    margin-bottom: $interiorMargin;
-
-    > div,
-    > div > span,
-    .ptro-icon-btn,
-    .ptro-named-btn,
-    .ptro-color-btn,
-    .ptro-bordered-btn,
-    .ptro-tool-ctl-name,
-    .ptro-color-btn,
-    .tool-controls,
-    .ptro-input {
-        // Lot of resets for crappy CSS in Painterro
-        &:first-child { margin-left: 0 !important; }
-        $h: $btnToolbarH;
-        display: inline-block;
-        font-family: inherit;
-        font-size: auto;
-        height: $h !important;
-        margin: 0 0 0 5px;
-        position: relative;
-        width: auto !important;
-        line-height: $h !important;
-        top: auto; right: auto; bottom: auto; left: auto;
-        vertical-align: top;
-    }
-
-    .ptro-tool-ctl-name {
-        border-radius: 0;
-        background: none;
-        top: auto;
-        font-family: inherit;
-        padding: 0;
-    }
-
-
-    .ptro-color-btn { width: $btnToolbarH !important; }
-
-    .ptro-icon-btn,
-    .ptro-named-btn {
-        // .s-button class is added via JS in AnnotateSnapshot.js
-        i {
-            font-size: 1.25em !important;
-        }
-    }
-
-    .tool-controls .ptro-btn-color-checkers-bar,
-    .ptro-info {
-        display: none;
-    }
-}
-
-/********************************************* New Notebook Entry from Large View overlay */
-.notebook-button-container {
-    //margin-right: $interiorMargin; // TODO: change to apply margin-left to view switcher button in Large View
-}
-
-/********************************************* NO IDEA WHAT THERE ARE APPLYING TO */
-.context-available {
-    outline: none;
-}
-
-.menu-element.menu-view{
-    z-index: 999;
-}
-
-.overlay.l-dialog .abs.editor{
-    padding-right: 0;
-}
-
-/*
-.overlay.l-dialog .outer-holder.annotation-dialog{
-    width: 90%;
-    height: 90%;
-}
-*/
-
-/*
-.snap-annotation-wrapper{
-    padding-top: 40px;
-}
-
-
-.t-console {
-    // Temp console-like reporting element
-    max-height: 200px;
-    box-sizing: border-box;
-    padding: 5px;
-}
-*/

platform/features/notebook/res/sass/_notebook-thematic.scss

@@ -1,76 +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.
- *****************************************************************************/
-
-.l-notebook-drag-area {
-    border: 1px dashed rgba($colorKey, 0.7);
-    border-radius: $controlCr;
-    color: rgba($colorBodyFg, 0.7);
-    &:hover {
-        background: rgba($colorKey, 0.2);
-        color: $colorBodyFg;
-    }
-    &.drag-active{
-        border-color: $colorKey;
-    }
-}
-
-.s-notebook-entry {
-    background-color: rgba($colorBodyFg, 0.1);
-    border-radius: $basicCr;
-
-    &:hover {
-        background-color: rgba($colorBodyFg, 0.2);
-    }
-
-    .s-notebook-entry-time {
-        color: rgba($colorBodyFg, 0.5);
-    }
-}
-
-.l-entry-embed {
-    border-radius: $controlCr;
-    background-color: rgba($colorBodyFg, 0.1);
-    &.has-snapshot {
-        &:before {
-            color: $colorBodyFg;
-        }
-    }
-}
-
-.overlay.snapshot {
-    // Applied in overlay when taking a snapshot
-    background: $colorBodyBg;
-}
-
-.s-snapshot-datetime {
-    color: rgba($colorBodyFg, 0.4);
-    font-size: 0.8em;
-}
-
-.snap-thumb {
-    border: 1px solid $colorInteriorBorder;
-}
-
-/********************************************* PAINTERRO OVERRIDES */
-.ptro-wrapper {
-    background: rgba($colorBodyBg, 0.3) !important;
-}

platform/features/notebook/res/sass/notebook-espresso.scss

@@ -1,30 +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.
- *****************************************************************************/
-$output-bourbon-deprecation-warnings: false;
-@import "bourbon";
-
-@import "../../../../commonUI/general/res/sass/constants";
-@import "../../../../commonUI/general/res/sass/mixins";
-@import "../../../../commonUI/general/res/sass/glyphs";
-@import "../../../../commonUI/themes/espresso/res/sass/constants";
-@import "../../../../commonUI/themes/espresso/res/sass/mixins";
-@import "notebook-thematic";

platform/features/notebook/res/sass/notebook-snow.scss

@@ -1,30 +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.
- *****************************************************************************/
-$output-bourbon-deprecation-warnings: false;
-@import "bourbon";
-
-@import "../../../../commonUI/general/res/sass/constants";
-@import "../../../../commonUI/general/res/sass/mixins";
-@import "../../../../commonUI/general/res/sass/glyphs";
-@import "../../../../commonUI/themes/snow/res/sass/constants";
-@import "../../../../commonUI/themes/snow/res/sass/mixins";
-@import "notebook-thematic";

platform/features/notebook/res/sass/notebook.scss

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

platform/features/notebook/res/templates/annotation.html

@@ -1,2 +0,0 @@
-<div class="snap-annotation" id="snap-annotation" ng-init="ngModel.tracker()">
-</div>

platform/features/notebook/res/templates/controls/embedControl.html

@@ -1,51 +0,0 @@
-<!--
- Open MCT, Copyright (c) 2009-2016, United States Government
- as represented by the Administrator of the National Aeronautics and Space
- Administration. All rights reserved.
-
- Open MCT is licensed under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
- Open MCT includes source code licensed under additional open source
- licenses. See the Open Source Licenses file (LICENSES.md) included with
- this source code distribution or the Licensing information page available
- at runtime from the About dialog for additional information.
--->
-<!--
-This element appears in the overlay dialog when initiating a new Notebook Entry from a view's Notebook button -->
-<div class='form-control'>
-    <ng-form name="mctControl">
-        <div class='fields' ng-controller="NewEntryController">
-            <div class="l-flex-row new-notebook-entry-embed l-entry-embed {{cssClass}}"
-                 ng-class="{ 'has-snapshot' : snapToggle }">
-                <div class="holder flex-elem snap-thumb"
-                    ng-if="snapToggle">
-                    <img ng-src="{{snapshot.src}}" alt="{{snapshot.modified}}">
-                </div>
-
-                <div class="holder flex-elem embed-info">
-                    <div class="embed-title">{{objectName}}</div>
-                    <div class="embed-date"
-                         ng-if="snapToggle">{{snapshot.modified| date:'yyyy-MM-dd HH:mm:ss'}}</div>
-                </div>
-
-                <div class="holder flex-elem annotate-new"
-                     ng-if="snapToggle">
-                    <a class="s-button flex-elem icon-pencil "
-                       title="Annotate this snapshot"
-                       ng-click="annotateSnapshot()">
-                        <span class="title-label">Annotate</span>
-                    </a>
-                </div>
-            </div>
-        </div>
-    </ng-form>
-</div>

platform/features/notebook/res/templates/controls/snapSelect.html

@@ -1,30 +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.
--->
-<div class='form-control select' ng-controller="selectSnapshotController">
-    <select
-            ng-model="selectModel"
-            ng-options="opt.value as opt.name for opt in options"
-            ng-required="ngRequired"
-            name="mctControl">
-        <!-- <option value="" ng-show="!ngModel[field]">- Select One -</option> -->
-    </select>
-</div>

platform/features/notebook/res/templates/entry.html

@@ -1,38 +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.
--->
-<div class="frame snap-frame frame-template t-frame-inner abs t-object-type-{{ representation.selected.key }}">
-    <div class="abs object-browse-bar l-flex-row">
-        <div class="btn-bar right l-flex-row flex-elem flex-justify-end flex-fixed">
-            <mct-representation
-                    key="'switcher'"
-                    ng-model="representation"
-                    mct-object="domainObject">
-            </mct-representation>
-        </div>
-    </div>
-    <div class="abs object-holder" data-entry = "{{parameters.entry}}" data-embed = "{{parameters.embed}}" mct-snapshot ng-if="representation.selected.key">
-        <mct-representation
-                key="representation.selected.key"
-                mct-object="representation.selected.key && domainObject">
-        </mct-representation>
-    </div>
-</div>

platform/features/notebook/res/templates/frameLayoutNotebook.html

@@ -1,54 +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.
--->
-<div class="frame frame-template t-frame-inner abs t-object-type-{{ representation.selected.key }}">
-    <div class="abs object-browse-bar l-flex-row">
-        <div class="left flex-elem l-flex-row grows">
-            <mct-representation
-                    key="'object-header-frame'"
-                    mct-object="domainObject"
-                    class="l-flex-row flex-elem object-header grows">
-            </mct-representation>
-        </div>
-        <div class="btn-bar right l-flex-row flex-elem flex-justify-end flex-fixed">
-            <a class="s-button icon-notebook"
-               title="New Notebook Entry"
-               ng-if="parameters"
-               ng-click="ngModel()">
-            </a>
-            <mct-representation
-                    key="'switcher'"
-                    ng-model="representation"
-                    mct-object="domainObject">
-            </mct-representation>
-            <a class="s-button icon-expand t-btn-view-large"
-               title="View large"
-               mct-modal-notebook>
-            </a>
-        </div>
-    </div>
-    <div class="abs object-holder">
-        <mct-representation
-                key="representation.selected.key"
-                mct-object="representation.selected.key && domainObject">
-        </mct-representation>
-    </div>
-</div>

platform/features/notebook/res/templates/layoutNotebook.html

@@ -1,84 +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.
--->
-
-<div class="abs l-layout"
-     ng-controller="LayoutController as controller"
-     ng-click="controller.clearSelection()">
-
-    <!-- Background grid -->
-    <div class="l-grid-holder" ng-click="controller.clearSelection()">
-        <div class="l-grid l-grid-x"
-             ng-if="!controller.getGridSize()[0] < 3"
-             ng-style="{ 'background-size': controller.getGridSize() [0] + 'px 100%' }"></div>
-        <div class="l-grid l-grid-y"
-             ng-if="!controller.getGridSize()[1] < 3"
-             ng-style="{ 'background-size': '100% ' + controller.getGridSize() [1] + 'px' }"></div>
-    </div>
-
-    <div class='abs frame t-frame-outer child-frame panel s-selectable s-moveable s-hover-border'
-         ng-class="{ 'no-frame': !controller.hasFrame(childObject), 's-selected':controller.selected(childObject) }"
-         ng-repeat="childObject in composition"
-         ng-click="controller.select($event, childObject.getId())"
-         ng-style="controller.getFrameStyle(childObject.getId())">
-
-         <div ng-controller="LayoutNotebookController as controller">
-            <mct-representation key="'frameLayoutNotebook'"
-                            class="t-rep-frame holder contents abs"
-                            parameters = "hasNotebookAction"
-                            ng-model="newNotebook"
-                            mct-object="childObject">
-            </mct-representation>
-         </div>
-        
-        <!-- Drag handles -->
-        <span class="abs t-edit-handle-holder s-hover-border" ng-if="controller.selected(childObject)">
-            <span class="edit-handle edit-move"
-                  mct-drag-down="controller.startDrag(childObject.getId(), [1,1], [0,0])"
-                  mct-drag="controller.continueDrag(delta)"
-                  mct-drag-up="controller.endDrag()">
-            </span>
-
-            <span class="edit-corner edit-resize-nw"
-                  mct-drag-down="controller.startDrag(childObject.getId(), [1,1], [-1,-1])"
-                  mct-drag="controller.continueDrag(delta)"
-                  mct-drag-up="controller.endDrag()">
-            </span>
-            <span class="edit-corner edit-resize-ne"
-                  mct-drag-down="controller.startDrag(childObject.getId(), [0,1], [1,-1])"
-                  mct-drag="controller.continueDrag(delta)"
-                  mct-drag-up="controller.endDrag()">
-            </span>
-            <span class="edit-corner edit-resize-sw"
-                  mct-drag-down="controller.startDrag(childObject.getId(), [1,0], [-1,1])"
-                  mct-drag="controller.continueDrag(delta)"
-                  mct-drag-up="controller.endDrag()">
-            </span>
-            <span class="edit-corner edit-resize-se"
-                  mct-drag-down="controller.startDrag(childObject.getId(), [0,0], [1,1])"
-                  mct-drag="controller.continueDrag(delta)"
-                  mct-drag-up="controller.endDrag()">
-            </span>
-        </span>
-
-    </div>
-
-</div>

platform/features/notebook/res/templates/notebook.html

@@ -1,124 +0,0 @@
-<div ng-controller="NotebookController as controller" class="mct-notebook w-notebook l-flex-col">
-    <div class="l-notebook-head holder l-flex-row flex-elem">
-        <div class="l-flex-row holder grows holder-search">
-            <div class="search-bar flex-elem l-flex-row grows"
-                 ng-class="{ holder: !(entrySearch === '' || entrySearch === undefined) }">
-                <div class="holder flex-elem grows">
-                    <input class="search-input"
-                           type="text" tabindex="10000"
-                           ng-model="entrySearch"
-                           ng-keyup="controller.search()"/>
-                    <a class="clear-icon clear-input icon-x-in-circle"
-                       ng-class="{show: !(entrySearch === '' || entrySearch === undefined)}"
-                       ng-click="entrySearch = ''; controller.search()"></a>
-                </div>
-            </div>
-        </div>
-
-        <div class="notebook-filters right l-flex-row flex-elem grows flex-justify-end">
-            <div class="select">
-                <select ng-model="showTime">
-                    <option value="0" selected="selected">Show all</option>
-                    <option value="1">Last hour</option>
-                    <option value="8">Last 8 hours</option>
-                    <option value="24">Last 24 hours</option>
-                </select>
-            </div>
-            <div class="select">
-                <select ng-model="sortEntries">
-                    <option value="-createdOn" selected="selected">Newest first</option>
-                    <option value="createdOn">Oldest first</option>
-                </select>
-            </div>
-        </div>
-    </div>
-
-    <!--  drag area -->
-    <div class="holder flex-elem l-flex-row icon-plus labeled l-notebook-drag-area" ng-click="newEntry($event)"
-         id="newEntry" mct-entry-dnd>
-        <span class="label">To start a new entry, click here or drag and drop any object</span>
-    </div>
-
-    <!-- entries -->
-    <div class="holder flex-elem grows w-notebook-entries t-entries-list" ng-mouseover="handleActive()">
-        <ul>
-            <li class="l-flex-row has-local-controls l-notebook-entry s-notebook-entry"
-                id="{{'entry_'+ entry.id}}"
-                ng-if="hoursFilter(showTime,entry.createdOn)"
-                ng-repeat="entry in model.entries | filter:entrySearch | orderBy: sortEntries track by $index"
-                ng-init="$last && finished(model.entries)"
-                mct-entry-dnd>
-                <div class="holder flex-elem l-flex-row grows w-notebook-entry-time-and-content" ng-click="selectContentEditable($event)">
-                    <div class="holder flex-elem s-notebook-entry-time">
-                        <span>{{entry.createdOn | date:'yyyy-MM-dd'}}</span>
-                        <span>{{entry.createdOn | date:'HH:mm:ss'}}</span>
-                    </div>
-                    <div class="holder flex-elem l-flex-col grows l-notebook-entry-content">
-                        <div contenteditable="true"
-                             ng-blur="textBlur($event, entry.id)"
-                             ng-focus="textFocus($event, entry.id)"
-                             ng-model="entry.text"
-                             placeholder="Enter text here"
-                             class="flex-elem s-input-inline t-notebook-entry-input s-notebook-entry-text"
-                             ng-bind-html="trustedHtml(entry.text)">
-                        </div>
-                        <!-- embeds -->
-                        <div class="flex-elem entry-embeds l-flex-row">
-                            <div class="l-flex-row l-entry-embed {{embed.cssClass}}"
-                                 ng-repeat="embed in entry.embeds track by $index"
-                                 ng-class="{ 'has-snapshot' : embed.snapshot }"
-                                 id="{{embed.id}}">
-                                <div class="snap-thumb"
-                                     ng-if="embed.snapshot"
-                                     ng-click="viewSnapshot($event,embed.snapshot.src,embed.id,entry.createdOn,this,embed)">
-                                    <img ng-src="{{embed.snapshot.src}}" src="//:0" alt="{{embed.id}}">
-                                </div>
-                                <div class="embed-info l-flex-col">
-                                    <div class="embed-title object-header">
-                                        <a ng-click='navigate($event,embed.type)'>{{embed.name}}</a>
-                                        <a class='context-available' ng-click='openMenu($event,embed.type)'></a>
-                                    </div>
-                                    <div class="hide-menu" ng-show="false">
-                                        <div class="menu-element context-menu-wrapper mobile-disable-select">
-                                            <div class="menu context-menu">
-                                                <ul>
-                                                    <li ng-repeat="menu in menuEmbed"
-                                                        ng-click="menu.perform($event,embed.snapshot.src,embed.id,entry.createdOn,this,embed)"
-                                                        title="{{menu.getMetadata().description}}"
-                                                        class="{{menu.getMetadata().cssClass}}"
-                                                        ng-if="embed.snapshot">
-                                                        {{menu.getMetadata().name}}
-                                                    </li>
-                                                    <li ng-repeat="menu in menuEmbedNoSnap"
-                                                        ng-click="menu.perform($event,embed.snapshot.src,embed.id,entry.createdOn,this)"
-                                                        title="{{menu.getMetadata().description}}"
-                                                        class="{{menu.getMetadata().cssClass}}"
-                                                        ng-if="!embed.snapshot">
-                                                        {{menu.getMetadata().name}}
-                                                    </li>
-                                                    <li ng-repeat="menu in embedActions"
-                                                        ng-click="menu.perform()"
-                                                        title="{{menu.name}}"
-                                                        class="{{menu.cssClass}}">
-                                                        {{menu.name}}
-                                                    </li>
-                                                </ul>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="embed-date"
-                                         ng-if="embed.snapshot">{{embed.id| date:'yyyy-MM-dd HH:mm:ss'}}
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <!-- delete entry -->
-                <div class="holder flex-elem local-control notebook-entry-delete">
-                    <a class="s-icon-button icon-trash" id={{entry.id}} title="Delete Entry" ng-click="deleteEntry($event)"></a>
-                </div>
-            </li>
-        </ul>
-    </div>
-</div>

platform/features/notebook/res/templates/notifications.html

@@ -1,8 +0,0 @@
-<span class="status block">
-    <!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
-    <span class="status-indicator icon-bell"></span>
-    <span class="label">
-        Notifications
-    </span>
-    <span class="count"></span>
-</span>

platform/features/notebook/src/actions/AnnotateSnapshot.js

@@ -1,125 +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.
- *****************************************************************************/
-
-/**
- * Module defining viewSnapshot (Originally NewWindowAction). Created by vwoeltje on 11/18/14.
- */
-define(
-    ["painterro", "zepto"],
-    function (Painterro, $) {
-
-        var ANNOTATION_STRUCT = {
-            title: "Annotate Snapshot",
-            template: "annotate-snapshot",
-            options: [{
-                name: "OK",
-                key: "ok",
-                description: "save annotation"
-            },
-            {
-                name: "Cancel",
-                key: "cancel",
-                description: "cancel editing"
-            }]
-        };
-
-        function AnnotateSnapshot(dialogService,dndService,$rootScope,context) {
-            context = context || {};
-
-            // Choose the object to be opened into a new tab
-            this.domainObject = context.selectedObject || context.domainObject;
-            this.dialogService = dialogService;
-            this.dndService = dndService;
-            this.$rootScope = $rootScope;
-        }
-
-
-
-
-        AnnotateSnapshot.prototype.perform = function ($event,snapshot,embedId,entryId,$scope) {
-
-            var DOMAIN_OBJECT = this.domainObject;
-            var ROOTSCOPE = this.$rootScope;
-
-            this.dialogService.getUserChoice(ANNOTATION_STRUCT)
-                        .then(saveNotes);
-
-            var painterro;
-
-            var tracker = function () {
-                $(document.body).find('.l-dialog .outer-holder').addClass('annotation-dialog');
-                painterro = Painterro({
-                    id: 'snap-annotation',
-                    activeColor: '#ff0000',
-                    activeColorAlpha: 1.0,
-                    activeFillColor: '#fff',
-                    activeFillColorAlpha: 0.0,
-                    backgroundFillColor: '#000',
-                    backgroundFillColorAlpha: 0.0,
-                    defaultFontSize: 16,
-                    defaultLineWidth: 2,
-                    defaultTool: 'ellipse',
-                    hiddenTools: ['save', 'open', 'close', 'eraser', 'pixelize', 'rotate', 'settings', 'scale'],
-                    toolbarPosition: 'top',
-                    // colorScheme: {
-                    //     main: '#333',
-                    //     control: '#ffcc00'
-                    // },
-                    saveHandler: function (image, done) {
-                        if (entryId && embedId) {
-                            var elementPos = DOMAIN_OBJECT.model.entries.map(function (x) {
-                                return x.createdOn;
-                            }).indexOf(entryId);
-                            var entryEmbeds = DOMAIN_OBJECT.model.entries[elementPos].embeds;
-                            var embedPos = entryEmbeds.map(function (x) {
-                                return x.id;
-                            }).indexOf(embedId);
-                            $scope.saveSnap(image.asBlob(), embedPos, elementPos);
-                        }else {
-                            ROOTSCOPE.snapshot = {'src': image.asDataURL('image/png'),
-                                                  'modified': Date.now()};
-                        }
-
-                        done(true);
-                    }
-                }).show(snapshot);
-                $(document.body).find('.ptro-icon-btn').addClass('s-button');
-                $(document.body).find('.ptro-input').addClass('s-button');
-            };
-
-            ANNOTATION_STRUCT.model = {'tracker': tracker};
-
-
-
-            function saveNotes(param) {
-                if (param === 'ok') {
-                    painterro.save();
-                }else {
-                    ROOTSCOPE.snapshot = "annotationCancelled";
-                }
-            }
-
-        };
-
-        return AnnotateSnapshot;
-    }
-);

platform/features/notebook/src/actions/CreateSnapshot.js

@@ -1,65 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    [],
-    function () {
-
-        var SNAPSHOT_TEMPLATE = '<mct-representation key="\'draggedEntry\'"' +
-                                    'parameters="{entry:entryId,embed:embedId}"' +
-                                    'class="t-rep-frame holder"' +
-                                    'mct-object="selObj">' +
-                                '</mct-representation>';
-
-        function CreateSnapshot($compile,context) {
-            context = context || {};
-            this.domainObject = context.selectedObject || context.domainObject;
-            this.context = context;
-            this.$compile = $compile;
-        }
-
-
-        CreateSnapshot.prototype.perform = function ($event,snapshot,embedId,entryId,$scope) {
-            var compile = this.$compile;
-            var model = this.domainObject.model;
-            var elementPos = model.entries.map(function (x) {
-                return x.createdOn;
-            }).indexOf(entryId);
-            var entryEmbeds = model.entries[elementPos].embeds;
-            var embedPos = entryEmbeds.map(function (x) {
-                return x.id;
-            }).indexOf(embedId);
-            var embedType = entryEmbeds[embedPos].type;
-
-            $scope.getDomainObj(embedType).then(function (resp) {
-                if (entryId >= 0 && embedId >= 0) {
-                    $scope.selObj = resp[embedType];
-                    $scope.entryId = elementPos;
-                    $scope.embedId = embedPos;
-                    compile(SNAPSHOT_TEMPLATE)($scope);
-                }
-            });
-        };
-
-        return CreateSnapshot;
-    }
-);

platform/features/notebook/src/actions/NewEntryContextual.js

@@ -1,195 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-define(
-    [],
-    function () {
-
-        var SNAPSHOT_TEMPLATE = '<mct-representation key="\'draggedEntry\'"' +
-                                    'class="t-rep-frame holder"' +
-                                    'mct-object="selObj">' +
-                                '</mct-representation>';
-
-        var NEW_TASK_FORM = {
-            name: "Create a Notebook Entry",
-            hint: "Please select one Notebook",
-            sections: [{
-                rows: [{
-                    name: 'Entry',
-                    key: 'entry',
-                    control: 'textarea',
-                    required: true,
-                    "cssClass": "l-textarea-sm"
-                },
-                {
-                    name: 'Embed Type',
-                    key: 'withSnapshot',
-                    control: 'snapshot-select',
-                    "options": [
-                        {
-                            "name": "Link and Snapshot",
-                            "value": true
-                        },
-                        {
-                            "name": "Link only",
-                            "value": false
-                        }
-                    ]
-                },
-                {
-                    name: 'Embed',
-                    key: 'embedObject',
-                    control: 'embed-control'
-                },
-                {
-                    name: 'Save in Notebook',
-                    key: 'saveNotebook',
-                    control: 'locator',
-                    validate: validateLocation
-                }]
-            }]
-        };
-
-        function NewEntryContextual($compile,$rootScope,dialogService,notificationService,linkService,context) {
-            context = context || {};
-            this.domainObject = context.selectedObject || context.domainObject;
-            this.dialogService = dialogService;
-            this.notificationService = notificationService;
-            this.linkService = linkService;
-            this.$rootScope = $rootScope;
-            this.$compile = $compile;
-        }
-
-        function validateLocation(newParentObj) {
-            return newParentObj.model.type === 'notebook';
-        }
-
-
-        NewEntryContextual.prototype.perform = function () {
-
-            var self = this;
-            var domainObj = this.domainObject;
-            var notification = this.notificationService;
-            var dialogService = this.dialogService;
-            var rootScope = this.$rootScope;
-            rootScope.newEntryText = '';
-            // Create the overlay element and add it to the document's body
-            this.$rootScope.selObj = domainObj;
-            this.$rootScope.selValue = "";
-            var newScope = rootScope.$new();
-            newScope.selObj = domainObj;
-            newScope.selValue = "";
-            this.$compile(SNAPSHOT_TEMPLATE)(newScope);
-            //newScope.$destroy();
-
-            this.$rootScope.$watch("snapshot", setSnapshot);
-
-            function setSnapshot(value) {
-                if (value === "annotationCancelled") {
-                    rootScope.snapshot = rootScope.lastValue;
-                    rootScope.lastValue = '';
-                }else if (value && value !== rootScope.lastValue) {
-                    var overlayModel = {
-                        title: NEW_TASK_FORM.name,
-                        message: NEW_TASK_FORM.message,
-                        structure: NEW_TASK_FORM,
-                        value: {'entry': rootScope.newEntryText || ""}
-                    };
-
-                    rootScope.currentDialog = overlayModel;
-
-                    dialogService.getDialogResponse(
-                        "overlay-dialog",
-                        overlayModel,
-                        function () {
-                            return overlayModel.value;
-                        }
-                    ).then(addNewEntry);
-
-                    rootScope.lastValue = value;
-                }
-            }
-
-            function addNewEntry(options) {
-                options.selectedModel = options.embedObject.getModel();
-                options.cssClass = options.embedObject.getCapability('type').typeDef.cssClass;
-                if (self.$rootScope.snapshot) {
-                    options.snapshot = self.$rootScope.snapshot;
-                    self.$rootScope.snapshot = undefined;
-                }else {
-                    options.snapshot = undefined;
-                }
-
-                if (!options.withSnapshot) {
-                    options.snapshot = '';
-                }
-
-                createSnap(options);
-            }
-
-            function createSnap(options) {
-                options.saveNotebook.useCapability('mutation', function (model) {
-                    var entries = model.entries;
-                    var lastEntry = entries[entries.length - 1];
-                    var date = Date.now();
-
-                    if (lastEntry === undefined || lastEntry.text || lastEntry.embeds) {
-                        model.entries.push({
-                            'id': date,
-                            'createdOn': date,
-                            'text': options.entry,
-                            'embeds': [{'type': options.embedObject.getId(),
-                                       'id': '' + date,
-                                       'cssClass': options.cssClass,
-                                       'name': options.selectedModel.name,
-                                       'snapshot': options.snapshot
-                                     }]
-                        });
-                    }else {
-                        model.entries[entries.length - 1] = {
-                            'id': date,
-                            'createdOn': date,
-                            'text': options.entry,
-                            'embeds': [{'type': options.embedObject.getId(),
-                                       'id': '' + date,
-                                       'cssClass': options.cssClass,
-                                       'name': options.selectedModel.name,
-                                       'snapshot': options.snapshot
-                                     }]
-                        };
-                    }
-                });
-
-                notification.info({
-                    title: "Notebook Entry created"
-                });
-            }
-        };
-
-        NewEntryContextual.appliesTo = function (context) {
-            var domainObject = context.domainObject;
-            return domainObject && domainObject.hasCapability("notebook") &&
-                domainObject.getCapability("notebook").isNotebook();
-        };
-
-        return NewEntryContextual;
-    }
-);

platform/features/notebook/src/actions/RemoveEmbed.js

@@ -1,72 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(
-    [],
-    function () {
-
-        function RemoveEmbed(dialogService,context) {
-            context = context || {};
-
-            this.domainObject = context.selectedObject || context.domainObject;
-            this.dialogService = dialogService;
-        }
-
-
-        RemoveEmbed.prototype.perform = function ($event,snapshot,embedId,entryId) {
-            var DOMAIN_OBJ = this.domainObject;
-            var errorDialog = this.dialogService.showBlockingMessage({
-                severity: "error",
-                title: "This action will permanently delete this Embed. Do you want to continue?",
-                minimized: true, // want the notification to be minimized initially (don't show banner)
-                options: [{
-                    label: "OK",
-                    callback: function () {
-                        errorDialog.dismiss();
-                        remove();
-                    }
-                },{
-                    label: "Cancel",
-                    callback: function () {
-                        errorDialog.dismiss();
-                    }
-                }]
-            });
-
-            function remove() {
-                DOMAIN_OBJ.useCapability('mutation', function (model) {
-                    var elementPos = model.entries.map(function (x) {
-                        return x.createdOn;
-                    }).indexOf(entryId);
-                    var entryEmbeds = model.entries[elementPos].embeds;
-                    var embedPos = entryEmbeds.map(function (x) {
-                        return x.id;
-                    }).indexOf(embedId);
-                    model.entries[elementPos].embeds.splice(embedPos, 1);
-                });
-            }
-
-        };
-
-        return RemoveEmbed;
-    }
-);

platform/features/notebook/src/actions/RemoveSnapshot.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.
- *****************************************************************************/
-
-define(
-    [],
-    function () {
-
-        function RemoveSnapshot(dialogService,context) {
-            context = context || {};
-
-            this.domainObject = context.selectedObject || context.domainObject;
-            this.dialogService = dialogService;
-        }
-
-
-
-        RemoveSnapshot.prototype.perform = function ($event,snapshot,embedId,entryId) {
-
-            var DOMAIN_OBJ = this.domainObject;
-            var errorDialog = this.dialogService.showBlockingMessage({
-                severity: "error",
-                title: "This action will permanently delete this Snapshot. Do you want to continue?",
-                minimized: true, // want the notification to be minimized initially (don't show banner)
-                options: [{
-                    label: "OK",
-                    callback: function () {
-                        errorDialog.dismiss();
-                        remove();
-                    }
-                },{
-                    label: "Cancel",
-                    callback: function () {
-                        errorDialog.dismiss();
-                    }
-                }]
-            });
-
-            function remove() {
-                DOMAIN_OBJ.useCapability('mutation', function (model) {
-                    var elementPos = model.entries.map(function (x) {
-                        return x.createdOn;
-                    }).indexOf(entryId);
-                    var entryEmbeds = model.entries[elementPos].embeds;
-                    var embedPos = entryEmbeds.map(function (x) {
-                        return x.id;
-                    }).indexOf(embedId);
-                    model.entries[elementPos].embeds[embedPos].snapshot = "";
-                });
-            }
-
-        };
-
-        return RemoveSnapshot;
-    }
-);

platform/features/notebook/src/actions/ViewSnapshot.js

@@ -1,164 +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.
- *****************************************************************************/
-
-/**
- * Module defining ViewSnapshot
- */
-define(
-    ['zepto'],
-    function ($) {
-
-        var OVERLAY_TEMPLATE = '' +
-        '    <div class="abs blocker"></div>' +
-        '    <div class="abs outer-holder">' +
-        '       <a class="close icon-x-in-circle"></a>' +
-        '       <div class="abs inner-holder l-flex-col">' +
-        '           <div class="t-contents flex-elem holder grows"></div>' +
-        '           <div class="bottom-bar flex-elem holder">' +
-        '               <a class="t-done s-button major">Done</a>' +
-        '           </div>' +
-        '       </div>' +
-        '    </div>';
-
-        var toggleOverlay,
-            overlay,
-            closeButton,
-            doneButton,
-            blocker,
-            overlayContainer,
-            imgHolder,
-            img,
-            annotateButton,
-            annotateImg;
-
-        function ViewSnapshot($compile,context) {
-            context = context || {};
-
-            this.$compile = $compile;
-        }
-
-        function openOverlay(url,header) {
-            overlay = document.createElement('div');
-            $(overlay).addClass('abs overlay l-large-view');
-            overlay.innerHTML = OVERLAY_TEMPLATE;
-            overlayContainer = overlay.querySelector('.t-contents');
-            closeButton = overlay.querySelector('a.close');
-            closeButton.addEventListener('click', toggleOverlay);
-            doneButton = overlay.querySelector('a.t-done');
-            doneButton.addEventListener('click', toggleOverlay);
-            blocker = overlay.querySelector('.abs.blocker');
-            blocker.addEventListener('click', toggleOverlay);
-            annotateButton = header.querySelector('a.icon-pencil');
-            annotateButton.addEventListener('click', annotateImg);
-            document.body.appendChild(overlay);
-            img = document.createElement('div');
-            $(img).addClass('abs object-holder t-image-holder s-image-holder');
-            img.innerHTML = '<div class="image-main s-image-main" style="background-image: url(' + url + ');"></div>';
-            overlayContainer.appendChild(header);
-            overlayContainer.appendChild(img);
-        }
-
-        function closeOverlay() {
-            overlayContainer.removeChild(img);
-            document.body.removeChild(overlay);
-            closeButton.removeEventListener('click', toggleOverlay);
-            closeButton = undefined;
-            doneButton.removeEventListener('click', toggleOverlay);
-            doneButton = undefined;
-            blocker.removeEventListener('click', toggleOverlay);
-            blocker = undefined;
-            overlayContainer = undefined;
-            overlay = undefined;
-            img = undefined;
-        }
-
-        function headerTemplate() {
-            var template = '<div class="t-snapshot abs l-view-header">' +
-                                '<div class="abs object-browse-bar l-flex-row">' +
-                                    '<div class="left flex-elem l-flex-row grows">' +
-                                        '<div class="object-header flex-elem l-flex-row grows">' +
-                                            '<div class="type-icon flex-elem embed-icon holder" ng-class="cssClass"></div>' +
-                                            '<div class="title-label flex-elem holder flex-can-shrink">{{entryName}}</div>' +
-                                            '<a class="context-available flex-elem holder" ng-click="openMenu($event,embedType)""></a>' +
-                                            '<div class="hide-menu" ng-show="false">' +
-                                                '<div class="menu-element menu-view context-menu-wrapper mobile-disable-select">' +
-                                                    '<div class="menu context-menu">' +
-                                                        '<ul>' +
-                                                            '<li ng-repeat="menu in embedActions"' +
-                                                                'ng-click="menu.perform()"' +
-                                                                'title="{{menu.name}}"' +
-                                                                'class="{{menu.cssClass}}">' +
-                                                                '{{menu.name}}' +
-                                                            '</li>' +
-                                                        '</ul>' +
-                                                    '</div>' +
-                                                '</div>' +
-                                            '</div>' +
-                                        '</div><!-- closes object-header -->' +
-                                    '</div><!-- closes left -->' +
-                                    '<div class="btn-bar right l-flex-row flex-elem flex-justify-end flex-fixed">' +
-                                        '<div class="flex-elem holder flex-can-shrink s-snapshot-datetime">' +
-                                        'SNAPSHOT {{snapDate | date:\'yyyy-MM-dd HH:mm:ss\'}}' +
-                                        '</div>' +
-                                        '<a class="s-button icon-pencil" title="Annotate">' +
-                                            '<span class="title-label">Annotate</span>' +
-                                        '</a>' +
-                                    '</div><!-- closes right -->' +
-                                '</div><!-- closes object-browse-bar -->' +
-                            '</div><!-- closes t-snapshot -->';
-            return template;
-        }
-
-
-        ViewSnapshot.prototype.perform = function ($event,snapshot,embedId,entryId,$scope,embed) {
-            var isOpen = false;
-
-            // Create the overlay element and add it to the document's body
-            $scope.cssClass = embed.cssClass;
-            $scope.embedType = embed.type;
-            $scope.entryName = embed.name;
-            $scope.snapDate = +embedId;
-            var element = this.$compile(headerTemplate())($scope);
-
-            var annotateAction = $scope.action.getActions({category: 'embed'})[1];
-
-            toggleOverlay = function () {
-                if (!isOpen) {
-                    openOverlay(snapshot, element[0]);
-                    isOpen = true;
-                } else {
-                    closeOverlay();
-                    isOpen = false;
-                }
-            };
-
-            annotateImg = function () {
-                closeOverlay();
-                annotateAction.perform($event, snapshot, embedId, entryId, $scope);
-            };
-
-            toggleOverlay();
-        };
-
-        return ViewSnapshot;
-    }
-);

platform/features/notebook/src/capabilities/NotebookCapability.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.
- *****************************************************************************/
-
-
-define(
-    function () {
-
-        /**
-         * The notebook capability allows a domain object to know whether the
-         * notebook plugin is present or not.
-         *
-         * @constructor
-         */
-        function NotebookCapability(typeService, domainObject) {
-            this.domainObject = domainObject;
-            this.typeService = typeService;
-            return this;
-        }
-
-        /**
-         * Returns true if there is a notebook domain Object.
-         *
-         * @returns {Boolean}
-         */
-        NotebookCapability.prototype.isNotebook = function () {
-            return this.typeService.getType('notebook');
-        };
-
-        return NotebookCapability;
-    }
-);

platform/features/notebook/src/controllers/LayoutNotebookController.js

@@ -1,54 +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.
- *****************************************************************************/
-
-/**
- * This bundle implements object types and associated views for
- * display-building.
- */
-define(
-    [],
-    function () {
-
-        /**
-         * The LayoutNotebookController is responsible for supporting the
-         * notebook feature creation on theLayout view.
-         **/
-
-        function LayoutNotebookController($scope) {
-            $scope.hasNotebookAction = undefined;
-
-            $scope.newNotebook = undefined;
-
-            var actions = $scope.domainObject.getCapability('action');
-            var notebookAction = actions.getActions({'key': 'notebook-new-entry'});
-            if (notebookAction.length > 0) {
-                $scope.hasNotebookAction = true;
-                $scope.newNotebook = function () {
-                    notebookAction[0].perform();
-                };
-            }
-        }
-
-        return LayoutNotebookController;
-    }
-);
-

platform/features/notebook/src/controllers/NewEntryController.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.
- *****************************************************************************/
-
-/**
- * Module defining NewEntryController. */
-define(
-    [],
-    function () {
-
-        function NewEntryController($scope,$rootScope) {
-
-            $scope.snapshot = undefined;
-            $scope.snapToggle = true;
-            $scope.entryText = '';
-            var annotateAction = $rootScope.selObj.getCapability('action').getActions(
-                                                                            {category: 'embed'})[1];
-
-            $scope.$parent.$parent.ngModel[$scope.$parent.$parent.field] = $rootScope.selObj;
-            $scope.objectName = $rootScope.selObj.getModel().name;
-            $scope.cssClass = $rootScope.selObj.getCapability('type').typeDef.cssClass;
-
-            $scope.annotateSnapshot = function ($event) {
-                if ($rootScope.currentDialog.value) {
-                    $rootScope.newEntryText = $scope.$parent.$parent.ngModel.entry;
-                    $rootScope.currentDialog.cancel();
-                    annotateAction.perform($event, $rootScope.snapshot.src);
-                    $rootScope.currentDialog = undefined;
-                }
-            };
-
-            function updateSnapshot(img) {
-                $scope.snapshot = img;
-            }
-            // Update set of actions whenever the action capability
-            // changes or becomes available.
-            $rootScope.$watch("snapshot", updateSnapshot);
-
-            $rootScope.$watch("selValue", toggleEmbed);
-
-            function toggleEmbed(value) {
-                $scope.snapToggle = value;
-            }
-        }
-
-        return NewEntryController;
-    }
-);

platform/features/notebook/src/controllers/NotebookController.js

@@ -1,400 +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.
- *****************************************************************************/
-
- /*-- main controller file, here is the core functionality of the notebook plugin --*/
-
-define(
-    ['zepto'],
-    function ($) {
-
-
-        function NotebookController(
-                $scope,
-                dialogService,
-                popupService,
-                agentService,
-                objectService,
-                navigationService,
-                now,
-                actionService,
-                $timeout,
-                $element,
-                $sce
-        ) {
-
-            $scope.entriesEl = $(document.body).find('.t-entries-list');
-            $scope.sortEntries = '-createdOn';
-            $scope.showTime = "0";
-            $scope.editEntry = false;
-            $scope.entrySearch = '';
-            $scope.entryTypes = [];
-            $scope.embedActions = [];
-            $scope.currentEntryValue = '';
-
-            /*--seconds in an hour--*/
-
-            var SECONDS_IN_AN_HOUR  = 60 * 60 * 1000;
-
-            this.scope = $scope;
-
-            $scope.hoursFilter = function (hours,entryTime) {
-                if (+hours) {
-                    return entryTime > (Date.now() - SECONDS_IN_AN_HOUR * (+hours));
-                }else {
-                    return true;
-                }
-            };
-
-            $scope.scrollToTop = function () {
-                var entriesContainer = $scope.entriesEl.parent();
-                entriesContainer[0].scrollTop = 0;
-            };
-
-            $scope.findEntryEl = function (entryId) {
-                var element = $($scope.entriesEl).find('#entry_' + entryId);
-
-                if (element[0]) {
-                    return element.find("[contenteditable='true']");
-                } else {
-                    return $($scope.entriesEl.children().children()[0]).find("[contenteditable='true']");
-                }
-            };
-
-            $scope.findEntryPositionById = function (id) {
-                var foundId = -1;
-
-                $scope.domainObject.model.entries.forEach(function (element, index) {
-                    if (element.id === id) {
-                        foundId = index;
-                        return;
-                    }
-                });
-
-                return foundId;
-            };
-
-            $scope.newEntry = function ($event) {
-                $scope.scrollToTop();
-
-                var entries = $scope.domainObject.model.entries,
-                    lastEntry = entries[entries.length - 1],
-                    id = Date.now();
-
-                if (lastEntry === undefined || lastEntry.text || lastEntry.embeds) {
-                    var createdEntry = {'id': id, 'createdOn': id};
-
-                    $scope.domainObject.useCapability('mutation', function (model) {
-                        model.entries.push(createdEntry);
-                    });
-                } else {
-                    $scope.findEntryEl(lastEntry.id).focus();
-
-                    $scope.domainObject.useCapability('mutation', function (model) {
-                        model.entries[entries.length - 1].createdOn = id;
-                    });
-                }
-                $scope.entrySearch = '';
-            };
-
-
-            $scope.deleteEntry = function ($event) {
-                var delId = +$event.currentTarget.id;
-                var errorDialog = dialogService.showBlockingMessage({
-                    severity: "error",
-                    title: "This action will permanently delete this Notebook entry. Do you want to continue?",
-                    minimized: true, // want the notification to be minimized initially (don't show banner)
-                    options: [{
-                        label: "OK",
-                        callback: function () {
-                            errorDialog.dismiss();
-                            var elementPos = $scope.findEntryPositionById(delId);
-
-                            if (elementPos !== -1) {
-                                $scope.domainObject.useCapability('mutation', function (model) {
-                                    model.entries.splice(elementPos, 1);
-                                });
-                            } else {
-                                window.console.log('delete error');
-                            }
-
-                        }
-                    },{
-                        label: "Cancel",
-                        callback: function () {
-                            errorDialog.dismiss();
-                        }
-                    }]
-                });
-            };
-
-            function setCaretToEndOfContenteditable(contentEditableElement) {
-                var range,selection;
-                if (document.createRange) {
-                    range = document.createRange();//Create a range (a range is a like the selection but invisible)
-                    range.selectNodeContents(contentEditableElement);//Select the entire contents of the element with the range
-                    range.collapse(false);//collapse the range to the end point. false means collapse to end rather than the start
-                    selection = window.getSelection();//get the selection object (allows you to change selection)
-                    selection.removeAllRanges();//remove any selections already made
-                    selection.addRange(range);//make the range you have just created the visible selection
-                }
-            }
-
-            $scope.selectContentEditable = function ($event) {
-                var child = $($event.srcElement).children()[0];
-
-                if (child) {
-                    $($event.srcElement).children()[0].focus();
-                }
-            };
-
-            $scope.textFocus = function ($event, entryId) {
-                if ($event.srcElement && $event.srcElement.innerText) {
-                    /*
-                     On focus, if the currentTarget isn't blank, set the global currentEntryValue = the
-                     content of the current focus. This will be used at blur to determine if the
-                     current entry has been modified or not.
-                     Not sure this is right, would think we'd always want to set curEntVal even if blank
-                     */
-                    $scope.currentEntryValue = $event.srcElement.innerText;
-                    setCaretToEndOfContenteditable($event.srcElement);
-                } else {
-                    $event.target.innerText = '';
-                }
-            };
-
-            //On text blur(when focus is removed)
-            $scope.textBlur = function ($event, entryId) {
-                // entryId is the unique numeric based on the original createdOn
-                if ($event.target && $event.target.innerText !== "") {
-                    var elementPos = $scope.findEntryPositionById(+entryId);
-                    
-                    // If the text of an entry has been changed, then update the text and the modifiedOn numeric
-                    // Otherwise, don't do anything
-                    if ($scope.currentEntryValue !== $event.target.innerText) {
-                        $scope.domainObject.useCapability('mutation', function (model) {
-                            model.entries[elementPos].text = $event.target.innerText;
-                            model.entries[elementPos].modified = Date.now();
-                        });
-                    }
-                }
-            };
-
-            $scope.finished = function (model) {
-                var lastEntry = model[model.length - 1];
-
-                if (!lastEntry.text) {
-                    $scope.findEntryEl(lastEntry.id).focus();
-                }
-            };
-
-            $scope.handleActive = function () {
-                var newEntry = $scope.entriesEl.find('.active');
-                if (newEntry) {
-                    newEntry.removeClass('active');
-                }
-            };
-
-
-            $scope.clearSearch = function () {
-                $scope.entrySearch = '';
-            };
-
-            $scope.viewSnapshot = function ($event,snapshot,embedId,entryId,$innerScope,domainObject) {
-                var viewAction = $scope.action.getActions({category: 'embed'})[0];
-                viewAction.perform($event, snapshot, embedId, entryId, $innerScope, domainObject);
-            };
-
-
-            $scope.parseText = function (text) {
-                if (text) {
-                    return text.split(/\r\n|\r|\n/gi);
-                }
-            };
-
-            //parse text and add line breaks where needed
-            $scope.trustedHtml = function (text) {
-                if (text) {
-                    return $sce.trustAsHtml(this.parseText(text).join('<br>'));
-                }
-            };
-
-            $scope.renderImage = function (img) {
-                return URL.createObjectURL(img);
-            };
-
-            $scope.getDomainObj = function (id) {
-                return objectService.getObjects([id]);
-            };
-
-            function refreshComp(change) {
-                if (change && change.length) {
-                    change[0].getCapability('action').getActions({key: 'remove'})[0].perform();
-                }
-            }
-
-            $scope.actionToMenuOption = function (action) {
-                return {
-                    key: action.getMetadata().key,
-                    name: action.getMetadata().name,
-                    cssClass: action.getMetadata().cssClass,
-                    perform: action.perform
-                };
-            };
-
-            // Maintain all "conclude-editing" and "save" actions in the
-            // present context.
-            function updateActions() {
-                $scope.menuEmbed = $scope.action ?
-                        $scope.action.getActions({category: 'embed'}) :
-                        [];
-
-                $scope.menuEmbedNoSnap = $scope.action ?
-                        $scope.action.getActions({category: 'embed-no-snap'}) :
-                        [];
-
-                $scope.menuActions = $scope.action ?
-                        $scope.action.getActions({key: 'window'}) :
-                        [];
-            }
-
-            // Update set of actions whenever the action capability
-            // changes or becomes available.
-            $scope.$watch("action", updateActions);
-
-            $scope.navigate = function ($event,embedType) {
-                if ($event) {
-                    $event.preventDefault();
-                }
-                $scope.getDomainObj(embedType).then(function (resp) {
-                    navigationService.setNavigation(resp[embedType]);
-                });
-            };
-
-            $scope.saveSnap = function (url,embedPos,entryPos) {
-                var snapshot = false;
-                if (url) {
-                    if (embedPos !== -1 && entryPos !== -1) {
-                        var reader = new window.FileReader();
-                        reader.readAsDataURL(url);
-                        reader.onloadend = function () {
-                            snapshot = reader.result;
-                            $scope.domainObject.useCapability('mutation', function (model) {
-                                if (model.entries[entryPos]) {
-                                    model.entries[entryPos].embeds[embedPos].snapshot = {
-                                        'src': snapshot,
-                                        'type': url.type,
-                                        'size': url.size,
-                                        'modified': Date.now()
-                                    };
-                                    model.entries[entryPos].embeds[embedPos].id = Date.now();
-                                }
-                            });
-                        };
-                    }
-                }else {
-                    $scope.domainObject.useCapability('mutation', function (model) {
-                        model.entries[entryPos].embeds[embedPos].snapshot = snapshot;
-                    });
-                }
-            };
-
-            /*---popups menu embeds----*/
-
-            function getEmbedActions(embedType) {
-                if (!$scope.embedActions.length) {
-                    $scope.getDomainObj(embedType).then(function (resp) {
-                        $scope.embedActions = [];
-                        $scope.embedActions.push($scope.actionToMenuOption(
-                                                    $scope.action.getActions({key: 'window',selectedObject: resp[embedType]})[0]
-                                              ));
-                        $scope.embedActions.push({
-                                                key: 'navigate',
-                                                name: 'Go to Original',
-                                                cssClass: '',
-                                                perform: function () {
-                                                    $scope.navigate('', embedType);
-                                                }
-                                            });
-                    });
-                }
-            }
-
-            $scope.openMenu = function ($event,embedType) {
-                $event.preventDefault();
-
-                getEmbedActions(embedType);
-
-                var body = $(document).find('body'),
-                    initiatingEvent = agentService.isMobile() ?
-                            'touchstart' : 'mousedown',
-                    dismissExistingMenu,
-                    menu,
-                    popup;
-
-                var container = $($event.currentTarget).parent().parent();
-
-                menu = container.find('.menu-element');
-
-                // Remove the context menu
-                function dismiss() {
-                    container.find('.hide-menu').append(menu);
-                    body.off("mousedown", dismiss);
-                    dismissExistingMenu = undefined;
-                    $scope.embedActions = [];
-                }
-
-                // Dismiss any menu which was already showing
-                if (dismissExistingMenu) {
-                    dismissExistingMenu();
-                }
-
-                // ...and record the presence of this menu.
-                dismissExistingMenu = dismiss;
-
-                popup = popupService.display(menu, [$event.pageX,$event.pageY], {
-                    marginX: 0,
-                    marginY: -50
-                });
-
-                // Stop propagation so that clicks or touches on the menu do not close the menu
-                menu.on(initiatingEvent, function (event) {
-                    event.stopPropagation();
-                    $timeout(dismiss, 300);
-                });
-
-                // Dismiss the menu when body is clicked/touched elsewhere
-                // ('mousedown' because 'click' breaks left-click context menus)
-                // ('touchstart' because 'touch' breaks context menus up)
-                body.on(initiatingEvent, dismiss);
-
-            };
-
-
-            $scope.$watchCollection("composition", refreshComp);
-
-
-            $scope.$on('$destroy', function () {});
-
-        }
-
-        return NotebookController;
-    });

platform/features/notebook/src/directives/EntryDnd.js

@@ -1,138 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(['zepto'], function ($) {
-    var SNAPSHOT_TEMPLATE = '<mct-representation key="\'draggedEntry\'"' +
-                                    'parameters="{entry:entryId,embed:embedId}"' +
-                                    'class="t-rep-frame holder"' +
-                                    'mct-object="selObj">' +
-                                '</mct-representation>';
-
-    function EntryDnd($rootScope,$compile,dndService,typeService,notificationService) {
-
-        function link($scope, $element) {
-
-            function drop(e) {
-                var selectedObject = dndService.getData('mct-domain-object');
-                var selectedModel = selectedObject.getModel();
-                var cssClass = selectedObject.getCapability('type').typeDef.cssClass;
-                var entryId = -1;
-                var embedId = -1;
-                $scope.clearSearch();
-                if ($element[0].id === 'newEntry') {
-                    entryId = $scope.domainObject.model.entries.length;
-                    embedId = 0;
-                    var lastEntry = $scope.domainObject.model.entries[entryId - 1];
-                    if (lastEntry === undefined || lastEntry.text || lastEntry.embeds) {
-                        $scope.domainObject.useCapability('mutation', function (model) {
-                            model.entries.push({'createdOn': +Date.now(),
-                                                'id': +Date.now(),
-                                                'embeds': [{'type': selectedObject.getId(),
-                                                       'id': '' + Date.now(),
-                                                       'cssClass': cssClass,
-                                                       'name': selectedModel.name,
-                                                       'snapshot': ''
-                                                     }]
-                                            });
-                        });
-                    }else {
-                        $scope.domainObject.useCapability('mutation', function (model) {
-                            model.entries[entryId - 1] =
-                                                    {'createdOn': +Date.now(),
-                                                     'embeds': [{'type': selectedObject.getId(),
-                                                                'id': '' + Date.now(),
-                                                                'cssClass': cssClass,
-                                                                'name': selectedModel.name,
-                                                                'snapshot': ''
-                                                               }]
-                                                    };
-                        });
-                    }
-
-                    $scope.scrollToTop();
-                    notificationService.info({
-                        title: "Notebook Entry created"
-                    });
-
-                }else {
-                    entryId = $scope.findEntryPositionById(Number($element[0].id.replace('entry_', '')));
-
-                    if (!$scope.domainObject.model.entries[entryId].embeds) {
-                        $scope.domainObject.model.entries[entryId].embeds = [];
-                    }
-
-                    $scope.domainObject.useCapability('mutation', function (model) {
-                        model.entries[entryId].embeds.push({'type': selectedObject.getId(),
-                                                                          'id': '' + Date.now(),
-                                                                          'cssClass': cssClass,
-                                                                          'name': selectedModel.name,
-                                                                          'snapshot': ''
-                                                                        });
-                    });
-
-                    embedId = $scope.domainObject.model.entries[entryId].embeds.length - 1;
-
-                    if (selectedObject) {
-                        e.preventDefault();
-
-                    }
-                }
-
-                if (entryId >= 0 && embedId >= 0) {
-                    $scope.selObj = selectedObject;
-                    $scope.entryId = entryId;
-                    $scope.embedId = embedId;
-                    $compile(SNAPSHOT_TEMPLATE)($scope);
-                }
-
-                if ($(e.currentTarget).hasClass('drag-active')) {
-                    $(e.currentTarget).removeClass('drag-active');
-                }
-
-            }
-
-            function dragover(e) {
-                if (!$(e.currentTarget).hasClass('drag-active')) {
-                    $(e.currentTarget).addClass('drag-active');
-                }
-            }
-
-            // Listen for the drop itself
-            $element.on('dragover', dragover);
-            $element.on('drop', drop);
-
-
-            $scope.$on('$destroy', function () {
-                $element.off('dragover', dragover);
-                $element.off('drop', drop);
-            });
-        }
-
-        return {
-            restrict: 'A',
-            link: link
-        };
-    }
-
-    return EntryDnd;
-
-});

platform/features/notebook/src/directives/MCTModalNotebook.js

@@ -1,166 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define([
-    'zepto'
-], function (
-    $
-) {
-
-    var OVERLAY_TEMPLATE = '' +
-'    <div class="abs blocker"></div>' +
-'    <div class="abs outer-holder">' +
-'       <a class="close icon-x-in-circle"></a>' +
-'       <div class="abs inner-holder l-flex-col">' +
-'           <div class="t-contents flex-elem holder grows"></div>' +
-'           <div class="bottom-bar flex-elem holder">' +
-'               <a class="t-done s-button major">Done</a>' +
-'           </div>' +
-'       </div>' +
-'    </div>';
-
-    var NEW_NOTEBOOK_BUTTON_TEMPLATE = '<a class="s-button labeled icon-notebook new-notebook-entry" title="New Notebook Entry">' +
-                                    '<span class="title-label">New Notebook Entry</span>' +
-                                '</a>';
-
-    /**
-     * MCT Trigger Modal is intended for use in only one location: inside the
-     * object-header to allow views in a layout to be popped out in a modal.
-     * Users can close the modal and go back to normal, and everything generally
-     * just works fine.
-     *
-     * This code is sensitive to how our html is constructed-- particularly with
-     * how it locates the the container of an element in a layout. However, it
-     * should be able to handle slight relocations so long as it is always a
-     * descendent of a `.frame` element.
-     */
-    function MCTModalNotebook($document) {
-        var document = $document[0];
-
-        function link($scope, $element) {
-            var frame = $element.parent();
-
-            for (var i = 0; i < 10; i++) {
-                if (frame.hasClass('frame')) {
-                    break;
-                }
-                frame = frame.parent();
-            }
-            if (!frame.hasClass('frame')) {
-                $element.remove();
-                return;
-            }
-
-            frame = frame[0];
-            var layoutContainer = frame.parentElement,
-                isOpen = false,
-                toggleOverlay,
-                overlay,
-                closeButton,
-                doneButton,
-                notebookButton,
-                blocker,
-                overlayContainer,
-                notebookButtonEl;
-
-            function openOverlay() {
-                // Remove frame classes from being applied in a non-frame context
-                $(frame).removeClass('frame frame-template');
-                overlay = document.createElement('div');
-                $(overlay).addClass('abs overlay l-large-view');
-                overlay.innerHTML = OVERLAY_TEMPLATE;
-                overlayContainer = overlay.querySelector('.t-contents');
-                closeButton = overlay.querySelector('a.close');
-                closeButton.addEventListener('click', toggleOverlay);
-                doneButton = overlay.querySelector('a.t-done');
-                doneButton.addEventListener('click', toggleOverlay);
-                blocker = overlay.querySelector('.abs.blocker');
-                blocker.addEventListener('click', toggleOverlay);
-                document.body.appendChild(overlay);
-                layoutContainer.removeChild(frame);
-                overlayContainer.appendChild(frame);
-
-                //verify if there is a new notebook entry action
-                var actions = $scope.domainObject.getCapability('action');
-                var notebookAction = actions.getActions({'key': 'notebook-new-entry'});
-                if (notebookAction.length > 0) {
-                    notebookButtonEl = document.createElement('div');
-                    $(notebookButtonEl).addClass('notebook-button-container');
-                    notebookButtonEl.innerHTML = NEW_NOTEBOOK_BUTTON_TEMPLATE;
-                    notebookButton = frame.querySelector('.object-browse-bar .right');
-                    notebookButton.prepend(notebookButtonEl);
-                    // $(frame.querySelector('.object-holder')).addClass('container-notebook');
-                    notebookButton.addEventListener('click', function () {
-                        notebookAction[0].perform();
-                    });
-                }
-
-            }
-
-            function closeOverlay() {
-                $(frame).addClass('frame frame-template');
-                overlayContainer.removeChild(frame);
-                layoutContainer.appendChild(frame);
-                document.body.removeChild(overlay);
-                closeButton.removeEventListener('click', toggleOverlay);
-                closeButton = undefined;
-                doneButton.removeEventListener('click', toggleOverlay);
-                doneButton = undefined;
-                blocker.removeEventListener('click', toggleOverlay);
-                blocker = undefined;
-                overlayContainer = undefined;
-                overlay = undefined;
-
-
-                if (notebookButton) {
-                    notebookButton.removeChild(notebookButtonEl);
-                }
-
-            }
-
-            toggleOverlay = function (event) {
-                event.stopPropagation();
-
-                if (!isOpen) {
-                    openOverlay();
-                    isOpen = true;
-                } else {
-                    closeOverlay();
-                    isOpen = false;
-                }
-            };
-
-            $element.on('click', toggleOverlay);
-            $scope.$on('$destroy', function () {
-                $element.off('click', toggleOverlay);
-            });
-        }
-
-        return {
-            restrict: 'A',
-            link: link
-        };
-    }
-
-    return MCTModalNotebook;
-
-});

platform/features/notebook/src/directives/MCTSnapshot.js

@@ -1,130 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-define(['zepto', 'dom-to-image'], function ($) {
-    /**
-
-     */
-    function MCTSnapshot($rootScope,$document,exportImageService,dialogService,notificationService) {
-        var document = $document[0];
-
-        function link($scope, $element,$attrs) {
-            var element = $element[0];
-            var layoutContainer = element.parentElement,
-                toggleOverlay,
-                makeImg,
-                saveImg,
-                snapshot = document.createElement('div');
-
-            function openOverlay() {
-                // Remove frame classes from being applied in a non-frame context
-                $(snapshot).addClass('abs overlay l-large-view snapshot');
-                snapshot.appendChild(element);
-                document.body.appendChild(snapshot);
-            }
-
-            function closeOverlay() {
-                if (snapshot) {
-                    snapshot.removeChild(element);
-                    layoutContainer.remove();
-                }
-                document.body.removeChild(snapshot);
-                snapshot = undefined;
-                $element.remove();
-            }
-
-            toggleOverlay = function () {
-                openOverlay();
-                makeImg(element);
-            };
-
-            makeImg = function (el) {
-                var scope = $scope;
-                var dialog = dialogService.showBlockingMessage({
-                        title: "Saving...",
-                        hint: "Taking Snapshot...",
-                        unknownProgress: true,
-                        severity: "info",
-                        delay: true
-                    });
-                window.setTimeout(function () {
-                    window.domtoimage.toBlob(el).then(function (img) {    
-
-                        if (img) {
-                            if (dialog) {
-                                dialog.dismiss();
-                            }
-                            if ($element[0].dataset.entry && $element[0].dataset.embed) {
-                                saveImg(img, +$element[0].dataset.entry, +$element[0].dataset.embed);
-                                closeOverlay();
-                            } else {
-                                var reader = new window.FileReader();
-                                reader.readAsDataURL(img);
-                                reader.onloadend = function () {
-                                        $($element[0]).attr("data-snapshot", reader.result);
-                                        $rootScope.snapshot = {'src': reader.result,
-                                                                 'type': img.type,
-                                                                 'size': img.size,
-                                                                 'modified': Date.now()
-                                                              };
-                                        closeOverlay(false);
-                                        scope.$destroy();
-                                    };
-
-                            }
-
-                        } else {
-                            dialog.dismiss();
-                        }
-
-                    }, function (error) {
-                        if (dialog) {
-                            dialog.dismiss();
-                        }
-                        closeOverlay();
-                    });
-                }, 500);
-            };
-
-            saveImg = function (url,entryId,embedId) {
-                $scope.$parent.$parent.$parent.saveSnap(url, embedId, entryId);
-            };
-
-            if ($(document.body).find('.overlay.snapshot').length === 0) {
-                toggleOverlay();
-            }
-
-            $scope.$on('$destroy', function () {
-                $element.off('click', toggleOverlay);
-                $element.remove();
-            });
-        }
-
-        return {
-            restrict: 'A',
-            link: link
-        };
-    }
-
-    return MCTSnapshot;
-
-});

platform/features/notebook/src/policies/CompositionPolicy.js

@@ -1,44 +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.
- *****************************************************************************/
-
-/**
- * This bundle implements "containment" rules, which determine which objects
- * can be contained within a notebook.
- */
-define(
-    [],
-    function () {
-        function CompositionPolicy() {
-        }
-
-        CompositionPolicy.prototype.allow = function (parent, child) {
-            var parentDef = parent.getCapability('type').getName();
-
-            if (parentDef === 'Notebook' && child.getCapability('status').list().length) {
-                return false;
-            }
-            return true;
-        };
-
-        return CompositionPolicy;
-    }
-);

platform/features/notebook/src/policies/ViewPolicy.js

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

platform/features/table/src/controllers/TelemetryTableController.js

@@ -399,14 +399,14 @@ define(
             var compositionApi = this.openmct.composition;
 
             function filterForTelemetry(objects) {
-                return objects.filter(telemetryApi.canProvideTelemetry.bind(telemetryApi));
+                return objects.filter(telemetryApi.isTelemetryObject.bind(telemetryApi));
             }
 
             /*
              * If parent object is a telemetry object, subscribe to it. Do not
              * test composees.
              */
-            if (telemetryApi.canProvideTelemetry(this.domainObject)) {
+            if (telemetryApi.isTelemetryObject(this.domainObject)) {
                 return Promise.resolve([this.domainObject]);
             } else {
                 /*

platform/features/table/test/controllers/TelemetryTableControllerSpec.js

@@ -91,7 +91,7 @@ define(
                 mockScope.domainObject = mockDomainObject;
 
                 mockTelemetryAPI = jasmine.createSpyObj("telemetryAPI", [
-                    "canProvideTelemetry",
+                    "isTelemetryObject",
                     "subscribe",
                     "getMetadata",
                     "commonValuesForHints",
@@ -117,7 +117,7 @@ define(
                     return formatter;
                 });
 
-                mockTelemetryAPI.canProvideTelemetry.andReturn(false);
+                mockTelemetryAPI.isTelemetryObject.andReturn(false);
 
                 mockTimeout = jasmine.createSpy("timeout");
                 mockTimeout.andReturn(1); // Return something
@@ -199,7 +199,7 @@ define(
                     mockComposition.load.andReturn(Promise.resolve(mockChildren));
                     mockCompositionAPI.get.andReturn(mockComposition);
 
-                    mockTelemetryAPI.canProvideTelemetry.andCallFake(function (obj) {
+                    mockTelemetryAPI.isTelemetryObject.andCallFake(function (obj) {
                         return obj.identifier.key === mockTelemetryObject.identifier.key;
                     });
 
@@ -287,7 +287,7 @@ define(
                     mockChildren = mockChildren.concat(mockTelemetryChildren);
                     mockComposition.load.andReturn(Promise.resolve(mockChildren));
 
-                    mockTelemetryAPI.canProvideTelemetry.andCallFake(function (object) {
+                    mockTelemetryAPI.isTelemetryObject.andCallFake(function (object) {
                         if (object === mockTelemetryObject) {
                             return false;
                         } else {

platform/features/timeline/res/sass/_timeline-thematic.scss

@@ -53,7 +53,7 @@
             width: $d;
             position: absolute;
             top: 0;
-            @include transform(translateX(-50%));
+            transform: translateX(-50%);
         }
         &:before {
             // Icon blocker

platform/features/timeline/res/sass/_timelines.scss

@@ -177,7 +177,7 @@
 		            top: 20px; bottom: 5px;
 		            .l-labels-holder {
 			            @include absPosDefault();
-                        @include justify-content(space-between);
+                        justify-content: space-between;
 			            left: $m;
 			            .t-resource-graph-tick-label {
                             font-size: 0.9em;

platform/search/res/templates/search.html

@@ -21,7 +21,7 @@
 -->
 <div class="angular-w l-flex-col flex-elem grows holder" ng-controller="SearchController as controller">
     <div class="l-flex-col flex-elem grows holder holder-search" ng-controller="SearchMenuController as menuController">
-        <div class="search-bar search-filter-by-type flex-elem l-flex-row"
+        <div class="search-bar flex-elem l-flex-row"
              ng-controller="ToggleController as toggle"
              ng-class="{ holder: !(ngModel.input === '' || ngModel.input === undefined) }">
             <div class="holder flex-elem grows">

src/adapter/bundle.js

@@ -31,7 +31,8 @@ define([
     './policies/AdapterCompositionPolicy',
     './policies/AdaptedViewPolicy',
     './runs/AlternateCompositionInitializer',
-    './runs/TimeSettingsURLHandler'
+    './runs/TimeSettingsURLHandler',
+    './runs/TypeDeprecationChecker'
 ], function (
     legacyRegistry,
     ActionDialogDecorator,
@@ -43,7 +44,8 @@ define([
     AdapterCompositionPolicy,
     AdaptedViewPolicy,
     AlternateCompositionInitializer,
-    TimeSettingsURLHandler
+    TimeSettingsURLHandler,
+    TypeDeprecationChecker
 ) {
     legacyRegistry.register('src/adapter', {
         "extensions": {
@@ -107,6 +109,10 @@ define([
                 }
             ],
             runs: [
+                {
+                    implementation: TypeDeprecationChecker,
+                    depends: ["types[]"]
+                },
                 {
                     implementation: AlternateCompositionInitializer,
                     depends: ["openmct"]

src/adapter/runs/TypeDeprecationChecker.js

@@ -1,9 +1,9 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open openmct, 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
+ * Open openmct 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.
@@ -14,31 +14,34 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  *
- * Open MCT includes source code licensed under additional open source
+ * Open openmct includes source code licensed under additional open source
  * licenses. See the Open Source Licenses file (LICENSES.md) included with
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/**
- * Module defining SelectSnapshotController. */
-define(
-    [],
-    function () {
+/* global console */
+define([
 
-        function SelectSnapshotController($scope,$rootScope) {
+], function (
 
-            $scope.selectModel = true;
-
-            function selectprint(value) {
-                $rootScope.selValue = value;
-                $scope.$parent.$parent.ngModel[$scope.$parent.$parent.field] = value;
-            }
-
-            $scope.$watch("selectModel", selectprint);
+) {
 
+    function checkForDeprecatedFunctionality(typeDef) {
+        if (typeDef.hasOwnProperty('telemetry')) {
+            console.warn(
+                'DEPRECATION WARNING: Telemetry data on type ' +
+                'registrations will be deprecated in a future version, ' +
+                'please convert to a custom telemetry metadata provider ' +
+                'for type: ' + typeDef.key
+            );
         }
-
-        return SelectSnapshotController;
     }
-);
+
+    function TypeDeprecationChecker(types) {
+        types.forEach(checkForDeprecatedFunctionality);
+    }
+
+    return TypeDeprecationChecker;
+
+});

src/api/telemetry/DefaultMetadataProvider.js

@@ -0,0 +1,128 @@
+/*****************************************************************************
+ * Open openmct, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open openmct 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 openmct 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([
+    'lodash'
+], function (
+    _
+) {
+
+    /**
+     * This is the default metadata provider; for any object with a "telemetry"
+     * property, this provider will return the value of that property as the
+     * telemetry metadata.
+     *
+     * This provider also implements legacy support for telemetry metadata
+     * defined on the type.  Telemetry metadata definitions on type will be
+     * depreciated in the future.
+     */
+    function DefaultMetadataProvider(openmct) {
+        this.openmct = openmct;
+    }
+
+    /**
+     * Applies to any domain object with a telemetry property, or whose type
+     * definition has a telemetry property.
+     */
+    DefaultMetadataProvider.prototype.supportsMetadata = function (domainObject) {
+        return !!domainObject.telemetry || !!this.typeHasTelemetry(domainObject);
+    };
+
+    /**
+     * Retrieves valueMetadata from legacy metadata.
+     * @private
+     */
+    function valueMetadatasFromOldFormat(metadata) {
+        var valueMetadatas = [];
+
+        valueMetadatas.push({
+            key: 'name',
+            name: 'Name'
+        });
+
+        metadata.domains.forEach(function (domain, index) {
+            var valueMetadata = _.clone(domain);
+            valueMetadata.hints = {
+                domain: index + 1
+            };
+            valueMetadatas.push(valueMetadata);
+        });
+
+        metadata.ranges.forEach(function (range, index) {
+            var valueMetadata = _.clone(range);
+            valueMetadata.hints = {
+                range: index,
+                priority: index + metadata.domains.length + 1
+            };
+
+            if (valueMetadata.type === 'enum') {
+                valueMetadata.key = 'enum';
+                valueMetadata.hints.y -= 10;
+                valueMetadata.hints.range -= 10;
+                valueMetadata.enumerations =
+                    _.sortBy(valueMetadata.enumerations.map(function (e) {
+                        return {
+                            string: e.string,
+                            value: +e.value
+                        };
+                    }), 'e.value');
+                valueMetadata.values = _.pluck(valueMetadata.enumerations, 'value');
+                valueMetadata.max = _.max(valueMetadata.values);
+                valueMetadata.min = _.min(valueMetadata.values);
+            }
+
+            valueMetadatas.push(valueMetadata);
+        });
+
+        return valueMetadatas;
+    }
+
+    /**
+     * Returns telemetry metadata for a given domain object.
+     */
+    DefaultMetadataProvider.prototype.getMetadata = function (domainObject) {
+        var metadata = domainObject.telemetry || {};
+        if (this.typeHasTelemetry(domainObject)) {
+            var typeMetadata = this.typeService.getType(domainObject.type).typeDef.telemetry;
+            _.extend(metadata, typeMetadata);
+            if (!metadata.values) {
+                metadata.values = valueMetadatasFromOldFormat(metadata);
+            }
+        }
+
+        return metadata;
+    };
+
+    /**
+     * @private
+     */
+    DefaultMetadataProvider.prototype.typeHasTelemetry = function (domainObject) {
+        if (!this.typeService) {
+            this.typeService = this.openmct.$injector.get('typeService');
+        }
+        return !!this.typeService.getType(domainObject.type).typeDef.telemetry;
+    };
+
+
+    return DefaultMetadataProvider;
+
+});

src/api/telemetry/LegacyTelemetryProvider.js

@@ -141,17 +141,20 @@ define([
         return capability.subscribe(callbackWrapper, request);
     };
 
-    LegacyTelemetryProvider.prototype.limitEvaluator = function (domainObject) {
+    LegacyTelemetryProvider.prototype.supportsLimits = function (domainObject) {
         var oldObject = this.instantiate(
             utils.toOldFormat(domainObject),
-            utils.makeKeyString(domainObject.identifier));
-        var limitEvaluator = oldObject.getCapability("limit");
+            utils.makeKeyString(domainObject.identifier)
+        );
+        return oldObject.hasCapability("limit");
+    };
 
-        if (!limitEvaluator) {
-            return {
-                evaluate: function () {}
-            };
-        }
+    LegacyTelemetryProvider.prototype.getLimitEvaluator = function (domainObject) {
+        var oldObject = this.instantiate(
+            utils.toOldFormat(domainObject),
+            utils.makeKeyString(domainObject.identifier)
+        );
+        var limitEvaluator = oldObject.getCapability("limit");
 
         return {
             evaluate: function (datum, property) {
@@ -166,6 +169,7 @@ define([
         openmct.telemetry.legacyProvider = provider;
         openmct.telemetry.requestProviders.push(provider);
         openmct.telemetry.subscriptionProviders.push(provider);
+        openmct.telemetry.limitProviders.push(provider);
     };
 
 });

src/api/telemetry/TelemetryAPI.js

@@ -3,7 +3,7 @@
  * 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
+ * Open openmct 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.
@@ -14,20 +14,22 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  *
- * Open MCT includes source code licensed under additional open source
+ * Open openmct includes source code licensed under additional open source
  * licenses. See the Open Source Licenses file (LICENSES.md) included with
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-
+/*global console*/
 define([
     './TelemetryMetadataManager',
     './TelemetryValueFormatter',
+    './DefaultMetadataProvider',
     '../objects/object-utils',
     'lodash'
 ], function (
     TelemetryMetadataManager,
     TelemetryValueFormatter,
+    DefaultMetadataProvider,
     objectUtils,
     _
 ) {
@@ -122,7 +124,6 @@ define([
      */
 
 
-
     /**
      * An interface for retrieving telemetry data associated with a domain
      * object.
@@ -131,15 +132,29 @@ define([
      * @augments module:openmct.TelemetryAPI~TelemetryProvider
      * @memberof module:openmct
      */
-    function TelemetryAPI(MCT) {
-        this.MCT = MCT;
+    function TelemetryAPI(openmct) {
+        this.openmct = openmct;
         this.requestProviders = [];
         this.subscriptionProviders = [];
+        this.metadataProviders = [new DefaultMetadataProvider(this.openmct)];
+        this.limitProviders = [];
         this.metadataCache = new WeakMap();
         this.formatMapCache = new WeakMap();
         this.valueFormatterCache = new WeakMap();
     }
 
+    /**
+     * Return true if the given domainObject is a telemetry object.  A telemetry
+     * object is any object which has telemetry metadata-- regardless of whether
+     * the telemetry object has an available telemetry provider.
+     *
+     * @param {module:openmct.DomainObject} domainObject
+     * @returns {boolean} true if the object is a telemetry object.
+     */
+    TelemetryAPI.prototype.isTelemetryObject = function (domainObject) {
+        return !!this.findMetadataProvider(domainObject);
+    };
+
     /**
      * Check if this provider can supply telemetry data associated with
      * this domain object.
@@ -151,6 +166,11 @@ define([
      * @memberof module:openmct.TelemetryAPI~TelemetryProvider#
      */
     TelemetryAPI.prototype.canProvideTelemetry = function (domainObject) {
+        console.warn(
+            'DEPRECATION WARNING: openmct.telemetry.canProvideTelemetry ' +
+            'will not be supported in future versions of Open MCT.  Please ' +
+            'use openmct.telemetry.isTelemetryObject instead.'
+        );
         return !!this.findSubscriptionProvider(domainObject) ||
                !!this.findRequestProvider(domainObject);
     };
@@ -170,6 +190,12 @@ define([
         if (provider.supportsSubscribe) {
             this.subscriptionProviders.unshift(provider);
         }
+        if (provider.supportsMetadata) {
+            this.metadataProviders.unshift(provider);
+        }
+        if (provider.supportsLimits) {
+            this.limitProviders.unshift(provider);
+        }
     };
 
     /**
@@ -196,18 +222,36 @@ define([
         return this.requestProviders.filter(supportsDomainObject)[0];
     };
 
+    /**
+     * @private
+     */
+    TelemetryAPI.prototype.findMetadataProvider = function (domainObject) {
+        return this.metadataProviders.filter(function (p) {
+            return p.supportsMetadata(domainObject);
+        })[0];
+    };
+
+    /**
+     * @private
+     */
+    TelemetryAPI.prototype.findLimitEvaluator = function (domainObject) {
+        return this.limitProviders.filter(function (p) {
+            return p.supportsLimits(domainObject);
+        })[0];
+    };
+
     /**
      * @private
      */
     TelemetryAPI.prototype.standardizeRequestOptions = function (options) {
         if (!options.hasOwnProperty('start')) {
-            options.start = this.MCT.time.bounds().start;
+            options.start = this.openmct.time.bounds().start;
         }
         if (!options.hasOwnProperty('end')) {
-            options.end = this.MCT.time.bounds().end;
+            options.end = this.openmct.time.bounds().end;
         }
         if (!options.hasOwnProperty('domain')) {
-            options.domain = this.MCT.time.timeSystem().key;
+            options.domain = this.openmct.time.timeSystem().key;
         }
     };
 
@@ -300,12 +344,15 @@ define([
      */
     TelemetryAPI.prototype.getMetadata = function (domainObject) {
         if (!this.metadataCache.has(domainObject)) {
-            if (!this.typeService) {
-                this.typeService = this.MCT.$injector.get('typeService');
+            var metadataProvider = this.findMetadataProvider(domainObject);
+            if (!metadataProvider) {
+                return;
             }
+            var metadata = metadataProvider.getMetadata(domainObject);
+
             this.metadataCache.set(
                 domainObject,
-                new TelemetryMetadataManager(domainObject, this.typeService)
+                new TelemetryMetadataManager(metadata)
             );
         }
         return this.metadataCache.get(domainObject);
@@ -343,7 +390,7 @@ define([
     TelemetryAPI.prototype.getValueFormatter = function (valueMetadata) {
         if (!this.valueFormatterCache.has(valueMetadata)) {
             if (!this.formatService) {
-                this.formatService = this.MCT.$injector.get('formatService');
+                this.formatService = this.openmct.$injector.get('formatService');
             }
             this.valueFormatterCache.set(
                 valueMetadata,
@@ -375,7 +422,7 @@ define([
      * @param {Format} format the
      */
     TelemetryAPI.prototype.addFormat = function (format) {
-        this.MCT.legacyExtension('formats', {
+        this.openmct.legacyExtension('formats', {
             key: format.key,
             implementation: function () {
                 return format;
@@ -385,7 +432,9 @@ define([
 
     /**
      * Get a limit evaluator for this domain object.
-     * Limit Evaluators help you evaluate limit and alarm status of individual telemetry datums for display purposes without having to interact directly with the Limit API.
+     * Limit Evaluators help you evaluate limit and alarm status of individual
+     * telemetry datums for display purposes without having to interact directly
+     * with the Limit API.
      *
      * This method is optional.
      * If a provider does not implement this method, it is presumed
@@ -397,8 +446,34 @@ define([
      * @method limitEvaluator
      * @memberof module:openmct.TelemetryAPI~TelemetryProvider#
      */
-    TelemetryAPI.prototype.limitEvaluator = function () {
-        return this.legacyProvider.limitEvaluator.apply(this.legacyProvider, arguments);
+    TelemetryAPI.prototype.limitEvaluator = function (domainObject) {
+        return this.getLimitEvaluator(domainObject);
+    };
+
+    /**
+     * Get a limit evaluator for this domain object.
+     * Limit Evaluators help you evaluate limit and alarm status of individual
+     * telemetry datums for display purposes without having to interact directly
+     * with the Limit API.
+     *
+     * This method is optional.
+     * If a provider does not implement this method, it is presumed
+     * that no limits are defined for this domain object's telemetry.
+     *
+     * @param {module:openmct.DomainObject} domainObject the domain
+     *        object for which to evaluate limits
+     * @returns {module:openmct.TelemetryAPI~LimitEvaluator}
+     * @method limitEvaluator
+     * @memberof module:openmct.TelemetryAPI~TelemetryProvider#
+     */
+    TelemetryAPI.prototype.getLimitEvaluator = function (domainObject) {
+        var provider = this.findLimitEvaluator(domainObject);
+        if (!provider) {
+            return {
+                evaluate: function () {}
+            };
+        }
+        return provider.getLimitEvaluator(domainObject);
     };
 
     return TelemetryAPI;

src/api/telemetry/TelemetryAPISpec.js

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

src/api/telemetry/TelemetryMetadataManager.js

@@ -27,51 +27,6 @@ define([
     _
 ) {
 
-    function valueMetadatasFromOldFormat(metadata) {
-        var valueMetadatas = [];
-
-        valueMetadatas.push({
-            key: 'name',
-            name: 'Name'
-        });
-
-        metadata.domains.forEach(function (domain, index) {
-            var valueMetadata = _.clone(domain);
-            valueMetadata.hints = {
-                domain: index + 1
-            };
-            valueMetadatas.push(valueMetadata);
-        });
-
-        metadata.ranges.forEach(function (range, index) {
-            var valueMetadata = _.clone(range);
-            valueMetadata.hints = {
-                range: index,
-                priority: index + metadata.domains.length + 1
-            };
-
-            if (valueMetadata.type === 'enum') {
-                valueMetadata.key = 'enum';
-                valueMetadata.hints.y -= 10;
-                valueMetadata.hints.range -= 10;
-                valueMetadata.enumerations =
-                    _.sortBy(valueMetadata.enumerations.map(function (e) {
-                        return {
-                            string: e.string,
-                            value: +e.value
-                        };
-                    }), 'e.value');
-                valueMetadata.values = _.pluck(valueMetadata.enumerations, 'value');
-                valueMetadata.max = _.max(valueMetadata.values);
-                valueMetadata.min = _.min(valueMetadata.values);
-            }
-
-            valueMetadatas.push(valueMetadata);
-        });
-
-        return valueMetadatas;
-    }
-
     function applyReasonableDefaults(valueMetadata, index) {
         valueMetadata.source = valueMetadata.source || valueMetadata.key;
         valueMetadata.hints = valueMetadata.hints || {};
@@ -119,24 +74,14 @@ define([
     }
 
     /**
-     * Utility class for handling telemetry metadata for a domain object.
-     * Wraps old format metadata to new format metadata.
-     * Provides methods for interrogating telemetry metadata.
+     * Utility class for handling and inspecting telemetry metadata.  Applies
+     * reasonable defaults to simplify the task of providing metadata, while
+     * also providing methods for interrogating telemetry metadata.
      */
-    function TelemetryMetadataManager(domainObject, typeService) {
-        this.metadata = domainObject.telemetry || {};
+    function TelemetryMetadataManager(metadata) {
+        this.metadata = metadata;
 
-        if (this.metadata.values) {
-            this.valueMetadatas = this.metadata.values;
-        } else {
-            var typeMetadata = typeService
-                .getType(domainObject.type).typeDef.telemetry;
-
-            _.extend(this.metadata, typeMetadata);
-            this.valueMetadatas = valueMetadatasFromOldFormat(this.metadata);
-        }
-
-        this.valueMetadatas = this.valueMetadatas.map(applyReasonableDefaults);
+        this.valueMetadatas = this.metadata.values.map(applyReasonableDefaults);
     }
 
     /**

src/api/types/TypeRegistry.js

@@ -90,7 +90,7 @@ define(['./Type'], function (Type) {
     /**
      * Retrieve a registered type by its key.
      * @method get
-     * @param {string} typeKey the key for htis type
+     * @param {string} typeKey the key for this type
      * @memberof module:openmct.TypeRegistry#
      * @returns {module:openmct.Type} the registered type
      */

src/api/types/TypeRegistrySpec.js

@@ -0,0 +1,55 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(['./TypeRegistry', './Type'], function (TypeRegistry, Type) {
+    describe('The Type API', function () {
+        var typeRegistryInstance;
+
+        beforeEach(function () {
+            typeRegistryInstance = new TypeRegistry ();
+            typeRegistryInstance.addType('testType', {
+                name: 'Test Type',
+                description: 'This is a test type.',
+                creatable: true
+            });
+        });
+
+        it('types can be standardized', function () {
+            typeRegistryInstance.addType('standardizationTestType', {
+                label: 'Test Type',
+                description: 'This is a test type.',
+                creatable: true
+            });
+            typeRegistryInstance.standardizeType(typeRegistryInstance.types.standardizationTestType);
+            expect(typeRegistryInstance.get('standardizationTestType').definition.label).toBeUndefined();
+            expect(typeRegistryInstance.get('standardizationTestType').definition.name).toBe('Test Type');
+        });
+
+        it('new types are registered successfully and can be retrieved', function () {
+            expect(typeRegistryInstance.get('testType').definition.name).toBe('Test Type');
+        });
+
+        it('type registry contains new keys', function () {
+            expect(typeRegistryInstance.listKeys ()).toContain('testType');
+        });
+    });
+});

src/plugins/plot/src/chart/MCTChartController.js

@@ -61,7 +61,7 @@ function (
         this.alarmSets = [];
         this.offset = {};
         this.config = $scope.config;
-        this.listenTo(this.$scope, '$destoy', this.destroy, this);
+        this.listenTo(this.$scope, '$destroy', this.destroy, this);
         this.draw = this.draw.bind(this);
         this.scheduleDraw = this.scheduleDraw.bind(this);
         this.seriesElements = new WeakMap();
@@ -197,9 +197,29 @@ function (
         this.canvas = canvas;
         this.overlay = overlay;
         this.drawAPI = DrawLoader.getDrawAPI(canvas, overlay);
+        if (this.drawAPI) {
+            this.listenTo(this.drawAPI, 'error', this.fallbackToCanvas, this);
+        }
         return !!this.drawAPI;
     };
 
+    MCTChartController.prototype.fallbackToCanvas = function () {
+        this.stopListening(this.drawAPI);
+        DrawLoader.releaseDrawAPI(this.drawAPI);
+        // Have to throw away the old canvas elements and replace with new
+        // canvas elements in order to get new drawing contexts.
+        var div = document.createElement('div');
+        div.innerHTML = this.TEMPLATE;
+        var mainCanvas = div.querySelectorAll("canvas")[1];
+        var overlayCanvas = div.querySelectorAll("canvas")[0];
+        this.canvas.parentNode.replaceChild(mainCanvas, this.canvas);
+        this.canvas = mainCanvas;
+        this.overlay.parentNode.replaceChild(overlayCanvas, this.overlay);
+        this.overlay = overlayCanvas;
+        this.drawAPI = DrawLoader.getFallbackDrawAPI(this.canvas, this.overlay);
+        this.$scope.$emit('plot:reinitializeCanvas');
+    };
+
     MCTChartController.prototype.removeChartElement = function (series) {
         var elements = this.seriesElements.get(series);
 
@@ -211,6 +231,10 @@ function (
             this.pointSets.splice(this.pointSets.indexOf(pointSet), 1);
             pointSet.destroy();
         }, this);
+        if (elements.alarmSet) {
+            elements.alarmSet.destroy();
+            this.alarmSets.splice(this.alarmSets.indexOf(elements.alarmSet), 1);
+        }
         this.seriesElements.delete(series);
     };
 

src/plugins/plot/src/chart/MCTChartDirective.js

@@ -43,6 +43,7 @@ define([
             restrict: "E",
             template: TEMPLATE,
             link: function ($scope, $element, attrs, ctrl) {
+                ctrl.TEMPLATE = TEMPLATE;
                 var mainCanvas = $element.find("canvas")[1];
                 var overlayCanvas = $element.find("canvas")[0];
 

src/plugins/plot/src/configuration/PlotConfigurationModel.js

@@ -75,11 +75,14 @@ define([
                 openmct: options.openmct
             });
 
-            this.removeMutationListener = this.openmct.objects.observe(
-                this.get('domainObject'),
-                '*',
-                this.updateDomainObject.bind(this)
-            );
+            if (this.get('domainObject').type === 'telemetry.plot.overlay') {
+                this.removeMutationListener = this.openmct.objects.observe(
+                    this.get('domainObject'),
+                    '*',
+                    this.updateDomainObject.bind(this)
+                );
+            }
+
             this.yAxis.listenToSeriesCollection(this.series);
             this.legend.listenToSeriesCollection(this.series);
 
@@ -112,7 +115,9 @@ define([
             this.yAxis.destroy();
             this.series.destroy();
             this.legend.destroy();
-            this.removeMutationListener();
+            if (this.removeMutationListener) {
+                this.removeMutationListener();
+            }
         },
         /**
          * Return defaults, which are extracted from the passed in domain

src/plugins/plot/src/draw/Draw2D.js

@@ -22,9 +22,13 @@
 
 
 define([
-
+    'lodash',
+    'EventEmitter',
+    '../lib/eventHelpers'
 ], function (
-
+    _,
+    EventEmitter,
+    eventHelpers
 ) {
 
     /**
@@ -47,6 +51,9 @@ define([
         }
     }
 
+    _.extend(Draw2D.prototype, EventEmitter.prototype);
+    eventHelpers.extend(Draw2D.prototype);
+
     // Convert from logical to physical x coordinates
     Draw2D.prototype.x = function (v) {
         return ((v - this.origin[0]) / this.dimensions[0]) * this.width;