[Frontend] CSS tweaks

#445
Modified selector for .t-object-label to
only match first child, hopefully to prevent
nested application of the class;
Modified .loading spinner to use a fixed
size (padding) instead of percentage,
which will work better with wide, short
objects;

LICENSES.md

@@ -309,6 +309,30 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---
 
+### Modernizr
+
+#### Info
+
+* Link: http://modernizr.com
+
+* Version: 2.6.2
+
+* Author: Faruk Ateş
+
+* Description: Browser/device capability finding
+
+#### License
+
+Copyright (c) 2009–2015
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
 ### Normalize.css
 
 #### Info
@@ -452,44 +476,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---
 
-### Zepto
-
-#### Info
-
-* Link: http://zeptojs.com/
-
-* Version: 1.1.6
-
-* Authors: Thomas Fuchs
-
-* Description: DOM manipulation
-
-#### License
-
-Copyright (c) 2010-2016 Thomas Fuchs
-http://zeptojs.com/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
 ### Json.NET
 
 #### Info

api/README.md

@@ -1,20 +0,0 @@
-# API
-
-This directory is for draft API documentation and design.  The API is organized into a few major components, which are documented in their own READMEs.  See the following:
-
-* Domain Objects
-    Capabilities
-    Events
-    Mutation
-    Etc
-
-* [Object API](object-api/README.md) (encapsulates persistence), should include roots
-* [Region API](region-api/README.md) 
-* [Telemetry API](telemetry-api/README.md)
-* [Type API](type-api/README.md)
-
-Not yet started:
-
-* [Action API](action-api/README.md)
-* [Indicators API](indicators-api/README.md) -- potentially compress into regions?
-* [Plugin API](plugin-api/README.md)

api/composition-api/CompositionAPI.js

@@ -1,93 +0,0 @@
-define([
-
-], function (
-
-) {
-
-
-    var PROVIDER_REGISTRY = [];
-
-    function getProvider (object) {
-        return PROVIDER_REGISTRY.filter(function (p) {
-            return p.appliesTo(object);
-        })[0];
-    };
-
-    function composition(object) {
-        var provider = getProvider(object);
-
-        if (!provider) {
-            return;
-        }
-
-        return new CompositionCollection(object, provider);
-    };
-
-    composition.addProvider = function (provider) {
-        PROVIDER_REGISTRY.unshift(provider);
-    };
-
-    window.MCT = window.MCT || {};
-    window.MCT.composition = composition;
-
-    function CompositionCollection(domainObject, provider) {
-        this.domainObject = domainObject;
-        this.provider = provider;
-    };
-
-    CompositionCollection.prototype.add = function (child, skipMutate) {
-        if (!this._children) {
-            throw new Error("Must load composition before you can add!");
-        }
-        // we probably should not add until we have loaded.
-        // todo: should we modify parent?
-        if (!skipMutate) {
-            this.provider.add(this.domainObject, child);
-        }
-        this.children.push(child);
-        this.emit('add', child);
-    };
-
-    CompositionCollection.prototype.load = function () {
-        return this.provider.load(this.domainObject)
-            .then(function (children) {
-                this._children = [];
-                children.map(function (c) {
-                    this.add(c, true);
-                }, this);
-                this.emit('load');
-                // Todo: set up listener for changes via provider?
-            }.bind(this));
-    };
-
-    CompositionCollection.prototype.remove = function (child) {
-        var index = this.children.indexOf(child);
-        if (index === -1) {
-            throw new Error("Unable to remove child: not found in composition");
-        }
-        this.provider.remove(this.domainObject, child);
-        this.children.splice(index, 1);
-        this.emit('remove', index, child);
-    };
-
-    var DefaultCompositionProvider = {
-        appliesTo: function (domainObject) {
-            return !!domainObject.composition;
-        },
-        load: function (domainObject) {
-            return Promise.all(domainObject.composition.map(MCT.objects.get));
-        },
-        add: function (domainObject, child) {
-            domainObject.composition.push(child.key);
-        }
-    };
-
-    composition.addProvider(DefaultCompositionProvider);
-
-    function Injector() {
-        console.log('composition api injected!');
-    }
-
-    return Injector;
-
-});

api/composition-api/README.md

@@ -1,35 +0,0 @@
-# Composition API - Overview
-
-The composition API is straightforward:
-
-MCT.composition(object) -- returns a `CompositionCollection` if the object has 
-composition, returns undefined if it doesn't.
-
-## CompositionCollection
-
-Has three events:
-* `load`: when the collection has completed loading.
-* `add`: when a new object has been added to the collection.
-* `remove` when an object has been removed from the collection.
-
-Has three methods:
-
-`Collection.load()` -- returns a promise that is fulfilled when the composition 
-    has loaded.
-`Collection.add(object)` -- add a domain object to the composition.
-`Collection.remove(object)` -- remove the object from the composition.
-
-## Composition providers
-composition providers are anything that meets the following interface:
-
-* `provider.appliesTo(domainObject)` -> return true if this provider can provide 
-    composition for a given domain object.
-* `provider.add(domainObject, childObject)` -> adds object 
-* `provider.remove(domainObject, childObject)` -> immediately removes objects
-* `provider.load(domainObject)` -> returns promise for array of children
-
-There is a default composition provider which handles loading composition for 
-any object with a `composition` property.  If you want specialized composition 
-loading behavior, implement your own composition provider and register it with
-
-`MCT.composition.addProvider(myProvider)`

api/object-api/ObjectAPI.js

@@ -1,200 +0,0 @@
-define([
-    'lodash'
-], function (
-    _
-) {
-
-    /**
-        Object API.  Intercepts the existing object API while also exposing
-        A new Object API.
-
-        MCT.objects.get('mine')
-            .then(function (root) {
-                console.log(root);
-                MCT.objects.getComposition(root)
-                    .then(function (composition) {
-                        console.log(composition)
-                    })
-            });
-    */
-
-    var Objects = {},
-        ROOT_REGISTRY = [],
-        PROVIDER_REGISTRY = {},
-        FALLBACK_PROVIDER;
-
-    window.MCT = window.MCT || {};
-    window.MCT.objects = Objects;
-
-    // take a key string and turn it into a key object
-    // 'scratch:root' ==> {namespace: 'scratch', identifier: 'root'}
-    function parseKeyString(key) {
-        if (typeof key === 'object') {
-            return key;
-        }
-        var namespace = '',
-            identifier = key;
-        for (var i = 0, escaped = false, len=key.length; i < len; i++) {
-            if (key[i] === ":" && !escaped) {
-                namespace = key.slice(0, i);
-                identifier = key.slice(i + 1);
-                break;
-            }
-        }
-        return {
-            namespace: namespace,
-            identifier: identifier
-        };
-    };
-
-    // take a key and turn it into a key string
-    // {namespace: 'scratch', identifier: 'root'} ==> 'scratch:root'
-    function makeKeyString(key) {
-        if (typeof key === 'string') {
-            return key;
-        }
-        if (!key.namespace) {
-            return key.identifier;
-        }
-        return [
-            key.namespace.replace(':', '\\:'),
-            key.identifier.replace(':', '\\:')
-        ].join(':');
-    };
-
-    // Converts composition to use key strings instead of keys
-    function toOldFormat(model) {
-        delete model.key;
-        if (model.composition) {
-            model.composition = model.composition.map(makeKeyString);
-        }
-        return model;
-    };
-
-    // converts composition to use keys instead of key strings
-    function toNewFormat(model, key) {
-        model.key = key;
-        if (model.composition) {
-            model.composition = model.composition.map(parseKeyString);
-        }
-        return model;
-    };
-
-    // Root provider is hardcoded in; can't be skipped.
-    var RootProvider = {
-        'get': function () {
-            return Promise.resolve({
-                name: 'The root object',
-                type: 'root',
-                composition: ROOT_REGISTRY
-            });
-        }
-    };
-
-    // Retrieve the provider for a given key.
-    function getProvider(key) {
-        if (key.identifier === 'ROOT') {
-            return RootProvider;
-        }
-        return PROVIDER_REGISTRY[key.namespace] || FALLBACK_PROVIDER;
-    };
-
-    Objects.addProvider = function (namespace, provider) {
-        PROVIDER_REGISTRY[namespace] = provider;
-    };
-
-    [
-        'save',
-        'delete',
-        'get'
-    ].forEach(function (method) {
-        Objects[method] = function () {
-            var key = arguments[0],
-                provider = getProvider(key);
-
-            if (!provider) {
-                throw new Error('No Provider Matched');
-            }
-
-            if (!provider[method]) {
-                throw new Error('Provider does not support [' + method + '].');
-            }
-
-            return provider[method].apply(provider, arguments);
-        };
-    });
-
-    Objects.addRoot = function (key) {
-        ROOT_REGISTRY.unshift(key);
-    };
-
-    Objects.removeRoot = function (key) {
-        ROOT_REGISTRY = ROOT_REGISTRY.filter(function (k) {
-            return (
-                k.identifier !== key.identifier ||
-                k.namespace !== key.namespace
-            );
-        });
-    };
-
-    function ObjectServiceProvider(objectService, instantiate) {
-        this.objectService = objectService;
-        this.instantiate = instantiate;
-    }
-
-    ObjectServiceProvider.prototype.save = function (object) {
-        var key = object.key,
-            keyString = makeKeyString(key),
-            newObject = this.instantiate(toOldFormat(object), keyString);
-
-        return object.getCapability('persistence')
-                .persist()
-                .then(function () {
-                    return toNewFormat(object, key);
-                });
-    };
-
-    ObjectServiceProvider.prototype.delete = function (object) {
-        // TODO!
-    };
-
-    ObjectServiceProvider.prototype.get = function (key) {
-        var keyString = makeKeyString(key);
-        return this.objectService.getObjects([keyString])
-            .then(function (results) {
-                var model = JSON.parse(JSON.stringify(results[keyString].getModel()));
-                return toNewFormat(model, key);
-            });
-    };
-
-    // Injects new object API as a decorator so that it hijacks all requests.
-    // Object providers implemented on new API should just work, old API should just work, many things may break.
-    function ObjectAPIInjector(ROOTS, instantiate, objectService) {
-        this.getObjects = function (keys) {
-            var results = {},
-                promises = keys.map(function (keyString) {
-                    var key = parseKeyString(keyString);
-                    return Objects.get(key)
-                        .then(function (object) {
-                            object = toOldFormat(object)
-                            results[keyString] = instantiate(object, keyString);
-                        });
-                });
-
-            return Promise.all(promises)
-                .then(function () {
-                    return results;
-                });
-        };
-
-        FALLBACK_PROVIDER = new ObjectServiceProvider(objectService, instantiate);
-
-        ROOTS.forEach(function (r) {
-            ROOT_REGISTRY.push(parseKeyString(r.id));
-        });
-
-        return this;
-    }
-
-    return ObjectAPIInjector;
-});

api/object-api/README.md

@@ -1,101 +0,0 @@
-# Object API - Overview
-
-The object API provides methods for fetching domain objects.
-
-# Keys
-Keys are a composite identifier that is used to create and persist objects.  Ex:
-```javascript
-{
-    namespace: 'elastic',
-    identifier: 'myIdentifier'
-}
-```
-
-In old MCT days, we called this an "id", and we encoded it in a single string.  
-The above key would encode into the identifier, `elastic:myIdentifier`.
-
-When interacting with the API you will be dealing with key objects.
-
-# Configuring the Object API
-
-The following methods should be used before calling run.  They allow you to 
-configure the persistence space of MCT.
-
-* `MCT.objects.addRoot(key)` -- add a "ROOT" to Open MCT by specifying it's 
-    key.
-* `MCT.objects.removeRoot(key)` -- Remove a "ROOT" from Open MCT by key.
-* `MCT.objects.addProvider(namespace, provider)` -- register an object provider
-    for a specific namespace.  See below for documentation on the provider 
-    interface.
-    
-# Using the object API
-
-The object API provides methods for getting, saving, and deleting objects.
-
-* MCT.objects.get(key) -> returns promise for an object
-* MCT.objects.save(object) -> returns promise that is resolved when object
-    has been saved
-* MCT.objects.delete(object) -> returns promise that is resolved when object has 
-    been deleted
-
-## Configuration Example: Adding a groot
-
-The following example adds a new root object for groot and populates it with
-some pieces of groot.
-
-```javascript
-
-var ROOT_KEY = {
-    namespace: 'groot',
-    identifier: 'groot'
-};
-
-var GROOT_ROOT = {
-    name: 'I am groot',
-    type: 'folder',
-    composition: [
-        {
-            namespace: 'groot',
-            identifier: 'arms'
-        },
-        {
-            namespace: 'groot',
-            identifier: 'legs'
-        },
-        {
-            namespace: 'groot',
-            identifier: 'torso'
-        }
-    ]
-};
-
-var GrootProvider = {
-    get: function (key) {
-        if (key.identifier === 'groot') {
-            return Promise.resolve(GROOT_ROOT);
-        }
-        return Promise.resolve({
-            name: 'Groot\'s ' + key.identifier
-        });
-    }
-};
-
-MCT.objects.addRoot(ROOT_KEY);
-
-MCT.objects.addProvider('groot', GrootProvider);
-
-MCT.run();
-```
-
-### Making a custom provider:
-
-All methods on the provider interface are optional, so you do not need
-to modify them.
-
-* `provider.get(key)` -> promise for a domain object.
-* `provider.save(domainObject)` -> returns promise that is fulfilled when object 
-    has been saved.
-* `provider.delete(domainObject)` -> returns promise that is fulfilled when 
-    object has been deleted.
-
-

api/region-api/README.md

@@ -1,64 +0,0 @@
-# Region API - Overview
-
-The region API provides a method for specifying which views should display in a given region for a given domain object.  As such, they also define the basic view interface that components must define.
-
-### MCT.region.Region
-
-The base region type, all regions implement this interface.
-
-`register(view)`
-
-`getViews(domainObject)`
-
-Additionally, Regions may have subregions for different modes of the application.  Specifying a view for a region 
-
-### MCT.region.View
-
-The basic type for views.  You can extend this to implement your own functionality, or you can create your own object so long as it meets the interface.
-
-`attribute` | `type` | `note`
---- | --- | ---
-`label` | `string` or `Function` | The name of the view.  Used in the view selector when more than one view exists for an object.
-`glyph` | `string` or `Function` | The glyph to associate with this view.  Used in the view selector when more than one view exists for an object.
-`instantiate` | `Function` | constructor for a view.  Will be invoked with two arguments, `container` and `domainObject`.  It should return an object with a `destroy` method that is called when the view is removed.
-`appliesTo` | `Function` | Determines if a view applies to a specific domain object.  Will be invoked with a domainObject.  Should return a number, `priority` if the view applies to a given object.  If multiple views return a truthy value for a given object, they will be ordered by priority, and the largest priority value will be the default view for the object.  Return `false` if a view should not apply to an object.
-
-Basic Hello World:
-
-```javascript
-
-function HelloWorldView(container, domainObject) {
-    container.innerHTML = 'Hello World!';
-}
-
-HelloWorldView.label = 'Hello World';
-HelloWorldView.glyph = 'whatever';
-
-HelloWorldView.appliesTo = function (domainObject) {
-    return 10;
-};
-
-HelloWorldView.prototype.destroy = function () {
-    // clean up outstanding handlers;
-};
-
-MCT.regions.Main.register(HelloWorldView);
-
-```
-
-## Region Hierarchy
-
-Regions are organized in a hierarchy, with the most specific region taking precedence over less specific regions.
-
-If you specify a view for the Main Region, it will be used for both Edit and View modes.  You can override the Main Region view for a specific mode by registering the view with that specific mode.
-
-### MCT.regions.Tree
-### MCT.regions.Main
-### MCT.regions.Main.View
-### MCT.regions.Main.Edit
-### MCT.regions.Inspector
-### MCT.regions.Inspector.View
-### MCT.regions.Inspector.Edit
-### MCT.regions.Toolbar
-### MCT.regions.Toolbar.View
-### MCT.regions.Toolbar.Edit

api/region-api/RegionAPI.js

@@ -1,11 +0,0 @@
-define([
-    
-], function () {
-    
-    function RegionAPI() {
-        window.MCT = window.MCT || {};
-        window.MCT.regions = {};
-    }
-    
-    return RegionAPI;
-})

api/region-api/bundle.js

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

api/telemetry-api/README.md

@@ -1,71 +0,0 @@
-# Telemetry API - Overview
-
-The Telemetry API provides basic methods for retrieving historical and realtime telemetry data, retrieving telemetry metadata, and registering additional telemetry providers.   
-
-The Telemetry API also provides a set of helpers built upon these basics-- TelemetryFormatters help you format telemetry values for display purposes, LimitEvaluators help you display evaluate and display alarm states, while TelemetryCollections provide a method for seamlessly combining historical and realtime data, while supporting more advanced client side filtering and interactivity.
-
-
-## Getting Telemetry Data
-
-
-### `MCT.telemetry.request(domainObject, options)`
-
-Request historical telemetry for a domain object.  Options allows you to specify filters (start, end, etc.), sort order, and strategies for retrieving telemetry (aggregation, latest available, etc.).
-
-Returns a `Promise` for an array of telemetry values.
-
-### `MCT.telemetry.subscribe(domainObject, callback, options)`
-
-Subscribe to realtime telemetry for a specific domain object.  callback will be called whenever data is received from a realtime provider.  Options allows you to specify ???
-
-## Understanding Telemetry
-
-### `MCT.telemetry.getMetadata(domainObject)`
-
-Retrieve telemetry metadata for a domain object.  Telemetry metadata helps you understand the sort of telemetry data a domain object can provide-- for instances, the possible enumerations or states, the units, and more.
-
-### `MCT.telemetry.Formatter`
-
-Telemetry formatters help you format telemetry values for display.  Under the covers, they use telemetry metadata to interpret your telemetry data, and then they use the format API to format that data for display.
-
-
-### `MCT.telemetry.LimitEvaluator`
-
-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.  
-
-## Adding new telemetry sources
-
-### `MCT.telemetry.registerProvider(telemetryProvider)`
-
-Register a telemetry provider with the telemetry service.  This allows you to connect alternative telemetry sources to   For more information, see the `MCT.telemetry.BaseProvider`
-
-### `MCT.telemetry.BaseProvider`
-
-The base provider is a great starting point for developers who would like to implement their own telemetry provider.  At the same time, you can implement your own telemetry provider as long as it meets the TelemetryProvider (see other docs).
-
-## Other tools
-
-### `MCT.telemetry.TelemetryCollection`
-
-The TelemetryCollection is a useful tool for building advanced displays.  It helps you seamlessly handle both historical and realtime telemetry data, while making it easier to deal with large data sets and interactive displays that need to frequently requery data.
-
-
-
-# API Reference (TODO)
-
-* Telemetry Metadata
-* Request Options
-    -- start
-    -- end
-    -- sort
-    -- ???
-    -- strategies -- specify which strategies you want.  an array provides for fallback strategies without needing decoration.  Design fallbacks into API.
-
-### `MCT.telemetry.request(domainObject, options)`
-### `MCT.telemetry.subscribe(domainObject, callback, options)`
-### `MCT.telemetry.getMetadata(domainObject)`
-### `MCT.telemetry.Formatter`
-### `MCT.telemetry.LimitEvaluator`
-### `MCT.telemetry.registerProvider(telemetryProvider)`
-### `MCT.telemetry.BaseProvider`
-### `MCT.telemetry.TelemetryCollection`

api/telemetry-api/TelemetryAPI.js

@@ -1,239 +0,0 @@
-/*global define,window,console,MCT*/
-
-/**
-
-var key = '114ced6c-deb7-4169-ae71-68c571665514';
-MCT.objects.getObject([key])
-    .then(function (results) {
-        console.log('got results');
-        return results[key];
-    })
-    .then(function (domainObject) {
-        console.log('got object');
-        MCT.telemetry.subscribe(domainObject, function (datum) {
-            console.log('gotData!', datum);
-        });
-    });
-});
-
-
-*/
-
-define([
-    'lodash',
-    'eventemitter2'
-], function (
-    _,
-    EventEmitter
-) {
-
-    // format map is a placeholder until we figure out format service.
-    var FORMAT_MAP = {
-        generic: function (range) {
-            return function (datum) {
-                return datum[range.key];
-            };
-        },
-        enum: function (range) {
-            var enumMap = _.indexBy(range.enumerations, 'value');
-            return function (datum) {
-                try {
-                    return enumMap[datum[range.valueKey]].text;
-                } catch (e) {
-                    return datum[range.valueKey];
-                }
-            };
-        }
-    };
-
-    FORMAT_MAP.number =
-        FORMAT_MAP.float =
-        FORMAT_MAP.integer =
-        FORMAT_MAP.ascii =
-        FORMAT_MAP.generic;
-
-
-
-    function TelemetryAPI(
-        formatService
-    ) {
-
-        var FORMATTER_CACHE = new WeakMap(),
-            EVALUATOR_CACHE = new WeakMap();
-
-        function testAPI() {
-            var key = '114ced6c-deb7-4169-ae71-68c571665514';
-            window.MCT.objects.getObjects([key])
-                .then(function (results) {
-                    console.log('got results');
-                    return results[key];
-                })
-                .then(function (domainObject) {
-                    var formatter = new MCT.telemetry.Formatter(domainObject);
-                    console.log('got object');
-                    window.MCT.telemetry.subscribe(domainObject, function (datum) {
-                        var formattedValues = {};
-                        Object.keys(datum).forEach(function (key) {
-                            formattedValues[key] = formatter.format(datum, key);
-                        });
-                        console.log(
-                            'datum:',
-                            datum,
-                            'formatted:',
-                            formattedValues
-                        );
-                    });
-                });
-        }
-
-        function getFormatter(range) {
-            if (FORMAT_MAP[range.type]) {
-                return FORMAT_MAP[range.type](range);
-            }
-            try {
-                var format = formatService.getFormat(range.type).format.bind(
-                        formatService.getFormat(range.type)
-                    ),
-                    formatter = function (datum) {
-                        return format(datum[range.key]);
-                    };
-                return formatter;
-            } catch (e) {
-                console.log('could not retrieve format', range, e, e.message);
-                return FORMAT_MAP.generic(range);
-            }
-        }
-
-        function TelemetryFormatter(domainObject) {
-            this.metadata = domainObject.getCapability('telemetry').getMetadata();
-            this.formats = {};
-            var ranges = this.metadata.ranges.concat(this.metadata.domains);
-
-            ranges.forEach(function (range) {
-                this.formats[range.key] = getFormatter(range);
-            }, this);
-        }
-
-        /**
-         * Retrieve the 'key' from the datum and format it accordingly to
-         * telemetry metadata in domain object.
-         */
-        TelemetryFormatter.prototype.format = function (datum, key) {
-            return this.formats[key](datum);
-        };
-
-        function LimitEvaluator(domainObject) {
-            this.domainObject = domainObject;
-            this.evaluator = domainObject.getCapability('limit');
-            if (!this.evaluator) {
-                this.evalute = function () {
-                    return '';
-                }
-            }
-        }
-
-        /** TODO: Do we need a telemetry parser, or do we assume telemetry
-        is numeric by default? */
-
-        LimitEvaluator.prototype.evaluate = function (datum, key) {
-            return this.evaluator.evaluate(datum, key);
-        };
-
-        /** Basic telemetry collection, needs more magic. **/
-        function TelemetryCollection(domainObject) {
-            this.domainObject = domainObject;
-            this.data = [];
-        }
-
-        _.extend(TelemetryCollection.prototype, EventEmitter.prototype);
-
-        TelemetryCollection.prototype.request = function (options) {
-            request(this.domainObject, options).then(function (data) {
-                data.forEach(function (datum) {
-                    this.addDatum(datum);
-                }, this);
-            }.bind(this));
-        };
-
-        TelemetryCollection.prototype.addDatum = function (datum) {
-            this.data.push(datum);
-            this.emit('add', datum);
-        };
-
-        TelemetryCollection.prototype.subscribe = function (options) {
-            if (this.unsubscribe) {
-                this.unsubscribe();
-                delete this.unsubscribe;
-            }
-
-            this.unsubscribe = subscribe(
-                this.domainObject,
-                function (telemetrySeries) {
-                    telemetrySeries.getData().forEach(this.addDatum, this);
-                }.bind(this),
-                options
-            );
-        };
-
-        function registerProvider(provider) {
-            // Not yet implemented.
-            console.log('registering provider', provider);
-        }
-
-        function registerEvaluator(evaluator) {
-            // not yet implemented.
-            console.log('registering evaluator', evaluator);
-        }
-
-        function request(domainObject, options) {
-            return domainObject.getCapability('telemetry')
-                .requestData(options)
-                .then(function (telemetrySeries) {
-                    return telemetrySeries.getData();
-                });
-        }
-
-        function subscribe(domainObject, callback, options) {
-            return domainObject.getCapability('telemetry')
-                .subscribe(function (series) {
-                    series.getData().forEach(callback);
-                }, options);
-        }
-
-        var Telemetry = {
-            registerProvider: registerProvider,
-            registerEvaluator: registerEvaluator,
-            request: request,
-            subscribe: subscribe,
-            getMetadata: function (domainObject) {
-                return domainObject.getCapability('telemetry').getMetadata();
-            },
-            Formatter: function (domainObject) {
-                if (!FORMATTER_CACHE.has(domainObject)) {
-                    FORMATTER_CACHE.set(
-                        domainObject,
-                        new TelemetryFormatter(domainObject)
-                    );
-                }
-                return FORMATTER_CACHE.get(domainObject);
-            },
-            LimitEvaluator: function (domainObject) {
-                if (!EVALUATOR_CACHE.has(domainObject)) {
-                    EVALUATOR_CACHE.set(
-                        domainObject,
-                        new LimitEvaluator(domainObject)
-                    );
-                }
-                return EVALUATOR_CACHE.get(domainObject);
-            }
-        };
-
-        window.MCT = window.MCT || {};
-        window.MCT.telemetry = Telemetry;
-        window.testAPI = testAPI;
-
-        return Telemetry;
-    }
-
-    return TelemetryAPI;
-});

api/telemetry-api/bundle.js

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

api/type-api/README.md

@@ -1,31 +0,0 @@
-# Type API - Overview
-
-The Type API allows you to register type information for domain objects, and allows you to retrieve type information about a given domain object.  Crucially, type information allows you to add new creatible object types.
-
-### MCT.types.Type
-
-The basic interface for a type.  You can extend this to implement your own type,
-or you can provide an object that implements the same interface.
-
-`attribute` | `type` | `note`
---- | --- | ---
-`label` | `String` | The human readible name of the type.
-`key` | `String` | The unique identifier for this type.  
-`glyph` | `String` | The glyph identifier for the type.  Displayed in trees, labels, and other locations.
-`description` | `String` | A basic description of the type visible in the create menu.
-`isCreatible` | `Boolean`, `Number`, or `Function` | If truthy, this type will be visible in the create menu.  Note that objects not in the create menu can be instantiated via other means.
-`namespace` | `String` | The object namespace that provides instances of this type.  This allows you to implement custom object providers for specific types while still utilizing other namespaces for persistence.
-`properties` | `Object` | Object defining properties of an instance of this class.  Properties are used for automatic form generation and automated metadata display.  For more information on the definition of this object, look at (some resource-- jsonschema?)
-`canContain` | `Function` | determins whether objects of this type can contain other objects.  Will be invoked with a domain object.  Return true to allow composition, return false to disallow composition.
-
-### MCT.types.register(type)
-
-Register a type with the type API.  Registering a type with the same key as another type will replace the original type definition.
-
-### MCT.types.getType(typeKey)
-
-Returns the type definition for a given typeKey.  returns undefined if type does not exist.
-
-### MCT.types.getType(domainObject)
-
-Return the type definition for a given domain object.

api/type-api/TypeAPI.js

@@ -1,10 +0,0 @@
-define([
-    
-], function () {
-    function TypeAPI() {
-        window.MCT = window.MCT || {};
-        window.MCT.types = {};
-    }
-    
-    return TypeAPI;
-});

bower.json

@@ -17,9 +17,6 @@
     "screenfull": "^3.0.0",
     "node-uuid": "^1.4.7",
     "comma-separated-values": "^3.6.4",
-    "FileSaver.js": "^0.0.2",
-    "zepto": "^1.1.6",
-    "eventemitter2": "^1.0.0",
-    "lodash": "3.10.1"
+    "FileSaver.js": "^0.0.2"
   }
 }

docs/src/guide/index.md

@@ -6,13 +6,12 @@ Victor Woeltjen
 September 23, 2015  
 Document Version 1.1  
 
-Date                | Version   | Summary of Changes        | Author
-------------------- | --------- | ------------------------- | ---------------
-April 29, 2015      | 0         | Initial Draft             | Victor Woeltjen
-May 12, 2015        | 0.1       |                           | Victor Woeltjen
-June 4, 2015        | 1.0       | Name Changes              | Victor Woeltjen
-October 4, 2015     | 1.1       | Conversion to MarkDown    | Andrew Henry
-April 5, 2016       | 1.2       | Added Mct-table directive | Andrew Henry
+Date                | Version   | Summary of Changes      | Author
+------------------- | --------- | ----------------------- | ---------------
+April 29, 2015      | 0         | Initial Draft           | Victor Woeltjen
+May 12, 2015        | 0.1       |                         | Victor Woeltjen
+June 4, 2015        | 1.0       | Name Changes            | Victor Woeltjen
+October 4, 2015     | 1.1       | Conversion to MarkDown  | Andrew Henry
 
 # Introduction
 The purpose of this guide is to familiarize software developers with the Open
@@ -1601,61 +1600,6 @@ there are items .
         ] 
     }
 
-## Table
-
-The `mct-table` directive provides a generic table component, with optional 
-sorting and filtering capabilities. The table can be pre-populated with data 
-by setting the `rows` parameter, and it can be updated in real-time using the
-`add:row` and `remove:row` broadcast events. The table will expand to occupy 
-100% of the size of its containing element. The table is highly optimized for 
-very large data sets.
-
-### Events
-
-The table supports two events for notifying that the rows have changed. For 
-performance reasons, the table does not monitor the content of `rows` 
-constantly. 
-
-* `add:row`: A `$broadcast` event that will notify the table that a new row 
-has been added to the table.
-
-eg. The code below adds a new row, and alerts the table using the `add:row` 
-event. Sorting and filtering will be applied automatically by the table component.
-
-```
-$scope.rows.push(newRow);
-$scope.$broadcast('add:row', $scope.rows.length-1);
-```
-
-* `remove:row`: A `$broadcast` event that will notify the table that a row 
-should be removed from the table.
-
-eg. The code below removes a row from the rows array, and then alerts the table 
-to its removal.
-    
-```
-$scope.rows.slice(5, 1);
-$scope.$broadcast('remove:row', 5);
-```
-
-### Parameters
-
-* `headers`: An array of string values which will constitute the column titles
- that appear at the top of the table. Corresponding values are specified in 
- the rows using the header title provided here.
-* `rows`: An array of objects containing row values. Each element in the 
-array must be an associative array, where the key corresponds to a column header. 
-* `enableFilter`: A boolean that if true, will enable searching and result 
-filtering. When enabled, each column will have a text input field that can be
-used to filter the table rows in real time.
-* `enableSort`: A boolean determining whether rows can be sorted. If true, 
-sorting will be enabled allowing sorting by clicking on column headers. Only 
-one column may be sorted at a time.
-* `autoScroll`: A boolean value that if true, will cause the table to automatically 
-scroll to the bottom as new data arrives. Auto-scroll can be disengaged manually 
-by scrolling away from the bottom of the table, and can also be enabled manually 
-by scrolling to the bottom of the table rows.
-
 # Services 
 
 The Open MCT Web platform provides a variety of services which can be retrieved 

docs/src/process/cycle.md

@@ -151,9 +151,11 @@ emphasis on testing.
   ensuring software passes that testing in order to ship on time;
   may prefer to disable malfunctioning components and fix them
   in a subsequent sprint, for example.
-* [__Ship.__](version.md) Tag a code snapshot that has passed release/sprint
-  testing and deploy that version. (Only true if relevant
-  testing has passed by this point; if testing has not
+* __Ship.__ Tag a code snapshot that has passed acceptance
+  testing and deploy that version. (Only true if acceptance
+  testing has passed by this point; if acceptance testing has not
   been passed, will need to make ad hoc decisions with stakeholders,
   e.g. "extend the sprint" or "defer shipment until end of next
   sprint.")
+
+

docs/src/process/index.md

@@ -3,10 +3,8 @@
 The process used to develop Open MCT Web is described in the following
 documents:
 
-* The [Development Cycle](cycle.md) describes how and when specific
+* [Development Cycle](cycle.md): Describes how and when specific
   process points are repeated during development.
-* The [Version Guide](version.md) describes version numbering for
-  Open MCT (both semantics and process.)
 * Testing is described in two documents:
   * The [Test Plan](testing/plan.md) summarizes the approaches used
     to test Open MCT Web.

docs/src/process/version.md

@@ -1,142 +0,0 @@
-# Version Guide
-
-This document describes semantics and processes for providing version
-numbers for Open MCT, and additionally provides guidelines for dependent
-projects developed by the same team.
-
-Versions are incremented at specific points in Open MCT's
-[Development Cycle](cycle.md); see that document for a description of
-sprints and releases.
-
-## Audience
-
-Individuals interested in consuming version numbers can be categorized as
-follows:
-
-* _Users_: Generally disinterested, occasionally wish to identify version
-  to cross-reference against documentation, or to report issues.
-* _Testers_: Want to identify which version of the software they are
-  testing, e.g. to file issues for defects.
-* _Internal developers_: Often, inverse of testers; want to identify which
-  version of software was/is in use when certain behavior is observed. Want
-  to be able to correlate versions in use with “streams” of development
-  (e.g. dev vs. prod), when possible.
-* _External developers_: Need to understand which version of software is
-  in use when developing/maintaining plug-ins, in order to ensure
-  compatibility of their software.
-
-## Version Reporting
-
-Software versions should be reflected in the user interface of the
-application in three ways:
-
-* _Version number_: A semantic version (see below) which serves both to
-  uniquely identify releases, as well as to inform plug-in developers
-  about compatibility with previous releases.
-* _Revision identifier_: While using git, the commit hash. Supports
-  internal developers and testers by uniquely identifying client
-  software snapshots.
-* _Branding_: Identifies which variant is in use. (Typically, Open MCT
-  is re-branded when deployed for a specific mission or center.)
-
-## Version Numbering
-
-Open MCT shall provide version numbers consistent with
-[Semantic Versioning 2.0.0](http://semver.org/). In summary, versions
-are expressed in a "major.minor.patch" form, and incremented based on
-nature of changes to external API. Breaking changes require a "major"
-version increment; backwards-compatible changes require a "minor"
-version increment; neutral changes (such as bug fixes) require a "patch"
-version increment. A hyphen-separated suffix indicates a pre-release
-version, which may be unstable or may not fully meet compatibility
-requirements.
-
-Additionally, the following project-specific standards will be used:
-
-* During development, a "-SNAPSHOT" suffix shall be appended to the
-  version number. The version number before the suffix shall reflect
-  the next expected version number for release.
-* Prior to a 1.0.0 release, the _minor_ version will be incremented
-  on a per-release basis; the _patch_ version will be incremented on a
-  per-sprint basis.
-* Starting at version 1.0.0, version numbers will be updated with each
-  completed sprint. The version number for the sprint shall be
-  determined relative to the previous released version; the decision
-  to increment the _major_, _minor_, or _patch_ version should be
-  made based on the nature of changes during that release. (It is
-  recommended that these numbers are incremented as changes are
-  introduced, such that at end of release the version number may
-  be chosen by simply removing the suffix.)
-* The first three sprints in a release may be unstable; in these cases, a
-  unique version identifier should still be generated, but a suffix
-  should be included to indicate that the version is not necessarily
-  production-ready. Recommended suffixes are:
-
- Sprint |  Suffix
-:------:|:--------:
-   1    | `-alpha`
-   2    | `-beta`
-   3    | `-rc`
-
-### Scope of External API
-
-"External API" refers to the API exposed to, documented for, and used by
-plug-in developers. Changes to interfaces used internally by Open MCT
-(or otherwise not documented for use externally) require only a _patch_
-version bump.
-
-## Incrementing Versions
-
-At the end of a sprint, the [project manager](cycle.md#roles)
-should update (or delegate the task of updating) Open MCT version
-numbers by the following process:
-
-1. Update version number in `package.json`
-  1. Remove `-SNAPSHOT` suffix.
-  2. Verify that resulting version number meets semantic versioning
-     requirements relative to previous stable version. Increment if
-     necessary.
-  3. If version is considered unstable (which may be the case during
-     the first three sprints of a release), apply a new suffix per
-     [Version Numbering](#version-numbering) guidance above.
-2. Tag the release.
-  1. Commit changes to `package.json` on the `master` branch.
-     The commit message should reference the sprint being closed,
-     preferably by a URL reference to the associated Milestone in
-     GitHub.
-  2. Verify that build still completes, that application passes
-     smoke-testing, and that only differences from tested versions
-     are the changes to version number above.
-  3. Push the `master` branch.
-  4. Tag this commit with the version number, prepending the letter "v".
-     (e.g. `git tag v0.9.3-alpha`)
-  5. Push the tag to GitHub. (e.g. `git push origin v0.9.3-alpha`).
-3. Upload a release archive.
-  1. Run `npm pack` to generate the archive.
-  2. Use the [GitHub release interface](https://github.com/nasa/openmct/releases)
-     to draft a new release.
-  3. Choose the existing tag for the new version (created and pushed above.)
-     Enter the tag name as the release name as well; see existing releases
-     for examples.
-  4. Attach the release archive.
-  5. Designate the release as a "pre-release" as appropriate (for instance,
-     when the version number has been suffixed as unstable, or when
-     the version number is below 1.0.0.)
-4. Restore snapshot status in `package.json`
-  1. Remove any suffix from the version number, or increment the
-     _patch_ version if there is no suffix.
-  2. Append a `-SNAPSHOT` suffix.
-  3. Commit changes to `package.json` on the `master` branch.
-     The commit message should reference the sprint being opened,
-     preferably by a URL reference to the associated Milestone in
-     GitHub.
-  4. Verify that build still completes, that application passes
-     smoke-testing.
-  5. Push the `master` branch.
-
-Projects dependent on Open MCT being co-developed by the Open MCT
-team should follow a similar process, except that they should
-additionally update their dependency on Open MCT to point to the
-latest archive when removing their `-SNAPSHOT` status, and
-that they should be pointed back to the `master` branch after
-this has completed.

example/eventGenerator/bundle.js

@@ -32,7 +32,7 @@ define([
 
     legacyRegistry.register("example/eventGenerator", {
         "name": "Event Message Generator",
-        "description": "For development use. Creates sample event message data that mimics a live data stream.",
+        "description": "Example of a component that produces event data.",
         "extensions": {
             "components": [
                 {
@@ -49,26 +49,16 @@ define([
                 {
                     "key": "eventGenerator",
                     "name": "Event Message Generator",
-                    "glyph": "\u0066",
-                    "description": "For development use. Creates sample event message data that mimics a live data stream.",
-                    "priority": 10,
+                    "glyph": "f",
+                    "description": "An event message generator",
                     "features": "creation",
                     "model": {
                         "telemetry": {}
                     },
                     "telemetry": {
                         "source": "eventGenerator",
-                        "domains": [
-                            {
-                                "key": "time",
-                                "name": "Time",
-                                "format": "utc"
-                            }
-                        ],
                         "ranges": [
                             {
-                                "key": "message",
-                                "name": "Message",
                                 "format": "string"
                             }
                         ]

example/eventGenerator/src/EventTelemetryProvider.js

@@ -37,8 +37,7 @@ define(
             var
 	            subscriptions = [],
 	            genInterval = 1000,
-                generating = false,
-                id = Math.random() * 100000;
+	            startTime = Date.now();
 
             //
             function matchesSource(request) {
@@ -80,13 +79,11 @@ define(
             }
 
             function startGenerating() {
-                generating = true;
                 $timeout(function () {
+	                //console.log("startGenerating... " + Date.now());
                     handleSubscriptions();
-                    if (generating && subscriptions.length > 0) {
+                    if (subscriptions.length > 0) {
                         startGenerating();
-                    } else {
-                        generating = false;
                     }
                 }, genInterval);
             }
@@ -96,6 +93,7 @@ define(
                     callback: callback,
                     requests: requests
                 };
+
                 function unsubscribe() {
                     subscriptions = subscriptions.filter(function (s) {
                         return s !== subscription;
@@ -103,7 +101,8 @@ define(
                 }
 
                 subscriptions.push(subscription);
-                if (!generating) {
+
+                if (subscriptions.length === 1) {
                     startGenerating();
                 }
 

example/generator/bundle.js

@@ -36,7 +36,7 @@ define([
 
     legacyRegistry.register("example/generator", {
         "name": "Sine Wave Generator",
-        "description": "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
+        "description": "Example of a component that produces dataa.",
         "extensions": {
             "components": [
                 {
@@ -86,9 +86,8 @@ define([
                 {
                     "key": "generator",
                     "name": "Sine Wave Generator",
-                    "glyph": "\u0054",
-                    "description": "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
-                    "priority": 10,
+                    "glyph": "T",
+                    "description": "A sine wave generator",
                     "features": "creation",
                     "model": {
                         "telemetry": {
@@ -100,46 +99,26 @@ define([
                         "domains": [
                             {
                                 "key": "time",
-                                "name": "Time",
-                                "type": "utc"
+                                "name": "Time"
                             },
                             {
                                 "key": "yesterday",
-                                "name": "Yesterday",
-                                "type": "utc"
+                                "name": "Yesterday"
                             },
                             {
                                 "key": "delta",
                                 "name": "Delta",
-                                "type": "example.delta"
+                                "format": "example.delta"
                             }
                         ],
                         "ranges": [
                             {
                                 "key": "sin",
-                                "name": "Sine",
-                                "type": "generic"
+                                "name": "Sine"
                             },
                             {
                                 "key": "cos",
-                                "name": "Cosine",
-                                "type": "generic"
-                            },
-                            {
-                                "key": "positive",
-                                "name": "Positive Sine?",
-                                "type": "enum",
-                                "valueKey": "positive",
-                                "enumerations": [
-                                    {
-                                        "value": 0,
-                                        "text": "FALSE"
-                                    },
-                                    {
-                                        "value": 1,
-                                        "text": "TRUE"
-                                    }
-                                ]
+                                "name": "Cosine"
                             }
                         ]
                     },
@@ -147,7 +126,7 @@ define([
                         {
                             "name": "Period",
                             "control": "textfield",
-                            "cssclass": "l-input-sm l-numeric",
+                            "cssclass": "l-small l-numeric",
                             "key": "period",
                             "required": true,
                             "property": [

example/generator/src/SinewaveLimitCapability.js

@@ -62,9 +62,6 @@ define(
                 },
                 evaluate: function (datum, range) {
                     range = range || 'sin';
-                    if (['sin', 'cos'].indexOf(range) === -1) {
-                        return '';
-                    }
                     if (datum[range] > RED) {
                         return LIMITS.rh;
                     }
@@ -87,4 +84,4 @@ define(
 
         return SinewaveLimitCapability;
     }
-);
+);

example/generator/src/SinewaveTelemetryProvider.js

@@ -19,11 +19,10 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define,setInterval,clearInterval*/
+/*global define,Promise*/
 
 /**
  * Module defining SinewaveTelemetryProvider. Created by vwoeltje on 11/12/14.
- * Rewritten by larkin on 05/06/2016.
  */
 define(
     ["./SinewaveTelemetrySeries"],
@@ -35,108 +34,81 @@ define(
          * @constructor
          */
         function SinewaveTelemetryProvider($q, $timeout) {
-            this.$q = $q;
-            this.$timeout = $timeout;
-        }
+            var subscriptions = [];
 
-        SinewaveTelemetryProvider.prototype.canHandleRequest = function (request) {
-            return request.source === 'generator';
-        };
+            //
+            function matchesSource(request) {
+                return request.source === "generator";
+            }
 
-        SinewaveTelemetryProvider.prototype.requestTelemetry = function (requests) {
-            var sinewaveRequests = requests.filter(this.canHandleRequest, this),
-                response = {
-                    generator: {}
+            // Used internally; this will be repacked by doPackage
+            function generateData(request) {
+                return {
+                    key: request.key,
+                    telemetry: new SinewaveTelemetrySeries(request)
                 };
+            }
 
-            sinewaveRequests.forEach(function (request) {
-                response.generator[request.key] = this.singleRequest(request);
-            }, this);
-
-            return response;
-        };
-
-        SinewaveTelemetryProvider.prototype.subscribe = function (callback, requests) {
-            var sinewaveRequests = requests.filter(this.canHandleRequest, this),
-                unsubscribers = sinewaveRequests.map(function (request) {
-                    return this.singleSubscribe(
-                        function (series) {
-                            var response = {
-                                generator: {}
-                            };
-                            response.generator[request.key] = series;
-                            callback(response);
-                        },
-                        request
-                    );
-                }, this);
-
-            return function () {
-                unsubscribers.forEach(function (unsubscribe) {
-                    unsubscribe();
+            //
+            function doPackage(results) {
+                var packaged = {};
+                results.forEach(function (result) {
+                    packaged[result.key] = result.telemetry;
                 });
-            };
-        };
+                // Format as expected (sources -> keys -> telemetry)
+                return { generator: packaged };
+            }
 
-        SinewaveTelemetryProvider.prototype.singleRequest = function (request) {
-            var start = Math.floor(request.start / 1000) * 1000,
-                end = Math.floor(request.end / 1000) * 1000,
-                period = request.period || 30,
-                data = [],
-                current,
-                i;
+            function requestTelemetry(requests) {
+                return $timeout(function () {
+                    return doPackage(requests.filter(matchesSource).map(generateData));
+                }, 0);
+            }
 
-            for (current = start; current <= end; current += 2000) {
-                i = Math.floor((current - start) / 1000);
-                data.push({
-                    sin: Math.sin(i * Math.PI * 2 / period),
-                    cos: Math.cos(i * Math.PI * 2 / period),
-                    positive: Math.sin(i * Math.PI * 2 / period) >= 0,
-                    time: current,
-                    yesterday: current - (60 * 60 * 24 * 1000),
-                    delta: current
+            function handleSubscriptions() {
+                subscriptions.forEach(function (subscription) {
+                    var requests = subscription.requests;
+                    subscription.callback(doPackage(
+                        requests.filter(matchesSource).map(generateData)
+                    ));
                 });
             }
-            return new SinewaveTelemetrySeries(data);
-        };
 
+            function startGenerating() {
+                $timeout(function () {
+                    handleSubscriptions();
+                    if (subscriptions.length > 0) {
+                        startGenerating();
+                    }
+                }, 1000);
+            }
 
-        SinewaveTelemetryProvider.prototype.singleSubscribe = function (callback, options) {
-            // calculate interval position based on start - end; such that this data will line up with data generated by singleRequest.
-            var start = Math.floor((options.start || Date.now()) / 1000) * 1000,
-                currentTime = Math.floor((options.end || Date.now()) / 1000) * 1000,
-                period = options.period || 30,
-                unsubscribe,
-                generatePoint,
-                interval;
+            function subscribe(callback, requests) {
+                var subscription = {
+                    callback: callback,
+                    requests: requests
+                };
 
-            generatePoint = function () {
-                var i = Math.floor((currentTime - start) / 1000),
-                    point = {
-                        sin: Math.sin(i * Math.PI * 2 / period),
-                        cos: Math.cos(i * Math.PI * 2 / period),
-                        positive: Math.sin(i * Math.PI * 2 / period) >= 0,
-                        time: currentTime,
-                        yesterday: currentTime - (60 * 60 * 24 * 1000),
-                        delta: currentTime
-                    };
-                currentTime += 1000;
-                return point;
+                function unsubscribe() {
+                    subscriptions = subscriptions.filter(function (s) {
+                        return s !== subscription;
+                    });
+                }
+
+                subscriptions.push(subscription);
+
+                if (subscriptions.length === 1) {
+                    startGenerating();
+                }
+
+                return unsubscribe;
+            }
+
+            return {
+                requestTelemetry: requestTelemetry,
+                subscribe: subscribe
             };
-
-            interval = setInterval(function () {
-                var series = new SinewaveTelemetrySeries(generatePoint());
-                callback(series);
-            }, 1000);
-
-            unsubscribe = function () {
-                clearInterval(interval);
-            };
-
-            return unsubscribe;
-        };
-
-
+        }
 
         return SinewaveTelemetryProvider;
     }

example/generator/src/SinewaveTelemetrySeries.js

@@ -32,37 +32,47 @@ define(
         var ONE_DAY = 60 * 60 * 24,
             firstObservedTime = Math.floor(SinewaveConstants.START_TIME / 1000);
 
-        function SinewaveTelemetrySeries(data) {
-            if (!Array.isArray(data)) {
-                data = [data];
+        /**
+         *
+         * @constructor
+         */
+        function SinewaveTelemetrySeries(request) {
+            var timeOffset = (request.domain === 'yesterday') ? ONE_DAY : 0,
+                latestTime = Math.floor(Date.now() / 1000) - timeOffset,
+                firstTime = firstObservedTime - timeOffset,
+                endTime = (request.end !== undefined) ?
+                        Math.floor(request.end / 1000) : latestTime,
+                count = Math.min(endTime, latestTime) - firstTime,
+                period = +request.period || 30,
+                generatorData = {},
+                requestStart = (request.start === undefined) ? firstTime :
+                        Math.max(Math.floor(request.start / 1000), firstTime),
+                offset = requestStart - firstTime;
+
+            if (request.size !== undefined) {
+                offset = Math.max(offset, count - request.size);
             }
-            this.data = data;
+
+            generatorData.getPointCount = function () {
+                return count - offset;
+            };
+
+            generatorData.getDomainValue = function (i, domain) {
+                // delta uses the same numeric values as the default domain,
+                // so it's not checked for here, just formatted for display
+                // differently.
+                return (i + offset) * 1000 + firstTime * 1000 -
+                    (domain === 'yesterday' ? (ONE_DAY * 1000) : 0);
+            };
+
+            generatorData.getRangeValue = function (i, range) {
+                range = range || "sin";
+                return Math[range]((i + offset) * Math.PI * 2 / period);
+            };
+
+            return generatorData;
         }
 
-        SinewaveTelemetrySeries.prototype.getPointCount = function () {
-            return this.data.length;
-        };
-
-        SinewaveTelemetrySeries.prototype.getDomainValue = function (i, domain) {
-            return this.getDatum(i)[domain];
-        };
-
-        SinewaveTelemetrySeries.prototype.getRangeValue = function (i, range) {
-            return this.getDatum(i)[range];
-        };
-
-        SinewaveTelemetrySeries.prototype.getDatum = function (i) {
-            if (i >= this.data.length || i < 0) {
-                throw new Error('IndexOutOfRange: index not available in series.');
-            }
-            return this.data[i];
-        };
-
-        SinewaveTelemetrySeries.prototype.getData = function () {
-            return this.data;
-        };
-
         return SinewaveTelemetrySeries;
-
     }
 );

example/imagery/bundle.js

@@ -49,10 +49,8 @@ define([
                 {
                     "key": "imagery",
                     "name": "Example Imagery",
-                    "glyph": "\u00e3",
+                    "glyph": "T",
                     "features": "creation",
-                    "description": "For development use. Creates example imagery data that mimics a live imagery stream.",
-                    "priority": 10,
                     "model": {
                         "telemetry": {}
                     },

example/msl/bundle.js

@@ -54,7 +54,7 @@ define([
             {
                 "name": "Measurement",
                 "key": "msl.measurement",
-                "glyph": "\u0054",
+                "glyph": "T",
                 "model": {"telemetry": {}},
                 "telemetry": {
                     "source": "rems.source",

example/plotOptions/bundle.js

@@ -80,10 +80,9 @@ define([
             "types": [
                 {
                     "key": "plot",
-                    "name": "Example Telemetry Plot",
-                    "glyph": "\u0074",
-                    "description": "For development use. A plot for displaying telemetry.",
-                    "priority": 10,
+                    "name": "Telemetry Plot",
+                    "glyph": "t",
+                    "description": "A plot for displaying telemetry",
                     "delegates": [
                         "telemetry"
                     ],

gulpfile.js

@@ -60,8 +60,7 @@ var gulp = require('gulp'),
             singleRun: true
         },
         sass: {
-            includePaths: bourbon.includePaths,
-            sourceComments: true
+            includePaths: bourbon.includePaths
         },
         replace: {
             variables: {
@@ -91,8 +90,7 @@ gulp.task('stylesheets', function () {
         .pipe(sourcemaps.init())
         .pipe(sass(options.sass).on('error', sass.logError))
         .pipe(rename(function (file) {
-            file.dirname =
-                file.dirname.replace(path.sep + 'sass', path.sep + 'css');
+            file.dirname = file.dirname.replace('/sass', '/css');
             return file;
         }))
         .pipe(sourcemaps.write('.'))

karma.conf.js

@@ -81,12 +81,7 @@ module.exports = function(config) {
         coverageReporter: {
             dir: process.env.CIRCLE_ARTIFACTS ?
                 process.env.CIRCLE_ARTIFACTS + '/coverage' :
-                "dist/coverage",
-            check: {
-                global: {
-                    lines: 80
-                }
-            }
+                "dist/coverage"
         },
 
         // HTML test reporting.

main.js

@@ -33,10 +33,7 @@ requirejs.config({
         "saveAs": "bower_components/FileSaver.js/FileSaver.min",
         "screenfull": "bower_components/screenfull/dist/screenfull.min",
         "text": "bower_components/text/text",
-        "uuid": "bower_components/node-uuid/uuid",
-        "zepto": "bower_components/zepto/zepto.min",
-        "eventemitter2": "bower_components/eventemitter2/lib/eventemitter2",
-        "lodash": "bower_components/lodash/lodash"
+        "uuid": "bower_components/node-uuid/uuid"
     },
     "shim": {
         "angular": {
@@ -47,9 +44,6 @@ requirejs.config({
         },
         "moment-duration-format": {
             "deps": [ "moment" ]
-        },
-        "zepto": {
-            "exports": "Zepto"
         }
     }
 });
@@ -76,12 +70,13 @@ define([
     './platform/exporters/bundle',
     './platform/telemetry/bundle',
     './platform/features/clock/bundle',
+    './platform/features/events/bundle',
     './platform/features/imagery/bundle',
     './platform/features/layout/bundle',
     './platform/features/pages/bundle',
     './platform/features/plot/bundle',
+    './platform/features/scrolling/bundle',
     './platform/features/timeline/bundle',
-    './platform/features/table/bundle',
     './platform/forms/bundle',
     './platform/identity/bundle',
     './platform/persistence/aggregator/bundle',
@@ -92,10 +87,6 @@ define([
     './platform/search/bundle',
     './platform/status/bundle',
     './platform/commonUI/regions/bundle',
-    './api/telemetry-api/bundle',
-    './api/object-api/bundle',
-    './api/composition-api/bundle',
-    './example/scratchpad/bundle',
 
     './example/imagery/bundle',
     './example/eventGenerator/bundle',
@@ -109,4 +100,4 @@ define([
             return new Main().run(legacyRegistry);
         }
     };
-});
+});

package.json

@@ -1,7 +1,7 @@
 {
   "name": "openmctweb",
-  "version": "0.10.1-SNAPSHOT",
-  "description": "The Open MCT core platform",
+  "version": "0.9.2-SNAPSHOT",
+  "description": "The Open MCT Web core platform",
   "dependencies": {
     "express": "^4.13.1",
     "minimist": "^1.1.1",
@@ -38,7 +38,7 @@
     "moment": "^2.11.1",
     "node-bourbon": "^4.2.3",
     "phantomjs-prebuilt": "^2.1.0",
-    "requirejs": "2.1.x",
+    "requirejs": "^2.1.17",
     "split": "^1.0.0"
   },
   "scripts": {
@@ -49,7 +49,7 @@
     "jsdoc": "jsdoc -c jsdoc.json -r -d target/docs/api",
     "otherdoc": "node docs/gendocs.js --in docs/src --out target/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",
     "docs": "npm run jsdoc ; npm run otherdoc",
-    "prepublish": "node ./node_modules/bower/bin/bower install && node ./node_modules/gulp/bin/gulp.js install"
+    "prepublish": "./node_modules/bower/bin/bower install && ./node_modules/gulp/bin/gulp.js install"
   },
   "repository": {
     "type": "git",

platform/commonUI/browse/bundle.js

@@ -111,11 +111,10 @@ define([
                         "$scope",
                         "$route",
                         "$location",
-                        "$window",
+                        "$q",
                         "objectService",
                         "navigationService",
                         "urlService",
-                        "policyService",
                         "DEFAULT_PATH"
                     ]
                 },
@@ -135,7 +134,9 @@ define([
                     "depends": [
                         "$scope",
                         "$location",
-                        "$route"
+                        "$route",
+                        "$q",
+                        "navigationService"
                     ]
                 },
                 {
@@ -169,10 +170,6 @@ define([
                 }
             ],
             "representations": [
-                {
-                    "key": "view-object",
-                    "templateUrl": "templates/view-object.html"
-                },
                 {
                     "key": "browse-object",
                     "template": browseObjectTemplate,

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

@@ -44,7 +44,27 @@
         </div>
     </div>
     <div class="holder l-flex-col flex-elem grows l-object-wrapper">
-        <div class="holder l-flex-col flex-elem grows l-object-wrapper-inner">
+        <div ng-if="isEditable" class="holder l-flex-col flex-elem grows l-object-wrapper-inner">
+            <!-- Toolbar and Save/Cancel buttons -->
+            <div class="l-edit-controls flex-elem l-flex-row flex-align-end">
+                <mct-toolbar name="mctToolbar"
+                             structure="toolbar.structure"
+                             ng-model="toolbar.state"
+                             class="flex-elem grows">
+                </mct-toolbar>
+                <mct-representation key="'edit-action-buttons'"
+                                    mct-object="domainObject"
+                                    class='flex-elem conclude-editing'>
+                </mct-representation>
+
+            </div>
+            <mct-representation key="representation.selected.key"
+                                mct-object="representation.selected.key && domainObject"
+                                class="abs flex-elem grows object-holder-main scroll"
+                                toolbar="toolbar">
+            </mct-representation>
+        </div>
+        <div ng-if="!isEditable" class="holder l-flex-col flex-elem grows l-object-wrapper-inner">
             <!-- Toolbar and Save/Cancel buttons -->
             <div class="l-edit-controls flex-elem l-flex-row flex-align-end">
                 <mct-representation key="'edit-action-buttons'"

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

@@ -63,7 +63,7 @@
                     <mct-split-pane class='l-object-and-inspector contents abs' anchor='right'>
                         <div class='split-pane-component t-object pane primary-pane left'>
                             <mct-representation mct-object="navigatedObject"
-                                                key="'view-object'"
+                                                key="'browse-object'"
                                                 class="abs holder holder-object">
                             </mct-representation>
                         </div>

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

@@ -32,7 +32,6 @@
         </li>
         <li ng-if="contextutalParents.length > 0">
             <em class="t-inspector-part-header" title="The location of this linked object.">Location</em>
-            <div ng-if="primaryParents.length > 0" class="section-header">This Object</div>
             <span class="inspector-location"
                   ng-repeat="parent in contextutalParents"
                   ng-class="{ last:($index + 1) === contextualParents.length }">
@@ -45,7 +44,7 @@
             </span>
         </li>
         <li ng-if="primaryParents.length > 0">
-            <div class="section-header">Object's Original</div>
+            <em class="t-inspector-part-header" title="The location of the original object that this was linked from.">Original Location</em>
             <span class="inspector-location"
                   ng-repeat="parent in primaryParents"
                   ng-class="{ last:($index + 1) === primaryParents.length }">

platform/commonUI/browse/src/BrowseController.js

@@ -27,12 +27,14 @@
  */
 define(
     [
-        '../../../representation/src/gestures/GestureConstants'
+        '../../../representation/src/gestures/GestureConstants',
+        '../../edit/src/objects/EditableDomainObject'
     ],
-    function (GestureConstants) {
+    function (GestureConstants, EditableDomainObject) {
         "use strict";
 
-        var ROOT_ID = "ROOT";
+        var ROOT_ID = "ROOT",
+            CONFIRM_MSG = "Unsaved changes will be lost if you leave this page.";
 
         /**
          * The BrowseController is used to populate the initial scope in Browse
@@ -45,20 +47,26 @@ define(
          * @constructor
          */
         function BrowseController(
-            $scope, 
-            $route, 
-            $location, 
-            $window, 
-            objectService, 
-            navigationService, 
-            urlService, 
-            policyService,
+            $scope,
+            $route,
+            $location,
+            $q,
+            objectService,
+            navigationService,
+            urlService,
             defaultPath
         ) {
             var path = [ROOT_ID].concat(
                 ($route.current.params.ids || defaultPath).split("/")
             );
 
+            function isDirty(){
+                var editorCapability = $scope.navigatedObject &&
+                        $scope.navigatedObject.getCapability("editor"),
+                    hasChanges = editorCapability && editorCapability.dirty();
+                return hasChanges;
+            }
+
             function updateRoute(domainObject) {
                 var priorRoute = $route.current,
                     // Act as if params HADN'T changed to avoid page reload
@@ -75,35 +83,31 @@ define(
                 // urlService.urlForLocation used to adjust current
                 // path to new, addressed, path based on
                 // domainObject
-                $location.path(urlService.urlForLocation("browse", domainObject));
+                $location.path(urlService.urlForLocation("browse",
+                    domainObject.hasCapability('editor') ?
+                        domainObject.getOriginalObject() : domainObject));
 
             }
 
             // Callback for updating the in-scope reference to the object
             // that is currently navigated-to.
             function setNavigation(domainObject) {
-                var navigationAllowed = true;
-
                 if (domainObject === $scope.navigatedObject){
                     //do nothing;
                     return;
                 }
 
-                policyService.allow("navigation", $scope.navigatedObject, domainObject, function(message){
-                    navigationAllowed = $window.confirm(message + "\r\n\r\n" +
-                        " Are you sure you want to continue?");
-                });
-
-                if (navigationAllowed) {
+                if (isDirty() && !confirm(CONFIRM_MSG)) {
+                    $scope.treeModel.selectedObject = $scope.navigatedObject;
+                    navigationService.setNavigation($scope.navigatedObject);
+                } else {
+                    if ($scope.navigatedObject && $scope.navigatedObject.hasCapability("editor")){
+                        $scope.navigatedObject.getCapability("editor").cancel();
+                    }
                     $scope.navigatedObject = domainObject;
                     $scope.treeModel.selectedObject = domainObject;
                     navigationService.setNavigation(domainObject);
                     updateRoute(domainObject);
-                } else {
-                    //If navigation was unsuccessful (ie. blocked), reset
-                    // the selected object in the tree to the currently
-                    // navigated object
-                    $scope.treeModel.selectedObject = $scope.navigatedObject ;
                 }
             }
 
@@ -180,13 +184,18 @@ define(
                 selectedObject: navigationService.getNavigation()
             };
 
+            $scope.beforeUnloadWarning = function() {
+                return isDirty() ?
+                    "Unsaved changes will be lost if you leave this page." :
+                    undefined;
+            };
+
             // Listen for changes in navigation state.
             navigationService.addListener(setNavigation);
 
-            // Also listen for changes which come from the tree. Changes in
-            // the tree will trigger a change in browse navigation state.
+            // Also listen for changes which come from the tree
             $scope.$watch("treeModel.selectedObject", setNavigation);
-
+            
             // Clean up when the scope is destroyed
             $scope.$on("$destroy", function () {
                 navigationService.removeListener(setNavigation);

platform/commonUI/browse/src/BrowseObjectController.js

@@ -22,8 +22,11 @@
 /*global define,Promise*/
 
 define(
-    [],
-    function () {
+    [
+        '../../../representation/src/gestures/GestureConstants',
+        '../../edit/src/objects/EditableDomainObject'
+    ],
+    function (GestureConstants, EditableDomainObject) {
         "use strict";
 
         /**
@@ -32,7 +35,7 @@ define(
          * @memberof platform/commonUI/browse
          * @constructor
          */
-        function BrowseObjectController($scope, $location, $route) {
+        function BrowseObjectController($scope, $location, $route, $q, navigationService) {
             var navigatedObject;
             function setViewForDomainObject(domainObject) {
                 
@@ -54,9 +57,10 @@ define(
 
             function updateQueryParam(viewKey) {
                 var unlisten,
-                    priorRoute = $route.current;
+                    priorRoute = $route.current,
+                    isEditMode = $scope.domainObject && $scope.domainObject.hasCapability('editor');
 
-                if (viewKey) {
+                if (viewKey && !isEditMode) {
                     $location.search('view', viewKey);
                     unlisten = $scope.$on('$locationChangeSuccess', function () {
                         // Checks path to make sure /browse/ is at front
@@ -72,6 +76,10 @@ define(
             $scope.$watch('domainObject', setViewForDomainObject);
             $scope.$watch('representation.selected.key', updateQueryParam);
 
+            $scope.cancelEditing = function() {
+                navigationService.setNavigation($scope.domainObject.getDomainObject());
+            };
+
             $scope.doAction = function (action){
                 return $scope[action] && $scope[action]();
             };

platform/commonUI/browse/src/creation/AddAction.js

@@ -93,23 +93,27 @@ define(
                 return wizard.populateObjectFromInput(formValue, newObject);
             }
 
-            function persistAndReturn(domainObject) {
-                return domainObject.getCapability('persistence')
-                    .persist()
-                    .then(function () {
-                        return domainObject;
-                    });
-            }
-
             function addToParent (populatedObject) {
                 parentObject.getCapability('composition').add(populatedObject);
-                return persistAndReturn(parentObject);
+                return parentObject.getCapability('persistence').persist().then(function(){
+                    return parentObject;
+                });
+            }
+
+            function save(object) {
+                /*
+                It's necessary to persist the new sub-object in order
+                 that it can be retrieved for composition in the parent.
+                 Future refactoring that allows temporary objects to be
+                 retrieved from object services will make this unnecessary.
+                 */
+                return object.getCapability('editor').save(true);
             }
 
             return this.dialogService
                 .getUserInput(wizard.getFormStructure(false), wizard.getInitialFormValue())
                 .then(populateObjectFromInput)
-                .then(persistAndReturn)
+                .then(save)
                 .then(addToParent);
 
         };

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

@@ -59,7 +59,6 @@ define(
                     callback(value);
                 });
             }
-            return true;
         };
 
         /**

platform/commonUI/browse/test/BrowseControllerSpec.js

@@ -29,7 +29,8 @@ define(
     function (BrowseController) {
         "use strict";
 
-        describe("The browse controller", function () {
+        //TODO: Disabled for NEM Beta
+        xdescribe("The browse controller", function () {
             var mockScope,
                 mockRoute,
                 mockLocation,
@@ -39,8 +40,6 @@ define(
                 mockUrlService,
                 mockDomainObject,
                 mockNextObject,
-                mockWindow,
-                mockPolicyService,
                 testDefaultRoot,
                 controller;
 
@@ -57,25 +56,14 @@ define(
                     mockScope,
                     mockRoute,
                     mockLocation,
-                    mockWindow,
                     mockObjectService,
                     mockNavigationService,
                     mockUrlService,
-                    mockPolicyService,
                     testDefaultRoot
                 );
             }
 
             beforeEach(function () {
-                mockWindow = jasmine.createSpyObj('$window', [
-                   "confirm"
-                ]);
-                mockWindow.confirm.andReturn(true);
-
-                mockPolicyService = jasmine.createSpyObj('policyService', [
-                    'allow'
-                ]);
-
                 testDefaultRoot = "some-root-level-domain-object";
 
                 mockScope = jasmine.createSpyObj(
@@ -226,10 +214,7 @@ define(
                 // prior to setting $route.current
                 mockLocation.path.andReturn("/browse/");
 
-                mockNavigationService.setNavigation.andReturn(true);
-
                 // Exercise the Angular workaround
-                mockNavigationService.addListener.mostRecentCall.args[0]();
                 mockScope.$on.mostRecentCall.args[1]();
                 expect(mockUnlisten).toHaveBeenCalled();
 
@@ -240,36 +225,6 @@ define(
                 );
             });
 
-            it("after successful navigation event sets the selected tree " +
-                "object", function () {
-                mockScope.navigatedObject = mockDomainObject;
-                mockNavigationService.setNavigation.andReturn(true);
-
-                //Simulate a change in selected tree object
-                mockScope.treeModel = {selectedObject: mockDomainObject};
-                mockScope.$watch.mostRecentCall.args[1](mockNextObject);
-
-                expect(mockScope.treeModel.selectedObject).toBe(mockNextObject);
-                expect(mockScope.treeModel.selectedObject).not.toBe(mockDomainObject);
-            });
-
-            it("after failed navigation event resets the selected tree" +
-                " object", function () {
-                mockScope.navigatedObject = mockDomainObject;
-                mockWindow.confirm.andReturn(false);
-                mockPolicyService.allow.andCallFake(function(category, object, context, callback){
-                    callback("unsaved changes");
-                    return false;
-                });
-
-                //Simulate a change in selected tree object
-                mockScope.treeModel = {selectedObject: mockDomainObject};
-                mockScope.$watch.mostRecentCall.args[1](mockNextObject);
-
-                expect(mockScope.treeModel.selectedObject).not.toBe(mockNextObject);
-                expect(mockScope.treeModel.selectedObject).toBe(mockDomainObject);
-            });
-
         });
     }
 );

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

@@ -86,4 +86,4 @@ define(
 
         });
     }
-);
+);

platform/commonUI/edit/bundle.js

@@ -22,25 +22,21 @@
 /*global define*/
 
 define([
+    "./src/controllers/EditController",
     "./src/controllers/EditActionController",
     "./src/controllers/EditPanesController",
     "./src/controllers/ElementsController",
-    "./src/controllers/EditObjectController",
     "./src/directives/MCTBeforeUnload",
     "./src/actions/LinkAction",
     "./src/actions/EditAction",
     "./src/actions/PropertiesAction",
     "./src/actions/RemoveAction",
     "./src/actions/SaveAction",
-    "./src/actions/SaveAsAction",
     "./src/actions/CancelAction",
     "./src/policies/EditActionPolicy",
-    "./src/policies/EditableLinkPolicy",
-    "./src/policies/EditableMovePolicy",
-    "./src/policies/EditNavigationPolicy",
-    "./src/policies/EditContextualActionPolicy",
     "./src/representers/EditRepresenter",
     "./src/representers/EditToolbarRepresenter",
+    "text!./res/templates/edit.html",
     "text!./res/templates/library.html",
     "text!./res/templates/edit-object.html",
     "text!./res/templates/edit-action-buttons.html",
@@ -48,25 +44,21 @@ define([
     "text!./res/templates/topbar-edit.html",
     'legacyRegistry'
 ], function (
+    EditController,
     EditActionController,
     EditPanesController,
     ElementsController,
-    EditObjectController,
     MCTBeforeUnload,
     LinkAction,
     EditAction,
     PropertiesAction,
     RemoveAction,
     SaveAction,
-    SaveAsAction,
     CancelAction,
     EditActionPolicy,
-    EditableLinkPolicy,
-    EditableMovePolicy,
-    EditNavigationPolicy,
-    EditContextualActionPolicy,
     EditRepresenter,
     EditToolbarRepresenter,
+    editTemplate,
     libraryTemplate,
     editObjectTemplate,
     editActionButtonsTemplate,
@@ -78,7 +70,22 @@ define([
 
     legacyRegistry.register("platform/commonUI/edit", {
         "extensions": {
+            "routes": [
+                {
+                    "when": "/edit",
+                    "template": editTemplate
+                }
+            ],
             "controllers": [
+                {
+                    "key": "EditController",
+                    "implementation": EditController,
+                    "depends": [
+                        "$scope",
+                        "$q",
+                        "navigationService"
+                    ]
+                },
                 {
                     "key": "EditActionController",
                     "implementation": EditActionController,
@@ -99,15 +106,6 @@ define([
                     "depends": [
                         "$scope"
                     ]
-                },
-                {
-                    "key": "EditObjectController",
-                    "implementation": EditObjectController,
-                    "depends": [
-                        "$scope",
-                        "$location",
-                        "policyService"
-                    ]
                 }
             ],
             "directives": [
@@ -169,15 +167,6 @@ define([
                     "implementation": SaveAction,
                     "name": "Save",
                     "description": "Save changes made to these objects.",
-                    "depends": [],
-                    "priority": "mandatory"
-                },
-                {
-                    "key": "save",
-                    "category": "conclude-editing",
-                    "implementation": SaveAsAction,
-                    "name": "Save",
-                    "description": "Save changes made to these objects.",
                     "depends": [
                         "$injector",
                         "policyService",
@@ -203,26 +192,7 @@ define([
                 {
                     "category": "action",
                     "implementation": EditActionPolicy
-                },
-                {
-                    "category": "action",
-                    "implementation": EditContextualActionPolicy,
-                    "depends": ["navigationService", "editModeBlacklist", "nonEditContextBlacklist"]
-                },
-                {
-                    "category": "action",
-                    "implementation": EditableMovePolicy
-                },
-                {
-                    "category": "action",
-                    "implementation": EditableLinkPolicy
-                },
-                {
-                    "category": "navigation",
-                    "message": "There are unsaved changes.",
-                    "implementation": EditNavigationPolicy
                 }
-
             ],
             "templates": [
                 {
@@ -236,9 +206,6 @@ define([
                     "template": editObjectTemplate,
                     "uses": [
                         "view"
-                    ],
-                    "gestures": [
-                        "drop"
                     ]
                 },
                 {
@@ -274,16 +241,6 @@ define([
                 {
                     "implementation": EditToolbarRepresenter
                 }
-            ],
-            "constants": [
-                {
-                    "key":"editModeBlacklist",
-                    "value": ["copy", "follow", "window", "link", "locate"]
-                },
-                {
-                    "key": "nonEditContextBlacklist",
-                    "value": ["copy", "follow", "properties", "move", "link", "remove", "locate"]
-                }
             ]
         }
     });

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

@@ -19,51 +19,50 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div class="abs l-flex-col" ng-controller="EditObjectController as EditObjectController">
-    <div mct-before-unload="EditObjectController.getUnloadWarning()"
-         class="holder flex-elem l-flex-row object-browse-bar ">
-        <div class="items-select left flex-elem l-flex-row grows">
-            <mct-representation key="'back-arrow'"
-                                mct-object="domainObject"
-                                class="flex-elem l-back"></mct-representation>
-            <mct-representation key="'object-header'"
-                                mct-object="domainObject"
-                                class="l-flex-row flex-elem grows object-header">
-            </mct-representation>
-        </div>
-        <div class="btn-bar right l-flex-row flex-elem flex-justify-end flex-fixed">
-            <mct-representation key="'switcher'"
-                                mct-object="domainObject"
-                                ng-model="representation">
-            </mct-representation>
-            <!-- Temporarily, on mobile, the action buttons are hidden-->
-            <mct-representation key="'action-group'"
-                                mct-object="domainObject"
-                                parameters="{ category: 'view-control' }"
-                                class="mobile-hide">
-            </mct-representation>
-        </div>
-    </div>
-    <div class="holder l-flex-col flex-elem grows l-object-wrapper">
-        <div class="holder l-flex-col flex-elem grows l-object-wrapper-inner">
-            <!-- Toolbar and Save/Cancel buttons -->
-            <div class="l-edit-controls flex-elem l-flex-row flex-align-end">
-                <mct-toolbar name="mctToolbar"
-                             structure="toolbar.structure"
-                             ng-model="toolbar.state"
-                             class="flex-elem grows">
-                </mct-toolbar>
-                <mct-representation key="'edit-action-buttons'"
-                                    mct-object="domainObject"
-                                    class='flex-elem conclude-editing'>
-                </mct-representation>
-
-            </div>
+<mct-representation key="'topbar-edit'"
+                    mct-object="domainObject"
+                    ng-model="representation">
+</mct-representation>
+<div class="holder edit-area abs">
+    <mct-split-pane class='contents abs' anchor='right'>
+        <div class='split-pane-component pane left edit-main'>
+            <mct-toolbar name="mctToolbar"
+                         structure="toolbar.structure"
+                         ng-model="toolbar.state">
+            </mct-toolbar>
             <mct-representation key="representation.selected.key"
+                                toolbar="toolbar"
                                 mct-object="representation.selected.key && domainObject"
-                                class="abs flex-elem grows object-holder-main scroll"
-                                toolbar="toolbar">
+                                class="holder abs object-holder work-area">
             </mct-representation>
-        </div><!--/ l-object-wrapper-inner -->
-    </div>
+        </div>
+        <mct-splitter></mct-splitter>
+        <div
+            class='split-pane-component pane right edit-objects menus-to-left'
+            ng-controller='EditPanesController as editPanes'
+            >
+            <mct-split-pane class='contents abs' anchor='bottom'>
+                <div
+                    class="abs pane top accordion"
+                    ng-controller="ToggleController as toggle"
+                    >
+                    <mct-container key="accordion" label="Library">
+                        <mct-representation key="'tree'"
+                                            mct-object="editPanes.getRoot()">
+                        </mct-representation>
+                    </mct-container>
+                </div>
+                <mct-splitter></mct-splitter>
+                <div
+                    class="abs pane bottom accordion"
+                    ng-controller="ToggleController as toggle"
+                    >
+                    <mct-container key="accordion" label="Elements">
+                        <mct-representation key="'edit-elements'" mct-object="domainObject">
+                        </mct-representation>
+                    </mct-container>
+                </div>
+            </mct-split-pane>
+        </div>
+    </mct-split-pane>
 </div>

platform/commonUI/edit/res/templates/edit.html

@@ -19,12 +19,14 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div ng-controller="TableOptionsController" class="l-controls-first flex-elem grows l-inspector-part">
-    <em class="t-inspector-part-header" title="Display properties for this object">Table Options</em>
-    <mct-form
-            ng-model="configuration.table.columns"
-            structure="columnsForm"
-            name="columnsFormState"
-            class="flex-elem l-flex-row no-validate no-margin">
-    </mct-form>
-</div>
+<div content="jquery-wrapper"
+     class="abs holder-all edit-mode"
+     ng-controller="EditController as editMode"
+     mct-before-unload="editMode.getUnloadWarning()">
+
+    <mct-representation key="'edit-object'" mct-object="editMode.navigatedObject()">
+    </mct-representation>
+
+    <mct-include key="'bottombar'"></mct-include>
+
+</div>

platform/commonUI/edit/res/templates/elements.html

@@ -19,19 +19,16 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div ng-controller="ElementsController" class="flex-elem l-flex-col holder grows">
+<div ng-controller="ElementsController">
     <mct-include key="'input-filter'"
                  class="flex-elem holder"
                  ng-model="filterBy">
     </mct-include>
-    <div class="flex-elem grows vscroll">
+    <div class="current-elements abs" style="height: 100%;">
         <ul class="tree">
             <li ng-repeat="containedObject in composition | filter:searchText">
                 <span class="tree-item">
-                    <mct-representation
-                            class="rep-object-label"
-                            key="'label'"
-                            mct-object="containedObject">
+                    <mct-representation key="'label'" mct-object="containedObject">
                     </mct-representation>
                 </span>
             </li>

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

@@ -72,26 +72,13 @@ define(
          * Enter edit mode.
          */
         EditAction.prototype.perform = function () {
-            var self = this;
+            var editableObject;
             if (!this.domainObject.hasCapability("editor")) {
-                //TODO: This is only necessary because the drop gesture is
-                // wrapping the object itself, need to refactor this later.
-                // All responsibility for switching into edit mode should be
-                // in the edit action, and not duplicated in the gesture
-                this.domainObject = new EditableDomainObject(this.domainObject, this.$q);
+                editableObject = new EditableDomainObject(this.domainObject, this.$q);
+                editableObject.getCapability('status').set('editing', true);
+                this.navigationService.setNavigation(editableObject);
             }
-            this.navigationService.setNavigation(this.domainObject);
-            this.domainObject.getCapability('status').set('editing', true);
-
-            //Register a listener to automatically cancel this edit action
-            //if the user navigates away from this object.
-            function cancelEditing(navigatedTo){
-                if (!navigatedTo || navigatedTo.getId() !== self.domainObject.getId()) {
-                    self.domainObject.getCapability('editor').cancel();
-                    self.navigationService.removeListener(cancelEditing);
-                }
-            }
-            this.navigationService.addListener(cancelEditing);
+            //this.$location.path("/edit");
         };
 
         /**

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

@@ -24,8 +24,8 @@
 
 
 define(
-    [],
-    function () {
+    ['../../../browse/src/creation/CreateWizard'],
+    function (CreateWizard) {
         'use strict';
 
         /**
@@ -37,11 +37,31 @@ define(
          * @memberof platform/commonUI/edit
          */
         function SaveAction(
+            $injector,
+            policyService,
+            dialogService,
+            creationService,
+            copyService,
             context
         ) {
             this.domainObject = (context || {}).domainObject;
+            this.injectObjectService = function(){
+                this.objectService = $injector.get("objectService");
+            };
+            this.policyService = policyService;
+            this.dialogService = dialogService;
+            this.creationService = creationService;
+            this.copyService = copyService;
         }
 
+        SaveAction.prototype.getObjectService = function(){
+            // Lazily acquire object service (avoids cyclical dependency)
+            if (!this.objectService) {
+                this.injectObjectService();
+            }
+            return this.objectService;
+        };
+
         /**
          * Save changes and conclude editing.
          *
@@ -50,7 +70,9 @@ define(
          * @memberof platform/commonUI/edit.SaveAction#
          */
         SaveAction.prototype.perform = function () {
-            var domainObject = this.domainObject;
+            var domainObject = this.domainObject,
+                copyService = this.copyService,
+                self = this;
 
             function resolveWith(object){
                 return function () {
@@ -58,13 +80,64 @@ define(
                 };
             }
 
+            function doWizardSave(parent) {
+                var context = domainObject.getCapability("context"),
+                    wizard = new CreateWizard(
+                        domainObject,
+                        parent,
+                        self.policyService
+                    );
+
+                return self.dialogService
+                    .getUserInput(
+                        wizard.getFormStructure(true),
+                        wizard.getInitialFormValue()
+                    )
+                    .then(wizard.populateObjectFromInput.bind(wizard));
+            }
+
+            function fetchObject(objectId){
+                return self.getObjectService().getObjects([objectId]).then(function(objects){
+                    return objects[objectId];
+                });
+            }
+
+            function getParent(object){
+                return fetchObject(object.getModel().location);
+            }
+
+            function allowClone(objectToClone) {
+                return (objectToClone.getId() === domainObject.getId()) ||
+                    objectToClone.getCapability('location').isOriginal();
+            }
+
+            function cloneIntoParent(parent) {
+                return copyService.perform(domainObject, parent, allowClone);
+            }
+
+            function cancelEditingAfterClone(clonedObject) {
+                return domainObject.getCapability("editor").cancel()
+                    .then(resolveWith(clonedObject));
+            }
+
             // Invoke any save behavior introduced by the editor capability;
             // this is introduced by EditableDomainObject which is
             // used to insulate underlying objects from changes made
             // during editing.
             function doSave() {
-                return domainObject.getCapability("editor").save()
-                    .then(resolveWith(domainObject.getOriginalObject()));
+                //This is a new 'virtual object' that has not been persisted
+                // yet.
+                if (domainObject.getModel().persisted === undefined){
+                    return getParent(domainObject)
+                        .then(doWizardSave)
+                        .then(getParent)
+                        .then(cloneIntoParent)
+                        .then(cancelEditingAfterClone)
+                        .catch(resolveWith(false));
+                } else {
+                    return domainObject.getCapability("editor").save()
+                        .then(resolveWith(domainObject.getOriginalObject()));
+                }
             }
 
             // Discard the current root view (which will be the editing
@@ -89,8 +162,7 @@ define(
         SaveAction.appliesTo = function (context) {
             var domainObject = (context || {}).domainObject;
             return domainObject !== undefined &&
-                domainObject.hasCapability("editor") &&
-                domainObject.getModel().persisted !== undefined;
+                domainObject.hasCapability("editor");
         };
 
         return SaveAction;

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

@@ -1,169 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-/*jslint es5: true */
-
-
-define(
-    ['../../../browse/src/creation/CreateWizard'],
-    function (CreateWizard) {
-        'use strict';
-
-        /**
-         * The "Save" action; the action triggered by clicking Save from
-         * Edit Mode. Exits the editing user interface and invokes object
-         * capabilities to persist the changes that have been made.
-         * @constructor
-         * @implements {Action}
-         * @memberof platform/commonUI/edit
-         */
-        function SaveAsAction(
-            $injector,
-            policyService,
-            dialogService,
-            creationService,
-            copyService,
-            context
-        ) {
-            this.domainObject = (context || {}).domainObject;
-            this.injectObjectService = function(){
-                this.objectService = $injector.get("objectService");
-            };
-            this.policyService = policyService;
-            this.dialogService = dialogService;
-            this.creationService = creationService;
-            this.copyService = copyService;
-        }
-
-        /**
-         * @private
-         */
-        SaveAsAction.prototype.createWizard = function (parent) {
-            return new CreateWizard(
-                this.domainObject,
-                parent,
-                this.policyService
-            );
-        };
-
-        /**
-         * @private
-         */
-        SaveAsAction.prototype.getObjectService = function(){
-            // Lazily acquire object service (avoids cyclical dependency)
-            if (!this.objectService) {
-                this.injectObjectService();
-            }
-            return this.objectService;
-        };
-
-        function resolveWith(object){
-            return function () {
-                return object;
-            };
-        }
-
-        /**
-         * Save changes and conclude editing.
-         *
-         * @returns {Promise} a promise that will be fulfilled when
-         *          cancellation has completed
-         * @memberof platform/commonUI/edit.SaveAction#
-         */
-        SaveAsAction.prototype.perform = function () {
-            // Discard the current root view (which will be the editing
-            // UI, which will have been pushed atop the Browse UI.)
-            function returnToBrowse(object) {
-                if (object) {
-                    object.getCapability("action").perform("navigate");
-                }
-                return object;
-            }
-
-            return this.save().then(returnToBrowse);
-        };
-
-        /**
-         * @private
-         */
-        SaveAsAction.prototype.save = function () {
-            var self = this,
-                domainObject = this.domainObject,
-                copyService = this.copyService;
-
-            function doWizardSave(parent) {
-                var wizard = self.createWizard(parent);
-
-                return self.dialogService
-                    .getUserInput(wizard.getFormStructure(true),
-                        wizard.getInitialFormValue()
-                    ).then(wizard.populateObjectFromInput.bind(wizard));
-            }
-
-            function fetchObject(objectId){
-                return self.getObjectService().getObjects([objectId]).then(function(objects){
-                    return objects[objectId];
-                });
-            }
-
-            function getParent(object){
-                return fetchObject(object.getModel().location);
-            }
-
-            function allowClone(objectToClone) {
-                return (objectToClone.getId() === domainObject.getId()) ||
-                    objectToClone.getCapability('location').isOriginal();
-            }
-
-            function cloneIntoParent(parent) {
-                return copyService.perform(domainObject, parent, allowClone);
-            }
-
-            function cancelEditingAfterClone(clonedObject) {
-                return domainObject.getCapability("editor").cancel()
-                    .then(resolveWith(clonedObject));
-            }
-
-            return getParent(domainObject)
-                .then(doWizardSave)
-                .then(getParent)
-                .then(cloneIntoParent)
-                .then(cancelEditingAfterClone)
-                .catch(resolveWith(false));
-        };
-
-        /**
-         * Check if this action is applicable in a given context.
-         * This will ensure that a domain object is present in the context,
-         * and that this domain object is in Edit mode.
-         * @returns true if applicable
-         */
-        SaveAsAction.appliesTo = function (context) {
-            var domainObject = (context || {}).domainObject;
-            return domainObject !== undefined &&
-                domainObject.hasCapability("editor") &&
-                domainObject.getModel().persisted === undefined;
-        };
-
-        return SaveAsAction;
-    }
-);

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

@@ -124,6 +124,7 @@ define(
          */
         EditorCapability.prototype.cancel = function () {
             this.editableObject.getCapability("status").set("editing", false);
+            //TODO: Reset the cache as well here.
             this.cache.markClean();
             return resolvePromise(undefined);
         };

platform/commonUI/edit/src/controllers/EditController.js

@@ -26,64 +26,59 @@
  * @namespace platform/commonUI/edit
  */
 define(
-    [],
-    function () {
+    ["../objects/EditableDomainObject"],
+    function (EditableDomainObject) {
         "use strict";
 
         /**
          * Controller which is responsible for populating the scope for
-         * Edit mode
+         * Edit mode; introduces an editable version of the currently
+         * navigated domain object into the scope.
          * @memberof platform/commonUI/edit
          * @constructor
          */
-        function EditObjectController($scope, $location, policyService) {
-            this.scope = $scope;
-            this.policyService = policyService;
+        function EditController($scope, $q, navigationService) {
+            var self = this;
 
-            var navigatedObject;
-            function setViewForDomainObject(domainObject) {
-
-                var locationViewKey = $location.search().view;
-
-                function selectViewIfMatching(view) {
-                    if (view.key === locationViewKey) {
-                        $scope.representation = $scope.representation || {};
-                        $scope.representation.selected = view;
-                    }
-                }
-
-                if (locationViewKey) {
-                    ((domainObject && domainObject.useCapability('view')) || [])
-                        .forEach(selectViewIfMatching);
-                }
-                navigatedObject = domainObject;
+            function setNavigation(domainObject) {
+                // Wrap the domain object such that all mutation is
+                // confined to edit mode (until Save)
+                self.navigatedDomainObject =
+                    domainObject && new EditableDomainObject(domainObject, $q);
             }
 
-            $scope.$watch('domainObject', setViewForDomainObject);
-
-            $scope.doAction = function (action){
-                return $scope[action] && $scope[action]();
-            };
+            setNavigation(navigationService.getNavigation());
+            navigationService.addListener(setNavigation);
+            $scope.$on("$destroy", function () {
+                navigationService.removeListener(setNavigation);
+            });
         }
 
+        /**
+         * Get the domain object which is navigated-to.
+         * @returns {DomainObject} the domain object that is navigated-to
+         */
+        EditController.prototype.navigatedObject = function () {
+            return this.navigatedDomainObject;
+        };
+
         /**
          * Get the warning to show if the user attempts to navigate
          * away from Edit mode while unsaved changes are present.
          * @returns {string} the warning to show, or undefined if
          *          there are no unsaved changes
          */
-        EditObjectController.prototype.getUnloadWarning = function () {
-            var navigatedObject = this.scope.domainObject,
-                policyMessage;
-
-            this.policyService.allow("navigation", navigatedObject, undefined, function(message) {
-               policyMessage = message;
-            });
-
-            return policyMessage;
+        EditController.prototype.getUnloadWarning = function () {
+            var navigatedObject = this.navigatedDomainObject,
+                editorCapability = navigatedObject &&
+                    navigatedObject.getCapability("editor"),
+                hasChanges = editorCapability && editorCapability.dirty();
 
+            return hasChanges ?
+                "Unsaved changes will be lost if you leave this page." :
+                undefined;
         };
 
-        return EditObjectController;
+        return EditController;
     }
 );

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

@@ -38,6 +38,14 @@ define(
             this.policyService = policyService;
         }
 
+        function applicableView(key){
+            return ['plot', 'scrolling'].indexOf(key) >= 0;
+        }
+
+        function editableType(key){
+            return key === 'telemetry.panel';
+        }
+
         /**
          * Get a count of views which are not flagged as non-editable.
          * @private
@@ -57,8 +65,7 @@ define(
 
             // A view is editable unless explicitly flagged as not
             (views || []).forEach(function (view) {
-                if (view.editable === true ||
-                    (view.key === 'plot' && type.getKey() === 'telemetry.panel')) {
+                if (view.editable === true || (applicableView(view.key) && editableType(type.getKey()))) {
                     count++;
                 }
             });

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

@@ -1,74 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define(
-    [],
-    function () {
-        "use strict";
-
-        /**
-         * Policy controlling whether the context menu is visible when
-         * objects are being edited
-         * @param navigationService
-         * @param editModeBlacklist A blacklist of actions disallowed from
-         * context menu when navigated object is being edited
-         * @param nonEditContextBlacklist A blacklist of actions disallowed
-         * from context menu of non-editable objects, when navigated object
-         * is being edited
-         * @constructor
-         */
-        function EditContextualActionPolicy(navigationService, editModeBlacklist, nonEditContextBlacklist) {
-            this.navigationService = navigationService;
-
-            //The list of objects disallowed on target object when in edit mode
-            this.editModeBlacklist = editModeBlacklist;
-            //The list of objects disallowed on target object that is not in
-            // edit mode (ie. the context menu in the tree on the LHS).
-            this.nonEditContextBlacklist = nonEditContextBlacklist;
-        }
-
-        function isParentEditable(object) {
-            var parent = object.hasCapability("context") && object.getCapability("context").getParent();
-            return !!parent && parent.hasCapability("editor");
-        }
-
-        EditContextualActionPolicy.prototype.allow = function (action, context) {
-            var selectedObject = context.domainObject,
-                navigatedObject = this.navigationService.getNavigation(),
-                actionMetadata = action.getMetadata ? action.getMetadata() : {};
-
-            if (navigatedObject.hasCapability('editor')) {
-                if (selectedObject.hasCapability('editor') || isParentEditable(selectedObject)){
-                    return this.editModeBlacklist.indexOf(actionMetadata.key) === -1;
-                } else {
-                    //Target is in the context menu
-                    return this.nonEditContextBlacklist.indexOf(actionMetadata.key) === -1;
-                }
-            } else {
-                return true;
-            }
-        };
-
-        return EditContextualActionPolicy;
-    }
-);

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

@@ -1,52 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define([], function () {
-    "use strict";
-
-    /**
-     * Policy suppressing links when the linked-to domain object is in
-     * edit mode. Domain objects being edited may not have been persisted,
-     * so creating links to these can result in inconsistent state.
-     *
-     * @memberof platform/commonUI/edit
-     * @constructor
-     * @implements {Policy.<View, DomainObject>}
-     */
-    function EditableLinkPolicy() {
-    }
-
-    EditableLinkPolicy.prototype.allow = function (action, context) {
-        var key = action.getMetadata().key;
-
-        if (key === 'link') {
-            return !((context.selectedObject || context.domainObject)
-                .hasCapability('editor'));
-        }
-
-        // Like all policies, allow by default.
-        return true;
-    };
-
-    return EditableLinkPolicy;
-});

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

@@ -1,51 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define([], function () {
-    "use strict";
-
-    /**
-     * Policy suppressing move actions among editable and non-editable
-     * domain objects.
-     * @memberof platform/commonUI/edit
-     * @constructor
-     * @implements {Policy.<View, DomainObject>}
-     */
-    function EditableMovePolicy() {
-    }
-
-    EditableMovePolicy.prototype.allow = function (action, context) {
-        var domainObject = context.domainObject,
-            selectedObject = context.selectedObject,
-            key = action.getMetadata().key;
-
-        if (key === 'move' && domainObject.hasCapability('editor')) {
-            return !!selectedObject && selectedObject.hasCapability('editor');
-        }
-
-        // Like all policies, allow by default.
-        return true;
-    };
-
-    return EditableMovePolicy;
-});

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

@@ -49,7 +49,6 @@ define(
             var self = this;
 
             this.scope = scope;
-            this.listenHandle = undefined;
 
             // Mutate and persist a new version of a domain object's model.
             function doPersist(model) {
@@ -101,51 +100,24 @@ define(
             // Place the "commit" method in the scope
             scope.commit = commit;
             scope.setEditable = setEditable;
-
-            // Clean up when the scope is destroyed
-            scope.$on("$destroy", function () {
-                self.destroy();
-            });
-
         }
 
         // Handle a specific representation of a specific domain object
         EditRepresenter.prototype.represent = function represent(representation, representedObject) {
-            var scope = this.scope,
-                self = this;
             // Track the key, to know which view configuration to save to.
             this.key = (representation || {}).key;
             // Track the represented object
             this.domainObject = representedObject;
 
+            this.scope.isEditable = representedObject.getCapability('status').get('editing');
+
             // Ensure existing watches are released
             this.destroy();
-
-            function setEditing(){
-                scope.viewObjectTemplate = 'edit-object';
-            }
-
-            /**
-             * Listen for changes in object state. If the object becomes
-             * editable then change the view and inspector regions
-             * object representation accordingly
-             */
-            this.listenHandle = this.domainObject.getCapability('status').listen(function(statuses){
-                if (statuses.indexOf('editing')!=-1){
-                    setEditing();
-                } else {
-                    delete scope.viewObjectTemplate;
-                }
-            });
-
-            if (representedObject.getCapability('status').get('editing')){
-                setEditing();
-            }
         };
 
         // Respond to the destruction of the current representation.
         EditRepresenter.prototype.destroy = function destroy() {
-            return this.listenHandle && this.listenHandle();
+            // Nothing to clean up
         };
 
         return EditRepresenter;

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

@@ -27,11 +27,11 @@ define(
         "use strict";
 
         describe("The Save action", function () {
-            var mockDomainObject,
+            var mockLocation,
+                mockDomainObject,
                 mockEditorCapability,
+                mockUrlService,
                 actionContext,
-                mockActionCapability,
-                capabilities = {},
                 action;
 
             function mockPromise(value) {
@@ -43,62 +43,65 @@ define(
             }
 
             beforeEach(function () {
+                mockLocation = jasmine.createSpyObj(
+                    "$location",
+                    [ "path" ]
+                );
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    [
-                        "getCapability",
-                        "hasCapability",
-                        "getModel",
-                        "getOriginalObject"
-                    ]
+                    [ "getCapability", "hasCapability" ]
                 );
                 mockEditorCapability = jasmine.createSpyObj(
                     "editor",
                     [ "save", "cancel" ]
                 );
-                mockActionCapability = jasmine.createSpyObj(
-                    "actionCapability",
-                    [ "perform"]
+                mockUrlService = jasmine.createSpyObj(
+                    "urlService",
+                    ["urlForLocation"]
                 );
-                capabilities.editor = mockEditorCapability;
-                capabilities.action = mockActionCapability;
+
 
                 actionContext = {
                     domainObject: mockDomainObject
                 };
 
                 mockDomainObject.hasCapability.andReturn(true);
-                mockDomainObject.getCapability.andCallFake(function (capability) {
-                    return capabilities[capability];
-                });
-                mockDomainObject.getModel.andReturn({persisted: 0});
+                mockDomainObject.getCapability.andReturn(mockEditorCapability);
                 mockEditorCapability.save.andReturn(mockPromise(true));
-                mockDomainObject.getOriginalObject.andReturn(mockDomainObject);
 
-                action = new SaveAction(actionContext);
+                action = new SaveAction(mockLocation, mockUrlService, actionContext);
 
             });
 
             it("only applies to domain object with an editor capability", function () {
-                expect(SaveAction.appliesTo(actionContext)).toBe(true);
+                expect(SaveAction.appliesTo(actionContext)).toBeTruthy();
                 expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor");
 
                 mockDomainObject.hasCapability.andReturn(false);
                 mockDomainObject.getCapability.andReturn(undefined);
-                expect(SaveAction.appliesTo(actionContext)).toBe(false);
+                expect(SaveAction.appliesTo(actionContext)).toBeFalsy();
             });
 
-            it("only applies to domain object that has already been persisted",
-                function () {
-                    mockDomainObject.getModel.andReturn({persisted: undefined});
-                    expect(SaveAction.appliesTo(actionContext)).toBe(false);
+            //TODO: Disabled for NEM Beta
+            xit("invokes the editor capability's save functionality when performed", function () {
+                // Verify precondition
+                expect(mockEditorCapability.save).not.toHaveBeenCalled();
+                action.perform();
+
+                // Should have called cancel
+                expect(mockEditorCapability.save).toHaveBeenCalled();
+
+                // Also shouldn't call cancel
+                expect(mockEditorCapability.cancel).not.toHaveBeenCalled();
             });
 
-            it("uses the editor capability to save the object",
-                function () {
-                    action.perform();
-                    expect(mockEditorCapability.save).toHaveBeenCalled();
-                });
+            //TODO: Disabled for NEM Beta
+            xit("returns to browse when performed", function () {
+                action.perform();
+                expect(mockLocation.path).toHaveBeenCalledWith(
+                    mockUrlService.urlForLocation("browse", mockDomainObject)
+                );
+            });
         });
     }
 );

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

@@ -1,174 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,describe,it,expect,beforeEach,jasmine,xit,xdescribe*/
-
-define(
-    ["../../src/actions/SaveAsAction"],
-    function (SaveAsAction) {
-        "use strict";
-
-        describe("The Save As action", function () {
-            var mockDomainObject,
-                mockEditorCapability,
-                mockActionCapability,
-                mockObjectService,
-                mockDialogService,
-                mockCopyService,
-                mockParent,
-                mockUrlService,
-                actionContext,
-                capabilities = {},
-                action;
-
-            function noop () {}
-
-            function mockPromise(value) {
-                return (value || {}).then ? value :
-                    {
-                        then: function (callback) {
-                            return mockPromise(callback(value));
-                        },
-                        catch: function (callback) {
-                            return mockPromise(callback(value));
-                        }
-                }   ;
-            }
-
-            beforeEach(function () {
-                mockDomainObject = jasmine.createSpyObj(
-                    "domainObject",
-                    [
-                        "getCapability",
-                        "hasCapability",
-                        "getModel"
-                    ]
-                );
-                mockDomainObject.hasCapability.andReturn(true);
-                mockDomainObject.getCapability.andCallFake(function (capability) {
-                    return capabilities[capability];
-                });
-                mockDomainObject.getModel.andReturn({location: 'a', persisted: undefined});
-
-                mockParent = jasmine.createSpyObj(
-                    "parentObject",
-                    [
-                        "getCapability",
-                        "hasCapability",
-                        "getModel"
-                    ]
-                );
-
-                mockEditorCapability = jasmine.createSpyObj(
-                    "editor",
-                    [ "save", "cancel" ]
-                );
-                mockEditorCapability.cancel.andReturn(mockPromise(undefined));
-                mockEditorCapability.save.andReturn(mockPromise(true));
-                capabilities.editor = mockEditorCapability;
-
-                mockActionCapability = jasmine.createSpyObj(
-                    "action",
-                    ["perform"]
-                );
-                capabilities.action = mockActionCapability;
-
-                mockObjectService = jasmine.createSpyObj(
-                    "objectService",
-                    ["getObjects"]
-                );
-                mockObjectService.getObjects.andReturn(mockPromise({'a': mockParent}));
-
-                mockDialogService = jasmine.createSpyObj(
-                    "dialogService",
-                    [
-                        "getUserInput"
-                    ]
-                );
-                mockDialogService.getUserInput.andReturn(mockPromise(undefined));
-
-                mockCopyService = jasmine.createSpyObj(
-                    "copyService",
-                    [
-                        "perform"
-                    ]
-                );
-
-                mockUrlService = jasmine.createSpyObj(
-                    "urlService",
-                    ["urlForLocation"]
-                );
-
-                actionContext = {
-                    domainObject: mockDomainObject
-                };
-
-                action = new SaveAsAction(undefined, undefined, mockDialogService, undefined, mockCopyService, actionContext);
-
-                spyOn(action, "getObjectService");
-                action.getObjectService.andReturn(mockObjectService);
-
-                spyOn(action, "createWizard");
-                action.createWizard.andReturn({
-                    getFormStructure: noop,
-                    getInitialFormValue: noop,
-                    populateObjectFromInput: function() {
-                        return mockDomainObject;
-                    }
-                });
-
-            });
-
-            it("only applies to domain object with an editor capability", function () {
-                expect(SaveAsAction.appliesTo(actionContext)).toBe(true);
-                expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor");
-
-                mockDomainObject.hasCapability.andReturn(false);
-                mockDomainObject.getCapability.andReturn(undefined);
-                expect(SaveAsAction.appliesTo(actionContext)).toBe(false);
-            });
-
-            it("only applies to domain object that has not already been" +
-                " persisted", function () {
-                expect(SaveAsAction.appliesTo(actionContext)).toBe(true);
-                expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor");
-
-                mockDomainObject.getModel.andReturn({persisted: 0});
-                expect(SaveAsAction.appliesTo(actionContext)).toBe(false);
-            });
-
-            it("returns to browse after save", function () {
-                spyOn(action, "save");
-                action.save.andReturn(mockPromise(mockDomainObject));
-                action.perform();
-                expect(mockActionCapability.perform).toHaveBeenCalledWith(
-                    "navigate"
-                );
-            });
-
-            it("prompts the user for object details", function () {
-                action.perform();
-                expect(mockDialogService.getUserInput).toHaveBeenCalled();
-            });
-
-        });
-    }
-);

platform/commonUI/edit/test/controllers/EditControllerSpec.js

@@ -22,110 +22,102 @@
 /*global define,describe,it,expect,beforeEach,jasmine*/
 
 define(
-    ["../../src/controllers/EditObjectController"],
-    function (EditObjectController) {
+    ["../../src/controllers/EditController"],
+    function (EditController) {
         "use strict";
 
         describe("The Edit mode controller", function () {
             var mockScope,
+                mockQ,
+                mockNavigationService,
                 mockObject,
                 mockType,
-                mockLocation,
-                mockStatusCapability,
-                mockCapabilities,
-                mockPolicyService,
                 controller;
 
-            // Utility function; look for a $watch on scope and fire it
-            function fireWatch(expr, value) {
-                mockScope.$watch.calls.forEach(function (call) {
-                    if (call.args[0] === expr) {
-                        call.args[1](value);
-                    }
-                });
-            }
-
             beforeEach(function () {
-                mockPolicyService = jasmine.createSpyObj(
-                    "policyService",
-                    [
-                        "allow"
-                    ]
-                );
                 mockScope = jasmine.createSpyObj(
                     "$scope",
-                    [ "$on", "$watch" ]
+                    [ "$on" ]
+                );
+                mockQ = jasmine.createSpyObj('$q', ['when', 'all']);
+                mockNavigationService = jasmine.createSpyObj(
+                    "navigationService",
+                    [ "getNavigation", "addListener", "removeListener" ]
                 );
                 mockObject = jasmine.createSpyObj(
                     "domainObject",
-                    [ "getId", "getModel", "getCapability", "hasCapability", "useCapability" ]
+                    [ "getId", "getModel", "getCapability", "hasCapability" ]
                 );
                 mockType = jasmine.createSpyObj(
                     "type",
                     [ "hasFeature" ]
                 );
-                mockStatusCapability = jasmine.createSpyObj('statusCapability',
-                    ["get"]
-                );
-
-                mockCapabilities = {
-                    "type" : mockType,
-                    "status": mockStatusCapability
-                };
-
-                mockLocation = jasmine.createSpyObj('$location',
-                    ["search"]
-                );
-                mockLocation.search.andReturn({"view": "fixed"});
 
+                mockNavigationService.getNavigation.andReturn(mockObject);
                 mockObject.getId.andReturn("test");
                 mockObject.getModel.andReturn({ name: "Test object" });
                 mockObject.getCapability.andCallFake(function (key) {
-                    return mockCapabilities[key];
+                    return key === 'type' && mockType;
                 });
                 mockType.hasFeature.andReturn(true);
 
-                mockScope.domainObject = mockObject;
-
-                controller = new EditObjectController(
+                controller = new EditController(
                     mockScope,
-                    mockLocation,
-                    mockPolicyService
+                    mockQ,
+                    mockNavigationService
                 );
             });
 
+            it("exposes the currently-navigated object", function () {
+                expect(controller.navigatedObject()).toBeDefined();
+                expect(controller.navigatedObject().getId()).toEqual("test");
+            });
+
+            it("adds an editor capability to the navigated object", function () {
+                // Should provide an editor capability...
+                expect(controller.navigatedObject().getCapability("editor"))
+                    .toBeDefined();
+                // Shouldn't have been the mock capability we provided
+                expect(controller.navigatedObject().getCapability("editor"))
+                    .not.toEqual(mockType);
+            });
+
+            it("detaches its navigation listener when destroyed", function () {
+                var navCallback = mockNavigationService
+                        .addListener.mostRecentCall.args[0];
+
+                expect(mockScope.$on).toHaveBeenCalledWith(
+                    "$destroy",
+                    jasmine.any(Function)
+                );
+
+                // Verify precondition
+                expect(mockNavigationService.removeListener)
+                    .not.toHaveBeenCalled();
+
+                // Trigger destroy
+                mockScope.$on.mostRecentCall.args[1]();
+
+                // Listener should have been removed
+                expect(mockNavigationService.removeListener)
+                    .toHaveBeenCalledWith(navCallback);
+            });
+
             it("exposes a warning message for unload", function () {
-                var obj = mockObject,
-                    errorMessage = "Unsaved changes";
+                var obj = controller.navigatedObject(),
+                    mockEditor = jasmine.createSpyObj('editor', ['dirty']);
 
                 // Normally, should be undefined
                 expect(controller.getUnloadWarning()).toBeUndefined();
 
-                // Override the policy service to prevent navigation
-                mockPolicyService.allow.andCallFake(function(category, object, context, callback){
-                   callback(errorMessage);
-                });
+                // Override the object's editor capability, make it look
+                // like there are unsaved changes.
+                obj.getCapability = jasmine.createSpy();
+                obj.getCapability.andReturn(mockEditor);
+                mockEditor.dirty.andReturn(true);
 
                 // Should have some warning message here now
-                expect(controller.getUnloadWarning()).toEqual(errorMessage);
-            });
-
-
-            it("sets the active view from query parameters", function () {
-                var testViews = [
-                        { key: 'abc' },
-                        { key: 'def', someKey: 'some value' },
-                        { key: 'xyz' }
-                    ];
-
-                mockObject.useCapability.andCallFake(function (c) {
-                    return (c === 'view') && testViews;
-                });
-                mockLocation.search.andReturn({ view: 'def' });
-
-                fireWatch('domainObject', mockObject);
-                expect(mockScope.representation.selected)
-                    .toEqual(testViews[1]);
+                expect(controller.getUnloadWarning()).toEqual(jasmine.any(String));
             });
 
         });

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

@@ -35,43 +35,19 @@ define(
                 mockDomainObject,
                 mockEditAction,
                 mockPropertiesAction,
-                mockTypeCapability,
-                mockStatusCapability,
-                capabilities,
-                plotView,
                 policy;
 
             beforeEach(function () {
                 mockDomainObject = jasmine.createSpyObj(
                     'domainObject',
-                    [
-                        'useCapability',
-                        'hasCapability',
-                        'getCapability'
-                    ]
+                    [ 'useCapability' ]
                 );
-                mockStatusCapability = jasmine.createSpyObj('statusCapability', ['get']);
-                mockStatusCapability.get.andReturn(false);
-                mockTypeCapability = jasmine.createSpyObj('type', ['getKey']);
-                capabilities = {
-                    'status': mockStatusCapability,
-                    'type': mockTypeCapability
-                };
-
                 mockEditAction = jasmine.createSpyObj('edit', ['getMetadata']);
                 mockPropertiesAction = jasmine.createSpyObj('edit', ['getMetadata']);
 
-                mockDomainObject.getCapability.andCallFake(function(capability){
-                    return capabilities[capability];
-                });
-                mockDomainObject.hasCapability.andCallFake(function(capability){
-                    return !!capabilities[capability];
-                });
-
                 editableView = { editable: true };
                 nonEditableView = { editable: false };
                 undefinedView = { someKey: "some value" };
-                plotView = { key: "plot", editable: false };
                 testViews = [];
 
                 mockDomainObject.useCapability.andCallFake(function (c) {
@@ -90,53 +66,38 @@ define(
                 policy = new EditActionPolicy();
             });
 
-            it("allows the edit action when there are editable views", function () {
+            //TODO: Disabled for NEM Beta
+            xit("allows the edit action when there are editable views", function () {
                 testViews = [ editableView ];
-                expect(policy.allow(mockEditAction, testContext)).toBe(true);
+                expect(policy.allow(mockEditAction, testContext)).toBeTruthy();
+                // No edit flag defined; should be treated as editable
+                testViews = [ undefinedView, undefinedView ];
+                expect(policy.allow(mockEditAction, testContext)).toBeTruthy();
             });
 
-            it("allows the edit properties action when there are no editable views", function () {
+            //TODO: Disabled for NEM Beta
+            xit("allows the edit properties action when there are no editable views", function () {
                 testViews = [ nonEditableView, nonEditableView ];
-                expect(policy.allow(mockPropertiesAction, testContext)).toBe(true);
+                expect(policy.allow(mockPropertiesAction, testContext)).toBeTruthy();
             });
 
-            it("disallows the edit action when there are no editable views", function () {
+            //TODO: Disabled for NEM Beta
+            xit("disallows the edit action when there are no editable views", function () {
                 testViews = [ nonEditableView, nonEditableView ];
-                expect(policy.allow(mockEditAction, testContext)).toBe(false);
+                expect(policy.allow(mockEditAction, testContext)).toBeFalsy();
             });
 
-            it("disallows the edit properties action when there are" +
+            //TODO: Disabled for NEM Beta
+            xit("disallows the edit properties action when there are" +
                 " editable views", function () {
                 testViews = [ editableView ];
-                expect(policy.allow(mockPropertiesAction, testContext)).toBe(false);
+                expect(policy.allow(mockPropertiesAction, testContext)).toBeFalsy();
             });
 
-            it("disallows the edit action when object is already being" +
-                " edited", function () {
-                testViews = [ editableView ];
-                mockStatusCapability.get.andReturn(true);
-                expect(policy.allow(mockEditAction, testContext)).toBe(false);
-            });
-
-            it("allows editing of panels in plot view", function () {
-                testViews = [ plotView ];
-                mockTypeCapability.getKey.andReturn('telemetry.panel');
-
-                expect(policy.allow(mockEditAction, testContext)).toBe(true);
-            });
-
-            it("disallows editing of plot view when object not a panel type", function () {
-                testViews = [ plotView ];
-                mockTypeCapability.getKey.andReturn('something.else');
-
-                expect(policy.allow(mockEditAction, testContext)).toBe(false);
-            });
-
-
             it("allows the edit properties outside of the 'view-control' category", function () {
                 testViews = [ nonEditableView ];
                 testContext.category = "something-else";
-                expect(policy.allow(mockPropertiesAction, testContext)).toBe(true);
+                expect(policy.allow(mockPropertiesAction, testContext)).toBeTruthy();
             });
         });
     }

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

@@ -1,109 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,describe,it,expect,beforeEach,jasmine,xit,xdescribe*/
-
-define(
-    ["../../src/policies/EditContextualActionPolicy"],
-    function (EditContextualActionPolicy) {
-        "use strict";
-
-        describe("The Edit contextual action policy", function () {
-            var policy,
-                navigationService,
-                mockAction,
-                context,
-                navigatedObject,
-                mockDomainObject,
-                metadata,
-                editModeBlacklist = ["copy", "follow", "window", "link", "locate"],
-                nonEditContextBlacklist = ["copy", "follow", "properties", "move", "link", "remove", "locate"];
-
-            beforeEach(function () {
-                navigatedObject = jasmine.createSpyObj("navigatedObject", ["hasCapability"]);
-                navigatedObject.hasCapability.andReturn(false);
-
-                mockDomainObject = jasmine.createSpyObj("domainObject", ["hasCapability", "getCapability"]);
-                mockDomainObject.hasCapability.andReturn(false);
-
-                navigationService = jasmine.createSpyObj("navigationService", ["getNavigation"]);
-                navigationService.getNavigation.andReturn(navigatedObject);
-
-                metadata = {key: "move"};
-                mockAction = jasmine.createSpyObj("action", ["getMetadata"]);
-                mockAction.getMetadata.andReturn(metadata);
-
-                context = {domainObject: mockDomainObject};
-
-                policy = new EditContextualActionPolicy(navigationService, editModeBlacklist, nonEditContextBlacklist);
-            });
-
-            it('Allows all actions when navigated object not in edit mode', function() {
-                expect(policy.allow(mockAction, context)).toBe(true);
-            });
-
-            it('Allows "window" action when navigated object in edit mode,' +
-                ' but selected object not in edit mode ', function() {
-                navigatedObject.hasCapability.andReturn(true);
-                metadata.key = "window";
-                expect(policy.allow(mockAction, context)).toBe(true);
-            });
-
-            it('Allows "remove" action when navigated object in edit mode,' +
-                ' and selected object not editable, but its parent is.',
-                function() {
-                    var mockParent = jasmine.createSpyObj("parentObject", ["hasCapability"]),
-                        mockContextCapability = jasmine.createSpyObj("contextCapability", ["getParent"]);
-
-                    mockParent.hasCapability.andReturn(true);
-                    mockContextCapability.getParent.andReturn(mockParent);
-                    navigatedObject.hasCapability.andReturn(true);
-
-                    mockDomainObject.getCapability.andReturn(mockContextCapability);
-                    mockDomainObject.hasCapability.andCallFake(function (capability) {
-                        switch (capability) {
-                            case "editor": return false;
-                            case "context": return true;
-                        }
-                    });
-                    metadata.key = "remove";
-
-                    expect(policy.allow(mockAction, context)).toBe(true);
-            });
-
-            it('Disallows "move" action when navigated object in edit mode,' +
-                ' but selected object not in edit mode ', function() {
-                navigatedObject.hasCapability.andReturn(true);
-                metadata.key = "move";
-                expect(policy.allow(mockAction, context)).toBe(false);
-            });
-
-            it('Disallows copy action when navigated object and' +
-                ' selected object in edit mode', function() {
-                navigatedObject.hasCapability.andReturn(true);
-                mockDomainObject.hasCapability.andReturn(true);
-                metadata.key = "copy";
-                expect(policy.allow(mockAction, context)).toBe(false);
-            });
-
-        });
-    }
-);

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

@@ -33,8 +33,8 @@ define(
                 testRepresentation,
                 mockDomainObject,
                 mockPersistence,
-                mockStatusCapability,
                 mockCapabilities,
+                mockStatusCapability,
                 representer;
 
             function mockPromise(value) {
@@ -48,7 +48,7 @@ define(
             beforeEach(function () {
                 mockQ = { when: mockPromise };
                 mockLog = jasmine.createSpyObj("$log", ["info", "debug"]);
-                mockScope = jasmine.createSpyObj("$scope", ["$watch", "$on"]);
+                mockScope = jasmine.createSpyObj("$scope", ["$watch"]);
                 testRepresentation = { key: "test" };
                 mockDomainObject = jasmine.createSpyObj("domainObject", [
                     "getId",
@@ -60,7 +60,7 @@ define(
                 mockPersistence =
                     jasmine.createSpyObj("persistence", ["persist"]);
                 mockStatusCapability =
-                    jasmine.createSpyObj("statusCapability", ["get", "listen"]);
+                    jasmine.createSpyObj("status", ["get"]);
                 mockStatusCapability.get.andReturn(false);
                 mockCapabilities = {
                     'persistence': mockPersistence,
@@ -82,17 +82,6 @@ define(
                 expect(mockScope.commit).toEqual(jasmine.any(Function));
             });
 
-            it("Sets edit view template on edit mode", function () {
-                mockStatusCapability.listen.mostRecentCall.args[0](['editing']);
-                expect(mockScope.viewObjectTemplate).toEqual('edit-object');
-            });
-
-            it("Cleans up listeners on scope destroy", function () {
-                representer.listenHandle = jasmine.createSpy('listen');
-                mockScope.$on.mostRecentCall.args[1]();
-                expect(representer.listenHandle).toHaveBeenCalled();
-            });
-
             it("mutates and persists upon observed changes", function () {
                 mockScope.model = { someKey: "some value" };
                 mockScope.configuration = { someConfiguration: "something" };
@@ -123,4 +112,4 @@ define(
 
         });
     }
-);
+);

platform/commonUI/formats/src/UTCTimeFormat.js

@@ -28,10 +28,9 @@ define([
 ) {
     "use strict";
 
-    var DATE_FORMAT = "YYYY-MM-DD HH:mm:ss.SSS",
+    var DATE_FORMAT = "YYYY-MM-DD HH:mm:ss",
         DATE_FORMATS = [
             DATE_FORMAT,
-            "YYYY-MM-DD HH:mm:ss",
             "YYYY-MM-DD HH:mm",
             "YYYY-MM-DD"
         ];
@@ -49,7 +48,7 @@ define([
     }
 
     UTCTimeFormat.prototype.format = function (value) {
-        return moment.utc(value).format(DATE_FORMAT) + "Z";
+        return moment.utc(value).format(DATE_FORMAT);
     };
 
     UTCTimeFormat.prototype.parse = function (text) {

platform/commonUI/formats/test/UTCTimeFormatSpec.js

@@ -40,12 +40,6 @@ define(
                 expect(moment.utc(formatted).valueOf()).toEqual(timestamp);
             });
 
-            it("displays with millisecond precision", function () {
-                var timestamp = 12345670789,
-                    formatted = format.format(timestamp);
-                expect(moment.utc(formatted).valueOf()).toEqual(timestamp);
-            });
-
             it("validates time inputs", function () {
                 expect(format.validate("1977-05-25 11:21:22")).toBe(true);
                 expect(format.validate("garbage text")).toBe(false);

platform/commonUI/general/bundle.js

@@ -49,7 +49,6 @@ define([
     "./src/directives/MCTScroll",
     "./src/directives/MCTSplitPane",
     "./src/directives/MCTSplitter",
-    "./src/directives/MCTTree",
     "text!./res/templates/bottombar.html",
     "text!./res/templates/controls/action-button.html",
     "text!./res/templates/controls/input-filter.html",
@@ -98,7 +97,6 @@ define([
     MCTScroll,
     MCTSplitPane,
     MCTSplitter,
-    MCTTree,
     bottombarTemplate,
     actionButtonTemplate,
     inputFilterTemplate,
@@ -177,6 +175,10 @@ define([
                 {
                     "stylesheetUrl": "css/normalize.min.css",
                     "priority": "mandatory"
+                },
+                {
+                    "stylesheetUrl": "css/reset.css",
+                    "priority": "mandatory"
                 }
             ],
             "templates": [
@@ -387,11 +389,6 @@ define([
                 {
                     "key": "mctSplitter",
                     "implementation": MCTSplitter
-                },
-                {
-                    "key": "mctTree",
-                    "implementation": MCTTree,
-                    "depends": [ '$parse', 'gestureService' ]
                 }
             ],
             "constants": [
@@ -519,6 +516,16 @@ define([
                 }
             ],
             "licenses": [
+                {
+                    "name": "Modernizr",
+                    "version": "2.6.2",
+                    "description": "Browser/device capability finding",
+                    "author": "Faruk Ateş",
+                    "website": "http://modernizr.com",
+                    "copyright": "Copyright (c) 2009–2015",
+                    "license": "license-mit",
+                    "link": "http://modernizr.com/license/"
+                },
                 {
                     "name": "Normalize.css",
                     "version": "1.1.2",
@@ -528,16 +535,6 @@ define([
                     "copyright": "Copyright (c) Nicolas Gallagher and Jonathan Neal",
                     "license": "license-mit",
                     "link": "https://github.com/necolas/normalize.css/blob/v1.1.2/LICENSE.md"
-                },
-                {
-                    "name": "Zepto",
-                    "version": "1.1.6",
-                    "description": "DOM manipulation",
-                    "author": "Thomas Fuchs",
-                    "website": "http://zeptojs.com/",
-                    "copyright": "Copyright (c) 2010-2016 Thomas Fuchs",
-                    "license": "license-mit",
-                    "link": "https://github.com/madrobby/zepto/blob/master/MIT-LICENSE"
                 }
             ]
         }

platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg

@@ -80,7 +80,7 @@
 <glyph unicode="&#xe601;" glyph-name="icon-datatable" d="M1024 768c0-106.039-229.23-192-512-192s-512 85.961-512 192c0 106.039 229.23 192 512 192s512-85.961 512-192zM512 448c-282.8 0-512 86-512 192v-512c0-106 229.2-192 512-192s512 86 512 192v512c0-106-229.2-192-512-192zM896 385v-256c-36.6-15.6-79.8-28.8-128-39.4v256c48.2 10.6 91.4 23.8 128 39.4zM256 345.6v-256c-48.2 10.4-91.4 23.8-128 39.4v256c36.6-15.6 79.8-28.8 128-39.4zM384 70v256c41-4 83.8-6 128-6s87 2.2 128 6v-256c-41-4-83.8-6-128-6s-87 2.2-128 6z" />
 <glyph unicode="&#xe602;" glyph-name="icon-tabular-scrolling" d="M64 960c-35.2 0-64-28.8-64-64v-192h448v256h-384zM1024 704v192c0 35.2-28.8 64-64 64h-384v-256h448zM0 576v-192c0-35.2 28.8-64 64-64h384v256h-448zM960 320c35.2 0 64 28.8 64 64v192h-448v-256h384zM512-64l-256 256h512z" />
 <glyph unicode="&#xe603;" glyph-name="icon-alert-triangle" d="M998.208 111.136l-422.702 739.728c-34.928 61.124-92.084 61.124-127.012 0l-422.702-739.728c-34.928-61.126-5.906-111.136 64.494-111.136h843.428c70.4 0 99.422 50.010 64.494 111.136zM512 128c-35.2 0-64 28.8-64 64s28.8 64 64 64 64-28.8 64-64c0-35.2-28.8-64-64-64zM627.448 577.242l-38.898-194.486c-6.902-34.516-41.35-62.756-76.55-62.756s-69.648 28.24-76.552 62.758l-38.898 194.486c-6.902 34.516 16.25 62.756 51.45 62.756h128c35.2 0 58.352-28.24 51.448-62.758z" />
-<glyph unicode="&#xe604;" glyph-name="icon-tabular" d="M896 960h-768c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v768c0 70.4-57.6 128-128 128zM640 512h-256v192h256v-192zM384 448h256v-192h-256v192zM320 256h-256v192h256v-192zM320 704v-192h-256v192h256zM128 0c-17 0-33 6.6-45.2 18.8s-18.8 28.2-18.8 45.2v128h256v-192h-192zM384 0v192h256v-192h-256zM960 64c0-17-6.6-33-18.8-45.2s-28.2-18.8-45.2-18.8h-192v192h256v-128zM960 256h-256v192h256v-192zM960 512h-256v192h256v-192z" />
+<glyph unicode="&#xe604;" glyph-name="icon-tabular" d="M0 896v-192h448v256h-384c-35.2 0-64-28.8-64-64zM960 960h-384v-256h448v192c0 35.2-28.8 64-64 64zM576 576h448v-256h-448v256zM0 576h448v-256h-448v256zM0 0c0-35.2 28.8-64 64-64h384v256h-448v-192zM576-64h384c35.2 0 64 28.8 64 64v192h-448v-256z" />
 <glyph unicode="&#xe605;" glyph-name="icon-calendar" d="M896 960h-768c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v768c0 70.4-57.6 128-128 128zM640 512h-256v192h256v-192zM384 448h256v-192h-256v192zM320 256h-256v192h256v-192zM320 704v-192h-256v192h256zM128 0c-17 0-33 6.6-45.2 18.8s-18.8 28.2-18.8 45.2v128h256v-192h-192zM384 0v192h256v-192h-256zM960 64c0-17-6.6-33-18.8-45.2s-28.2-18.8-45.2-18.8h-192v192h256v-128zM960 256h-256v192h256v-192zM960 512h-256v192h256v-192z" />
 <glyph unicode="&#xe606;" glyph-name="icon-paint-bucket" d="M544 736v-224c0-88.4-71.6-160-160-160s-160 71.6-160 160v97.2l-197.4-196.4c-50-50-12.4-215.2 112.4-340s290-162.4 340-112.4l417 423.6-352 352zM896-64c70.6 0 128 57.4 128 128 0 108.6-128 192-128 192s-128-83.4-128-192c0-70.6 57.4-128 128-128zM384 448c-35.4 0-64 28.6-64 64v384c0 35.4 28.6 64 64 64s64-28.6 64-64v-384c0-35.4-28.6-64-64-64z" />
 <glyph unicode="&#xe607;" glyph-name="icon-x-in-circle" d="M512 960c-282.8 0-512-229.2-512-512s229.2-512 512-512 512 229.2 512 512-229.2 512-512 512zM832 256l-128-128-192 192-192-192-128 128 192 192-192 192 128 128 192-192 192 192 128-128-192-192 192-192z" />
@@ -94,11 +94,8 @@
 <glyph unicode="&#xe614;" glyph-name="icon-collapse-pane-right" d="M768 960h256v-1024h-256c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192zM512 640l-512-320v640z" />
 <glyph unicode="&#xe615;" glyph-name="icon-eye-open" d="M512 896c-261 0-480.6-195.4-512-448 31.4-252.6 251-448 512-448s480.6 195.4 512 448c-31.4 252.6-251 448-512 448zM768.2 225.4c-71.4-62.8-162.8-97.4-257.6-97.4s-186.2 34.6-257.6 97.4c-66.6 58.6-110.6 137.2-125 222.6 0 0 0 0.2 0 0.2 76.8 154 220.8 257.6 384 257.6s307.2-103.8 384-257.6c0 0 0-0.2 0-0.2-14.4-85.4-61.2-164-127.8-222.6zM512 672c-123.8 0-224-100.2-224-224s100.2-224 224-224 224 100.2 224 224-100.2 224-224 224z" />
 <glyph unicode="&#xe616;" glyph-name="icon-eye-open-no-gleam" d="M512 896c-261 0-480.6-195.4-512-448 31.4-252.6 251-448 512-448s480.6 195.4 512 448c-31.4 252.6-251 448-512 448zM768.2 225.4c-71.4-62.8-162.8-97.4-257.6-97.4s-186.2 34.6-257.6 97.4c-66.6 58.6-110.6 137.2-125 222.6 0 0 0 0.2 0 0.2 76.8 154 220.8 257.6 384 257.6s307.2-103.8 384-257.6c0 0 0-0.2 0-0.2-14.4-85.4-61.2-164-127.8-222.6zM512 672c-123.8 0-224-100.2-224-224s100.2-224 224-224 224 100.2 224 224-100.2 224-224 224zM576 416c-53 0-96 43-96 96s43 96 96 96 96-43 96-96c0-53-43-96-96-96z" />
-<glyph unicode="&#xe617;" glyph-name="icon-topic" d="M454.36 483.36l86.3 86.3c9.088 8.965 21.577 14.502 35.36 14.502s26.272-5.537 35.366-14.507l86.294-86.294c19.328-19.358 42.832-34.541 69.047-44.082l1.313 171.722-57.64 57.64c-34.407 34.33-81.9 55.558-134.35 55.558s-99.943-21.228-134.354-55.562l-86.296-86.297c-9.088-8.965-21.577-14.502-35.36-14.502s-26.272 5.537-35.366 14.507l-28.674 28.654v-172.14c19.045-7.022 41.040-11.084 63.984-11.084 52.463 0 99.966 21.239 134.379 55.587zM505.64 412.64l-86.3-86.3c-9.088-8.965-21.577-14.502-35.36-14.502s-26.272 5.537-35.366 14.507l-86.294 86.294c-2 2-4.2 4-6.36 6v-197.36c33.664-30.72 78.65-49.537 128.031-49.537 52.44 0 99.923 21.22 134.333 55.541l86.296 86.296c9.088 8.965 21.577 14.502 35.36 14.502s26.272-5.537 35.366-14.507l86.294-86.294c2-2 4.2-4 6.36-6v197.36c-33.664 30.72-78.65 49.537-128.031 49.537-52.44 0-99.923-21.22-134.333-55.541zM832 960h-128v-192h127.66l0.34-0.34v-639.32l-0.34-0.34h-127.66v-192h128c105.6 0 192 86.4 192 192v640c0 105.6-86.4 192-192 192zM320 128h-127.66l-0.34 0.34v639.32l0.34 0.34h127.66v192h-128c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h128v192z" />
-<glyph unicode="&#xe618;" glyph-name="icon-session" d="M635.6 435.6c6.6-4.2 13.2-8.6 19.2-13.6l120.4-96.4c29.6-23.8 83.8-23.8 113.4 0l135.2 108c0.2 4.8 0.2 9.4 0.2 14.2 0 52.2-7.8 102.4-22.2 149.8l-154.8-123.6c-58.2-46.6-140.2-59.2-211.4-38.4zM248.6 325.8l120.4 96.4c58 46.4 140 59.2 211.2 38.4-6.6 4.2-13.2 8.6-19.2 13.6l-120.4 96.4c-29.6 23.8-83.8 23.8-113.4 0l-120.2-96.6c-40-32-91.4-48-143-48-21.6 0-43 2.8-63.8 8.4 0-0.6 0-1.2 0-1.6 5-3.4 10-6.8 14.6-10.6l120.4-96.4c29.8-23.8 83.8-23.8 113.4 0zM120.6 581.8l120.4 96.4c80.2 64.2 205.6 64.2 285.8 0l120.4-96.4c29.6-23.8 83.8-23.8 113.4 0l181 144.8c-91.2 140.4-249.6 233.4-429.6 233.4-238.6 0-439.2-163.2-496-384.2 30.8-17.6 77.8-15.6 104.6 6zM689 218l-120.4 96.4c-29.6 23.8-83.8 23.8-113.4 0l-120.2-96.4c-40-32-91.4-48-143-48-47.8 0-95.4 13.8-134.2 41.4 85.6-163.6 256.8-275.4 454.2-275.4s368.6 111.8 454.2 275.4c-80.4-57.4-199.8-55.2-277.2 6.6z" />
+<glyph unicode="&#xe617;" glyph-name="icon-topic" d="M546.4 528.8l32 24c31.6 23.8 91.6 23.8 123.2 0l32-24c10.8-8 22.2-15.2 34.4-21.4v201.2c-38 19.6-82.2 30-128 30-60.4 0-118.2-18.2-162.4-51.4l-32-24c-31.6-23.8-91.6-23.8-123.2 0l-32 24c-10.8 8-22.2 15.2-34.4 21.4v-201.2c38-19.6 82.2-30 128-30 60.4 0 118.2 18.2 162.4 51.4zM640 418.6c-60.4 0-118.2-18.2-162.4-51.4l-32-24c-31.6-23.8-91.6-23.8-123.2 0l-32 24c-10.8 8-22.2 15.2-34.4 21.4v-201.2c38-19.6 82.2-30 128-30 60.4 0 118.2 18.2 162.4 51.4l32 24c31.6 23.8 91.6 23.8 123.2 0l32-24c10.8-8 22.2-15.2 34.4-21.4v201.2c-38 19.6-82.2 30-128 30zM832 960h-128v-192h127.6c0.2 0 0.2-0.2 0.4-0.4v-639.4c0-0.2-0.2-0.2-0.4-0.4h-127.6v-192h128c105.6 0 192 86.4 192 192v640.2c0 105.6-86.4 192-192 192zM320 128h-127.6c-0.2 0-0.2 0.2-0.4 0.4v639.4c0 0.2 0.2 0.2 0.4 0.4h127.6v191.8h-128c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h128v192z" />
+<glyph unicode="&#xe618;" glyph-name="icon-session" d="M923 521.8l-151 100.6c-36 24-103.8 24-139.8 0l-151-100.6c-44.6-29.8-102.6-46.2-163-46.2s-118.4 16.4-163 46.2l-151.4 100.6c-1.8 1.2-3.8 2.4-5.8 3.6v-208c36.6-7.4 70.6-20.8 99-39.8l151-100.6c36-24 103.8-24 139.8 0l151 100.6c44.6 29.8 102.6 46.2 163 46.2s118.4-16.4 163-46.2l151-100.6c1.8-1.2 3.8-2.4 5.8-3.6v208c-36.2 7.2-70.2 20.8-98.6 39.8zM923 137.8l-151 100.6c-36 24-103.8 24-139.8 0l-151-100.6c-44.6-29.8-102.6-46.2-163-46.2s-118.4 16.4-163 46.2l-151.4 100.6c-1.8 1.2-3.8 2.4-5.8 3.6v-112c0-105.6 86.4-192 192-192h640c94.8 0 174.2 69.8 189.4 160.4-35.6 7.4-68.6 20.8-96.4 39.4zM97 762.2l151-100.6c36-24 103.8-24 139.8 0l151 100.6c44.8 29.8 102.6 46.2 163.2 46.2s118.4-16.4 163-46.2l151-100.6c1.8-1.2 3.8-2.4 5.8-3.6v112c0 105.6-86.4 192-192 192h-639.8c-94.8 0-174.2-69.8-189.4-160.4 35.6-7.4 68.6-20.8 96.4-39.4z" />
 <glyph unicode="&#xe619;" glyph-name="icon-bullet" d="M832 208c0-44-36-80-80-80h-480c-44 0-80 36-80 80v480c0 44 36 80 80 80h480c44 0 80-36 80-80v-480z" />
-<glyph unicode="&#xe620;" glyph-name="icon-tabular-realtime" d="M896 960h-768c-70.606-0.215-127.785-57.394-128-127.979v-768.021c0.215-70.606 57.394-127.785 127.979-128h768.021c70.606 0.215 127.785 57.394 128 127.979v768.021c-0.215 70.606-57.394 127.785-127.979 128zM448 668l25.060-25.32c7.916-7.922 18.856-12.822 30.94-12.822s23.024 4.9 30.94 12.822l75.5 76.3c29.97 30.338 71.571 49.128 117.56 49.128s87.59-18.79 117.544-49.112l50.456-50.997v-152.2c-24.111 8.83-44.678 22.255-61.542 39.342l-75.518 76.318c-7.916 7.922-18.856 12.822-30.94 12.822s-23.024-4.9-30.94-12.822l-75.5-76.3c-29.971-30.343-71.575-49.137-117.568-49.137-20.084 0-39.331 3.584-57.137 10.146l1.145 151.831zM320 0h-192c-35.26 0.214-63.786 28.74-64 63.98v128.020h256v-192zM320 256h-256v192h256v-192zM320 512h-256v192h256v-192zM640 0h-256v192h256v-192zM448 323.38v174.5c1.88-1.74 3.74-3.5 5.56-5.34l75.5-76.3c7.916-7.922 18.856-12.822 30.94-12.822s23.024 4.9 30.94 12.822l75.5 76.3c29.966 30.333 71.56 49.119 117.542 49.119 43.28 0 82.673-16.644 112.128-43.879l-0.11-174.399c-1.88 1.74-3.74 3.5-5.56 5.34l-75.5 76.3c-7.916 7.922-18.856 12.822-30.94 12.822s-23.024-4.9-30.94-12.822l-75.5-76.3c-29.966-30.333-71.56-49.119-117.542-49.119-43.28 0-82.673 16.644-112.128 43.879zM960 64c-0.214-35.26-28.74-63.786-63.98-64h-192.020v192h256v-128z" />
-<glyph unicode="&#xe621;" glyph-name="icon-tabular-lad" d="M896 960h-768c-70.606-0.215-127.785-57.394-128-127.979v-768.021c0.215-70.606 57.394-127.785 127.979-128h768.021c70.606 0.215 127.785 57.394 128 127.979v768.021c-0.215 70.606-57.394 127.785-127.979 128zM64 704h256v-192h-256v192zM64 448h256v-192h-256v192zM128 0c-35.26 0.214-63.786 28.74-64 63.98v128.020h256v-192h-192zM384 0v192h256v-192h-256zM960 64c-0.214-35.26-28.74-63.786-63.98-64h-192.020v192h256v-128zM960 448v-192h-576v192h64v64h-64v192h576v-192h-64v-64h64zM782.32 412.62l-110.32 55.16v172.22c0 17.673-14.327 32-32 32s-32-14.327-32-32v-211.78l145.68-72.84c4.172-2.133 9.1-3.383 14.32-3.383 17.675 0 32.003 14.328 32.003 32.003 0 12.454-7.114 23.247-17.501 28.536z" />
-<glyph unicode="&#xe622;" glyph-name="icon-tabular-lad-set" d="M128 192v576c-70.606-0.215-127.785-57.394-128-127.979v-576.021c0.215-70.606 57.394-127.785 127.979-128h576.021c70.606 0.215 127.785 57.394 128 127.979l-576 0.021c-70.606 0.215-127.785 57.394-128 127.979zM896 960h-576c-70.606-0.215-127.785-57.394-128-127.979v-576.021c0.215-70.606 57.394-127.785 127.979-128h576.021c70.606 0.215 127.785 57.394 128 127.979v576.021c-0.215 70.606-57.394 127.785-127.979 128zM256 768h192v-128h-192v128zM256 576h192v-192h-192v192zM320 192c-35.26 0.214-63.786 28.74-64 63.98v64.020h192v-128h-128zM512 192v128h192v-128h-192zM960 256c-0.214-35.26-28.74-63.786-63.98-64h-128.020v128h192v-64zM960 384h-448v384h448v-384zM832 480c0.002 0 0.005 0 0.007 0 17.673 0 32 14.327 32 32 0 14.055-9.062 25.994-21.662 30.293l-74.345 24.767v104.94c0 17.673-14.327 32-32 32s-32-14.327-32-32v-151.060l117.88-39.3c3.018-1.040 6.495-1.64 10.113-1.64 0.003 0 0.005 0 0.008 0z" />
 <glyph unicode="&#xe642;" glyph-name="icon-x" d="M384 448l-365.332-365.332c-24.89-24.89-24.89-65.62 0-90.51l37.49-37.49c24.89-24.89 65.62-24.89 90.51 0 0 0 365.332 365.332 365.332 365.332l365.332-365.332c24.89-24.89 65.62-24.89 90.51 0l37.49 37.49c24.89 24.89 24.89 65.62 0 90.51l-365.332 365.332c0 0 365.332 365.332 365.332 365.332 24.89 24.89 24.89 65.62 0 90.51l-37.49 37.49c-24.89 24.89-65.62 24.89-90.51 0 0 0-365.332-365.332-365.332-365.332l-365.332 365.332c-24.89 24.89-65.62 24.89-90.51 0l-37.49-37.49c-24.89-24.89-24.89-65.62 0-90.51 0 0 365.332-365.332 365.332-365.332z" />
 </font></defs></svg>

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

@@ -98,11 +98,6 @@ $bubbleMaxW: 300px;
 $reqSymbolW: 15px;
 $reqSymbolM: $interiorMargin * 2;
 $reqSymbolFontSize: 0.7em;
-// Wait Spinner Defaults
-$waitSpinnerD: 32px;
-$waitSpinnerTreeD: 20px;
-$waitSpinnerBorderW: 5px;
-$waitSpinnerTreeBorderW: 4px;
 
 /************************** CONTROLS */
 $controlDisabledOpacity: 0.3;

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

@@ -53,6 +53,7 @@ body, html {
 	font-weight: 200;
 	height: 100%;
 	width: 100%;
+	overflow: hidden;
 }
 
 em {
@@ -84,12 +85,6 @@ p {
 	margin-bottom: $interiorMarginLg;
 }
 
-ol, ul {
-    list-style: none;
-    margin: 0;
-    padding-left: 0;
-}
-
 mct-container {
 	display: block;
 }

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

@@ -61,24 +61,9 @@
     .l-inspector-part {
         box-sizing: border-box;
         padding-right: $interiorMargin;
-        .tree .form {
-            margin-left: $treeVCW + $interiorMarginLg;
-        }
-        .section-header {
-            background: none;
-            color: $colorInspectorPropName;
-            border-radius: unset;
-            font-size: inherit;
-            padding: $interiorMarginSm 0;
-        }
-
-        mct-form:not(:last-child) .form {
-            border-bottom: 1px solid $colorInspectorSectionHeaderBg;
-        }
-
         .form {
-            margin-bottom: $interiorMarginSm;
-            padding-bottom: $interiorMarginLg;
+            margin-left: $treeVCW + $interiorMarginLg;
+            margin-bottom: $interiorMarginLg;
             .form-section {
                 margin-bottom: 0;
                 &:not(.first) {
@@ -87,14 +72,7 @@
                 .form-row {
                     @include align-items(center);
                     border: none;
-                    padding: $interiorMarginSm 0;
-                    .label {
-                        min-width: 80px;
-                    }
-                    input[type='text'],
-                    input[type='search'] {
-                        width: 100%;
-                    }
+                    padding: 0;
                 }
             }
         }

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

@@ -45,6 +45,7 @@
 
 /********************************* FORMS */
 @import "forms/elems";
+@import "forms/selects";
 @import "forms/channel-selector";
 @import "forms/datetime";
 @import "forms/validation";

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

@@ -35,32 +35,25 @@
     }
 }
 
-mct-representation,
-.rep-object-label {
-    &.s-status-pending {
-        .t-object-label {
-            .t-item-icon {
-                &:before {
-                    @include spinner($waitSpinnerTreeBorderW,  $colorLoadingFg);
-                    content: "";
-                    height: $waitSpinnerTreeD; width: $waitSpinnerTreeD;
-                }
-                .t-item-icon-glyph {
-                    display: none;
-                }
-            }
-            .t-title-label {
-                font-style: italic;
-                opacity: 0.6;
-            }
+mct-representation.s-status-pending > .t-object-label {
+    .t-item-icon {
+        &:before {
+            $spinBW: 4px;
+            @include spinner($spinBW);
+            content: "";
+            padding: 30%;
         }
+        .t-item-icon-glyph {
+            display: none;
+        }
+    }
+    .t-title-label {
+        font-style: italic;
+        opacity: 0.6;
     }
 }
 
-.selected mct-representation,
-.selected .rep-object-label {
-    .s-status-pending .t-object-label .t-item-icon:before {
-        border-color: rgba($colorItemTreeSelectedFg, 0.25) !important;
-        border-top-color: rgba($colorItemTreeSelectedFg, 1.0) !important;
-    }
+.selected mct-representation.s-status-pending > .t-object-label .t-item-icon:before {
+    border-color: rgba($colorItemTreeSelectedFg, 0.25) !important;
+    border-top-color: rgba($colorItemTreeSelectedFg, 1.0) !important;
 }

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

@@ -76,11 +76,6 @@ $pad: $interiorMargin * $baseRatio;
         font-family: symbolsfont;
         margin-right: $interiorMarginSm;
     }
-    &.t-save-as:before {
-        content:'\e612';
-        font-family: symbolsfont;
-        margin-right: $interiorMarginSm;
-    }
     &.t-cancel {
         .title-label { display: none; }
         &:before {

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

@@ -74,12 +74,6 @@
 
 .l-composite-control {
     vertical-align: middle;
-    &:not(.l-inline) {
-        margin-bottom: $interiorMargin;
-    }
-    &.l-inline {
-        display: inline-block;
-    }
     &.l-checkbox {
         .composite-control-label {
             line-height: 18px;
@@ -114,14 +108,12 @@
     font-size: 0.7rem;
 }
 
-/******************************************************** CUSTOM CHECKBOXES */
 label.checkbox.custom,
 label.radio.custom {
     $bg: pullForward($colorBodyBg, 10%);
     $d: $formRowCtrlsH;
     cursor: pointer;
     display: inline-block;
-    line-height: 120%;
     margin-right: $interiorMargin * 4;
     padding-left: $d + $interiorMargin;
     position: relative;
@@ -169,40 +161,7 @@ label.radio.custom {
 label.checkbox.custom input:checked ~ em:before { content: "\32"; }
 label.radio.custom input:checked ~ em:before { content: "\e619"; }
 
-.s-menu-btn label.checkbox.custom {
-    margin-left: 5px;
-}
-
-.item .checkbox {
-    &.checked label {
-        box-shadow: none;
-        border-bottom: none;
-    }
-}
-
-label.form-control.checkbox {
-    input {
-        margin-right: $interiorMargin;
-        vertical-align: top;
-    }
-}
-
-/******************************************************** INPUTS */
-input[type="text"],
-input[type="search"] {
-    @include nice-input();
-    &.numeric {
-        text-align: right;
-    }
-}
-
-.l-input-lg input[type="text"] {  width: 100% !important; }
-.l-input-med input[type="text"] { width: 200px !important; }
-.l-input-sm input[type="text"] {  width: 50px !important; }
-.l-numeric input[type="text"] { text-align: right; }
-
 .input-labeled {
-    // Used in toolbar
     margin-left: $interiorMargin;
     label {
         display: inline-block;
@@ -216,38 +175,30 @@ input[type="search"] {
     }
 }
 
-/******************************************************** SELECTS */
-.select {
-    @include btnSubtle($colorSelectBg);
-    @if $shdwBtns != none {
-        margin: 0 0 2px 0; // Needed to avoid dropshadow from being clipped by parent containers
+.s-menu-btn label.checkbox.custom {
+    margin-left: 5px;
+}
+
+.item .checkbox {
+    &.checked label {
+        box-shadow: none;
+        border-bottom: none;
     }
-    padding: 0 $interiorMargin;
-    overflow: hidden;
-    position: relative;
-    line-height: $formInputH;
-    select {
-        @include appearance(none);
-        box-sizing: border-box;
-        background: none;
-        color: $colorSelectFg;
-        cursor: pointer;
-        border: none !important;
-        padding: 4px 25px 2px 0px;
-        width: 130%;
-        option {
-            margin: $interiorMargin 0; // Firefox
-        }
-    }
-    &:after {
-        @include contextArrow();
-        pointer-events: none;
-        color: rgba($colorSelectFg, percentToDecimal($contrastInvokeMenuPercent));
-        position: absolute;
-        right: $interiorMargin; top: 0;
+}
+
+.context-available,
+.s-icon-btn {
+    $c: $colorKey;
+    color: $c;
+    &:hover {
+        color: lighten($c, 10%);
     }
 }
 
+.view-switcher {
+    @include trans-prop-nice-fade($controlFadeMs);
+}
+
 /******************************************************** OBJECT-HEADER */
 .object-header {
     font-size: 1em;
@@ -379,6 +330,7 @@ body.desktop .object-header {
 }
 
 /******************************************************** SLIDERS */
+
 .slider {
     $knobH: 100%;
     .slot {
@@ -472,7 +424,7 @@ body.desktop .object-header {
         border-top: 1px solid $colorInteriorBorder
     }
     .l-time-selects {
-        line-height: inherit;
+        line-height: $formInputH;
     }
 }
 
@@ -526,31 +478,11 @@ body.desktop .object-header {
     }
 }
 
-/******************************************************** TEXTAREA */
-textarea {
-    @include nice-textarea($colorInputBg, $colorInputFg);
-    position: absolute;
-    height: 100%;
-    width: 100%;
-}
-
-/******************************************************** MISC */
-.context-available,
-.s-icon-btn {
-    $c: $colorKey;
-    color: $c;
-    &:hover {
-        color: lighten($c, 10%);
-    }
-}
-
-.view-switcher {
-    @include trans-prop-nice-fade($controlFadeMs);
-}
-
 /******************************************************** BROWSER ELEMENTS */
+
 body.desktop {
     ::-webkit-scrollbar {
+        border-radius: 2px;
         box-sizing: border-box;
         box-shadow: inset $scrollbarTrackShdw;
         background-color: $scrollbarTrackColorBg;
@@ -559,15 +491,15 @@ body.desktop {
     }
 
     ::-webkit-scrollbar-thumb {
+        $bg: $scrollbarThumbColor;
+        $hc: $scrollbarThumbColorHov;
+        $gr: 5%;
+        @include background-image(linear-gradient(lighten($bg, $gr), $bg 20px));
+        border-radius: 2px;
         box-sizing: border-box;
-        background: $scrollbarThumbColor;
-        &:hover { background: $scrollbarThumbColorHov; }
-    }
-
-    .overlay ::-webkit-scrollbar-thumb {
-        $lr: 15%;
-        background: $scrollbarThumbColorOverlay;
-        &:hover { background: $scrollbarThumbColorOverlayHov; }
+        &:hover {
+            @include background-image(linear-gradient(lighten($hc, $gr), $hc 20px));
+        }
     }
 
     ::-webkit-scrollbar-corner {

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

@@ -51,6 +51,9 @@
 		.title-label {
 			font-size: 1rem;
 		}
+		//&:after {
+		//	color: rgba($colorInvokeMenu, 0.5);
+		//}
 	}
 
 	.menu {
@@ -110,13 +113,12 @@
 
 .menu,
 .context-menu,
-.super-menu,
-.s-menu-btn .menu {
+.super-menu {
 	pointer-events: auto;
 	ul li {
+		//padding-left: 25px;
 		a {
 			color: $colorMenuFg;
-            display: block;
 		}
 		.icon {
 			color: $colorMenuIc;
@@ -124,6 +126,9 @@
 		.type-icon {
 			left: $interiorMargin;
 		}
+		&:hover .icon {
+			//color: lighten($colorMenuIc, 5%);
+		}
 	}
 }
 
@@ -141,7 +146,7 @@
 				height: $d;
 				width: $d;
 				&:before {
-					font-size: 7px !important;
+					font-size: 7px !important;// $d/2;
 					height: $d;
 					width: $d;
 					line-height: $d;
@@ -168,6 +173,7 @@
 	.pane {
 		box-sizing: border-box;
 		&.left {
+			//@include test();
 			border-right: 1px solid pullForward($colorMenuBg, 10%);
 			left: 0;
 			padding-right: $interiorMargin;
@@ -184,6 +190,7 @@
 			}
 		}
 		&.right {
+			//@include test(red);
 			left: auto;
 			right: 0;
 			padding: $interiorMargin * 5;
@@ -209,6 +216,7 @@
 				margin-bottom: 0.5em;
 			}
 			&.description {
+				//color: lighten($colorMenuBg, 30%);
 				color: $colorCreateMenuText;
 				font-size: 0.8em;
 				line-height: 1.5em;
@@ -250,4 +258,4 @@
 	left: auto;
 	right: 0;
 	width: auto;
-}
+}

platform/commonUI/general/res/sass/controls/_time-controller.scss

@@ -1,42 +1,54 @@
 @mixin toiLineHovEffects() {
+	//@include pulse(.25s);
 	&:before,
 	&:after {
 		background-color: $timeControllerToiLineColorHov;
 	}
 }
 
-.l-time-controller {
+mct-include.l-time-controller {
 	$minW: 500px;
 	$knobHOffset: 0px;
 	$knobM: ($sliderKnobW + $knobHOffset) * -1;
 	$rangeValPad: $interiorMargin;
 	$rangeValOffset: $sliderKnobW;
+	//$knobCr: $sliderKnobW;
 	$timeRangeSliderLROffset: 130px + $sliderKnobW + $rangeValOffset;
 	$r1H: nth($ueTimeControlH,1);
 	$r2H: nth($ueTimeControlH,2);
 	$r3H: nth($ueTimeControlH,3);
 
+    //@include absPosDefault();
+    //@include test();
     display: block;
+    //top: auto;
 	height: $r1H + $r2H + $r3H + ($interiorMargin * 2);
     min-width: $minW;
     font-size: 0.8rem;
 
+	.l-time-range-inputs-holder,
+	.l-time-range-slider {
+		//font-size: 0.8em;
+	}
 
 	.l-time-range-inputs-holder,
 	.l-time-range-slider-holder,
 	.l-time-range-ticks-holder
 	{
+		//@include test();
 		@include absPosDefault(0, visible);
 		box-sizing: border-box;
 		top: auto;
 	}
 	.l-time-range-slider,
 	.l-time-range-ticks {
+		//@include test(red, 0.1);
 		@include absPosDefault(0, visible);
 		left: $timeRangeSliderLROffset; right: $timeRangeSliderLROffset;
 	}
 
 	.l-time-range-inputs-holder {
+		//@include test(red);
 		height: $r1H; bottom: $r2H + $r3H + ($interiorMarginSm * 2);
 		padding-top: $interiorMargin;
 		border-top: 1px solid $colorInteriorBorder;
@@ -58,6 +70,7 @@
 	}
 
 	.l-time-range-slider-holder {
+		//@include test(green);
 		height: $r2H; bottom: $r3H + ($interiorMarginSm * 1);
 		.range-holder {
 			box-shadow: none;
@@ -69,6 +82,7 @@
 					$myW: 8px;
 					@include transform(translateX(50%));
 					position: absolute;
+					//@include test();
 					top: 0; right: 0; bottom: 0px; left: auto;
 					width: $myW;
 					height: auto;
@@ -83,6 +97,7 @@
 						// Vert line
 						top: 0; right: auto; bottom: -10px; left: floor($myW/2) - 1;
 						width: 2px;
+						//top: 0; right: 3px; bottom: 0; left: 3px;
 					}
 					&:after {
 						// Circle element
@@ -99,6 +114,7 @@
 			}
 		}
 		&:not(:active) {
+			//@include test(#ff00cc);
 			.knob,
 			.range {
 				@include transition-property(left, right);
@@ -139,6 +155,7 @@
 	.knob {
 		z-index: 2;
 		.range-value {
+			//@include test($sliderColorRange);
 			@include trans-prop-nice-fade(.25s);
 			padding: 0 $rangeValOffset;
 			position: absolute;
@@ -150,6 +167,7 @@
 			color: $sliderColorKnobHov;
 		}
 		&.knob-l {
+			//border-bottom-left-radius: $knobCr; // MOVED TO _CONTROLS.SCSS
 			margin-left: $knobM;
 			.range-value {
 				text-align: right;
@@ -157,6 +175,7 @@
 			}
 		}
 		&.knob-r {
+			//border-bottom-right-radius: $knobCr;
 			margin-right: $knobM;
 			.range-value {
 				left: $rangeValOffset;
@@ -166,189 +185,15 @@
 			}
 		}
 	}
-
-	.l-time-domain-selector {
-		position: absolute;
-		right: 0px;
-		bottom: 46px;
-	}
-
 }
 
+//.slot.range-holder {
+//	background-color: $sliderColorRangeHolder;
+//}
+
 .s-time-range-val {
+	//@include test();
 	border-radius: $controlCr;
 	background-color: $colorInputBg;
 	padding: 1px 1px 0 $interiorMargin;
-}
-
-@include phoneandtablet {
-	.l-time-controller, .l-time-range-inputs-holder {
-		min-width: 0px;
-	}
-
-	.l-time-controller {
-
-		.l-time-domain-selector {
-			select {
-				height: 25px;
-				margin-bottom: 0px;
-			}
-		}
-
-		.l-time-range-slider-holder, .l-time-range-ticks-holder {
-			display: none;
-		}
-
-		.time-range-start, .time-range-end, {
-			width: 100%;
-		}
-
-		.l-time-range-inputs-holder {
-			.l-time-range-input {
-				display: block;
-				.s-btn {
-					padding-right: 18px;
-					white-space: nowrap;
-					input {
-						width: 100%;
-					}
-				}
-			}
-			.l-time-range-inputs-elem {
-
-			}
-		}
-	}
-}
-
-@include phone {
-	.l-time-controller {
-		height: 48px;
-
-		.l-time-range-inputs-holder {
-			bottom: 24px;
-		}
-
-		.l-time-domain-selector {
-			width: 33%;
-			bottom: -9px;
-		}
-
-		.l-time-range-inputs-holder {
-			.l-time-range-input {
-				margin-bottom: 5px;
-				.s-btn {
-					width: 66%;
-				}
-			}
-			.l-time-range-inputs-elem {
-				&.ui-symbol {
-					display: none;
-				}
-
-				&.lbl {
-					width: 33%;
-					right: 0px;
-					top: 5px;
-					display: block;
-					height: 25px;
-					margin: 0;
-					line-height: 25px;
-					position: absolute;
-				}
-			}
-		}
-	}
-}
-
-
-@include tablet {
-	.l-time-controller {
-		height: 17px;
-
-		.l-time-range-inputs-holder {
-			bottom: -7px;
-			left: -5px;
-		}
-
-		.l-time-domain-selector {
-			width: 23%;
-			right: -4px;
-			bottom: -10px;
-		}
-
-		.l-time-range-inputs-holder {
-			.l-time-range-input {
-				float: left;
-				.s-btn {
-					width: 100%;
-					padding-left: 4px;
-				}
-			}
-		}
-	}
-}
-
-@include tabletLandscape {
-	.l-time-controller {
-		height: 17px;
-
-		.l-time-range-inputs-holder {
-			bottom: -7px;
-		}
-
-		.l-time-domain-selector {
-			width: 23%;
-			right: auto;
-			bottom: -10px;
-			left: 391px;
-		}
-
-		.l-time-range-inputs-holder {
-			.l-time-range-inputs-elem {
-				&.ui-symbol, &.lbl {
-					display: block;
-					float: left;
-					line-height: 25px;
-				}
-			}
-		}
-	}
-
-	.pane-tree-hidden .l-time-controller {
-		.l-time-domain-selector {
-			left: 667px;
-		}
-		.l-time-range-inputs-holder {
-			padding-left: 277px;
-		}
-	}
-}
-@include tabletPortrait {
-	.l-time-controller {
-		height: 17px;
-
-		.l-time-range-inputs-holder {
-			bottom: -7px;
-			left: -5px;
-		}
-
-		.l-time-domain-selector {
-			width: 23%;
-			right: -4px;
-			bottom: -10px;
-		}
-
-		.l-time-range-inputs-holder {
-			.l-time-range-input {
-				width: 38%;
-				float: left;
-			}
-			.l-time-range-inputs-elem {
-				&.ui-symbol, &.lbl {
-					display: none;
-				}
-			}
-		}
-	}
-}
+}

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

@@ -20,7 +20,13 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 .section-header {
-    text-transform: uppercase;
+	border-radius: $basicCr;
+	background: $colorFormSectionHeader;
+	$c: lighten($colorBodyFg, 20%);
+	color: $c;
+	font-size: 0.8em;
+	padding: $formTBPad $formLRPad;
+	text-transform: uppercase;
 }
 
 .form {
@@ -31,20 +37,12 @@
 		margin-bottom: $interiorMarginLg * 2;
 	}
 
-    .section-header {
-        border-radius: $basicCr;
-        background: $colorFormSectionHeader;
-        $c: lighten($colorBodyFg, 20%);
-        color: $c;
-        font-size: 0.8em;
-        padding: $formTBPad $formLRPad;
-    }
-
 	.form-row {
 		$m: $interiorMargin;
 		box-sizing: border-box;
 		@include clearfix;
 		border-top: 1px solid $colorFormLines;
+		margin-top: $m;
 		padding: $formTBPad 0;
 		position: relative;
 		&.first {
@@ -54,7 +52,10 @@
 		>.label,
 		>.controls {
 			box-sizing: border-box;
+			@include clearfix;
 			font-size: 0.8rem;
+			line-height: $formInputH;
+            min-height: $formInputH;
 		}
 
 		>.label {
@@ -82,12 +83,27 @@
 					margin-right: 5px;
 				}
 			}
+
+			.l-med input[type="text"] {
+				width: 200px;
+			}
+
+			.l-small input[type="text"] {
+				width: 50px;
+			}
+
+			.l-numeric input[type="text"] {
+				text-align: right;
+			}
+
 			.select {
 				margin-right: $interiorMargin;
 			}
 		}
 
-		.hint, .field-hints {  color: $colorFieldHint;  }
+		.field-hints {
+			color: darken($colorBodyFg, 20%);
+		}
 
 		.selector-list {
 			// Used in create overlay to display tree view
@@ -108,31 +124,25 @@
 	}
 }
 
-.l-controls-first .form .form-row,
-.form .form-row.l-controls-first {
-    >.label,
-    >.controls {
-        line-height: inherit;
-        min-height: inherit;;
-    }
-    >.label {
-        @include flex(1 1 auto);
-        min-width: 0;
-        width: auto;
-        order: 2;
-    }
-    >.controls {
-        @include flex(0 0 auto);
-        margin-right: $interiorMargin;
-        order: 1;
-    }
-}
-
-.l-controls-under.l-flex-row {
-    // Change to use column layout
-    @include flex-direction(column);
-    .flex-elem {
-        margin-bottom: $interiorMarginLg;
+.l-controls-first {
+    .form .form-row {
+        margin-top: $interiorMarginSm;
+        >.label,
+        >.controls {
+            line-height: inherit;
+            min-height: inherit;;
+        }
+        >.label {
+            @include flex(1 1 auto);
+            min-width: 0;
+            width: auto;
+            order: 2;
+        }
+        >.controls {
+            @include flex(0 0 auto);
+            margin-right: $interiorMargin;
+            order: 1;
+        }
     }
 }
 
@@ -145,6 +155,13 @@
     }
 }
 
+label.form-control.checkbox {
+	input {
+		margin-right: $interiorMargin;
+		vertical-align: top;
+	}
+}
+
 .hint,
 .s-hint {
 	font-size: 0.9em;
@@ -164,4 +181,19 @@
 		color: lighten($colorFormInvalid, 30%);
 		padding: $interiorMargin;
 	}
+}
+
+input[type="text"],
+input[type="search"] {
+	@include nice-input();
+	&.numeric {
+		text-align: right;
+	}
+}
+
+textarea {
+	@include nice-textarea($colorInputBg, $colorInputFg);
+	position: absolute;
+	height: 100%;
+	width: 100%;
 }

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

@@ -19,32 +19,33 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-.sizing-table {
-    min-width: 100%;
-    z-index: -1;
-    visibility: hidden;
-    position: absolute;
-
-    //Add some padding to allow for decorations such as limits indicator
-    td {
-        padding-right: 15px;
-        padding-left: 10px;
-        white-space: nowrap;
+.select {
+	@include btnSubtle($colorSelectBg);
+    @if $shdwBtns != none {
+	    margin: 0 0 2px 0; // Needed to avoid dropshadow from being clipped by parent containers
     }
-}
-.mct-table {
-    table-layout: fixed;
-    th {
-        box-sizing: border-box;
-    }
-    tbody {
-        tr {
-            position: absolute;
+	padding: 0 $interiorMargin;
+    overflow: hidden;
+	position: relative;
+    line-height: $formInputH;
+	select {
+		@include appearance(none);
+		box-sizing: border-box;
+		background: none;
+		color: $colorSelectFg;
+		cursor: pointer;
+		border: none !important;
+		padding: 4px 25px 2px 0px;
+        width: 130%;
+        option {
+            margin: $interiorMargin 0; // Firefox
         }
-        td {
-            white-space: nowrap;
-            overflow: hidden;
-            box-sizing: border-box;
-        }
-    }
+	}
+	&:after {
+		@include contextArrow();
+		pointer-events: none;
+		color: rgba($colorSelectFg, percentToDecimal($contrastInvokeMenuPercent));
+		position: absolute;
+		right: $interiorMargin; top: 0;
+	}
 }

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

@@ -23,13 +23,9 @@
     > .label {
         padding-right: $reqSymbolM; // Keep room for validation element
         &::after {
-            position: absolute;
-            right: $interiorMargin;
+	        float: right;
             font-family: symbolsfont;
             font-size: $reqSymbolFontSize;
-            height: 100%;
-            line-height: 200%;
-
         }
     }
     &.invalid,

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

@@ -28,7 +28,7 @@
     100% { @include transform(translate(-50%, -50%) rotate(360deg)); }
 }
 
-@mixin  spinner($b: 5px, $c: $colorKey) {
+@mixin spinner($b: 5px, $c: $colorKey) {
     @include transform-origin(center);
     @include animation-name(rotation-centered);
     @include animation-duration(0.5s);
@@ -46,7 +46,10 @@
 }
 
 .wait-spinner {
-	@include spinner($waitSpinnerBorderW, $colorKey);
+	$d: 5%;
+	@include spinner(0.5em, $colorKey);
+	height: auto; width: auto;
+	padding: $d; // Will size object based on parent container WIDTH
 	pointer-events: none;
 	z-index: 2;
 	&.inline {
@@ -57,6 +60,15 @@
 	}
 }
 
+.treeview .wait-spinner {
+    // Only used in subtree.html, which I don't think this is actually being used
+	$d: 10px;
+	height: $d; width: $d;
+	margin: 0 !important;
+	padding: 0 !important;
+	top: 2px; left: 0;
+}
+
 .loading {
 	// Can be applied to any block element with height and width
     pointer-events: none;
@@ -65,8 +77,8 @@
         content: '';
     }
 	&:before {
-        @include spinner($waitSpinnerBorderW, $colorLoadingFg);
-        height: $waitSpinnerD; width: $waitSpinnerD;
+        @include spinner(5px, $colorLoadingFg);
+        padding: 15px;
         z-index: 10;
 	}
     &:after {
@@ -75,22 +87,4 @@
         display: block;
         z-index: 9;
     }
-    &.tree-item.t-wait-node {
-        $d: $waitSpinnerTreeD;
-        $spinnerL: $treeVCW + $interiorMargin + 3px + $d/2;
-        padding-left: $spinnerL + $d/2 + $interiorMargin;
-        .t-title-label {
-            font-style: italic;
-            opacity: 0.6;
-        }
-        &:before {
-            height: $d;
-            width: $d;
-            border-width: 4px;
-            left: $spinnerL;
-        }
-        &:after {
-            display: none;
-        }
-    }
-}
+}

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

@@ -35,6 +35,7 @@
         z-index: 100;
     }
     > .holder {
+        //$i: 15%;
         @include containerSubtle($colorOvrBg, $colorOvrFg);
         border-radius: $basicCr * 3;
         color: $colorOvrFg;
@@ -56,8 +57,15 @@
             right: $m;
             bottom: $m;
             left: $m;
+
+            //.top-bar,
+            //.editor,
+            //.bottom-bar {
+            //    @include absPosDefault();
+            //}
         }
     }
+
     .title {
         @include ellipsize();
         font-size: 1.2em;
@@ -65,7 +73,9 @@
         margin-bottom: $interiorMargin;
     }
 
-    .hint, .field-hints { color: $colorFieldHintOverlay !important;  }
+    .hint {
+        color: pushBack($colorOvrFg, 20%);
+    }
 
     .abs.top-bar {
         height: $ovrTopBarH;
@@ -78,7 +88,7 @@
         left: 0;
         right: 0;
         overflow: auto;
-        .field.l-input-med {
+        .field.l-med {
             input[type='text'] {
                 width: 100%;
             }
@@ -110,6 +120,7 @@
         bottom: 0;
         left: 0;
         overflow: visible;
+        //font-size: 1em;
         height: $ovrFooterH;
     }
 
@@ -121,14 +132,11 @@
         margin: .5em 0;
         width: 100%;
     }
-
-    .select {
-        box-shadow: $shdwBtnsOverlay;
-    }
 }
 
 .t-dialog-sm .overlay > .holder {
     // Used for blocker and in-progress dialogs, modal alerts, etc.
+    //@include test(red);
     $h: 225px;
     min-height: $h;
     height: $h;

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

@@ -26,10 +26,6 @@
     top: $m; right: $m * 1.25; bottom: $m; left: $m * 1.25;
 }
 
-body, html {
-    overflow: hidden;
-}
-
 .l-splash-holder {
     // Main outer holder.
     @include transition-property(opacity);

platform/commonUI/general/res/templates/controls/time-controller.html

@@ -19,18 +19,15 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div ng-controller="TimeRangeController as trCtrl">
+<div ng-controller="TimeRangeController">
     <form class="l-time-range-inputs-holder"
-          ng-submit="trCtrl.updateBoundsFromForm()">
+          ng-submit="updateBoundsFromForm()">
         <span class="l-time-range-inputs-elem ui-symbol type-icon">&#x43;</span>
         <span class="l-time-range-input">
             <mct-control key="'datetime-field'"
-                         structure="{
-                             format: parameters.format,
-                             validate: trCtrl.validateStart
-                         }"
+                         structure="{ format: parameters.format, validate: validateStart }"
                          ng-model="formModel"
-                         ng-blur="trCtrl.updateBoundsFromForm()"
+                         ng-blur="updateBoundsFromForm()"
                          field="'start'"
                          class="time-range-start">
             </mct-control>
@@ -40,12 +37,9 @@
 
         <span class="l-time-range-input" ng-controller="ToggleController as t2">
             <mct-control key="'datetime-field'"
-                         structure="{
-                             format: parameters.format,
-                             validate: trCtrl.validateEnd
-                         }"
+                         structure="{ format: parameters.format, validate: validateEnd }"
                          ng-model="formModel"
-                         ng-blur="trCtrl.updateBoundsFromForm()"
+                         ng-blur="updateBoundsFromForm()"
                          field="'end'"
                          class="time-range-end">
             </mct-control>&nbsp;
@@ -59,25 +53,22 @@
             <div class="slider"
                  mct-resize="spanWidth = bounds.width">
                 <div class="knob knob-l"
-                     mct-drag-down="trCtrl.startLeftDrag()"
-                     mct-drag="trCtrl.leftDrag(delta[0])"
+                     mct-drag-down="startLeftDrag()"
+                     mct-drag="leftDrag(delta[0])"
                      ng-style="{ left: startInnerPct }">
                     <div class="range-value">{{startInnerText}}</div>
                 </div>
                 <div class="knob knob-r"
-                     mct-drag-down="trCtrl.startRightDrag()"
-                     mct-drag="trCtrl.rightDrag(delta[0])"
+                     mct-drag-down="startRightDrag()"
+                     mct-drag="rightDrag(delta[0])"
                      ng-style="{ right: endInnerPct }">
                     <div class="range-value">{{endInnerText}}</div>
                 </div>
                 <div class="slot range-holder">
                     <div class="range"
-                         mct-drag-down="trCtrl.startMiddleDrag()"
-                         mct-drag="trCtrl.middleDrag(delta[0])"
-                         ng-style="{
-                             left: startInnerPct,
-                             right: endInnerPct
-                         }">
+                         mct-drag-down="startMiddleDrag()"
+                         mct-drag="middleDrag(delta[0])"
+                         ng-style="{ left: startInnerPct, right: endInnerPct}">
                         <div class="toi-line"></div>
                     </div>
                 </div>

platform/commonUI/general/res/templates/object-inspector.html

@@ -20,7 +20,7 @@
  at runtime from the About dialog for additional information.
 -->
 <span class="l-inspect">
-    <div ng-controller="PaneController">
+    <div ng-controller="PaneController as modelPaneEdit">
         <mct-split-pane class='abs contents split-layout' anchor='bottom'>
             <div class="split-pane-component pane top">
                 <div class="abs holder holder-inspector l-flex-col">
@@ -31,8 +31,8 @@
                             ng-model="ngModel"
                             class="flex-elem grows vscroll l-flex-col">
                     </mct-representation>
-                </div>
-            </div>
+                </div><!--/ holder-inspector -->
+            </div><!--/ split-pane-component -->
             <mct-splitter class="splitter-inspect-panel mobile-hide"></mct-splitter>
             <div class="split-pane-component pane bottom">
                 <div class="abs holder holder-elements l-flex-col">
@@ -40,10 +40,10 @@
                     <mct-representation
                             key="'edit-elements'"
                             mct-object="domainObject"
-                            class="flex-elem l-flex-col holder grows current-elements">
+                            class="flex-elem holder grows vscroll current-elements">
                     </mct-representation>
                 </div>
             </div>
         </mct-split-pane>
-    </div>
+    </div><!--/ PaneController -->
 </span>

platform/commonUI/general/res/templates/subtree.html

@@ -19,6 +19,18 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<mct-tree mct-object="domainObject" mct-model="ngModel.selectedObject">
-</mct-tree>
-
+<ul class="tree">
+    <li ng-if="!composition">
+        <span class="tree-item">
+            <span class="icon wait-spinner"></span>
+            <span class="title-label">Loading...</span>
+        </span>
+    </li>
+    <li ng-repeat="child in composition">
+        <mct-representation key="'tree-node'"
+                            mct-object="child"
+                            parameters="parameters"
+                            ng-model="ngModel">
+        </mct-representation>
+    </li>
+</ul>

platform/commonUI/general/res/templates/tree/node.html

@@ -1,4 +0,0 @@
-<span class="tree-item menus-to-left">
-</span>
-<span class="tree-item-subtree">
-</span>

platform/commonUI/general/res/templates/tree/toggle.html

@@ -1,2 +0,0 @@
-<span class='ui-symbol view-control flex-elem'>
-</span>

platform/commonUI/general/res/templates/tree/tree-label.html

@@ -1,8 +0,0 @@
-<span class="rep-object-label">
-    <div class="t-object-label l-flex-row flex-elem grows">
-        <div class="t-item-icon flex-elem">
-            <div class="t-item-icon-glyph"></div>
-        </div>
-        <div class='t-title-label flex-elem grows'></div>
-    </div>
-</span>

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

@@ -19,289 +19,247 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
+/*global define,Promise*/
 
-define([
+define(
+    ['moment'],
+    function (moment) {
+        "use strict";
 
-], function () {
-    "use strict";
+        var TICK_SPACING_PX = 150;
 
-    var TICK_SPACING_PX = 150;
 
-    /* format number as percent; 0.0-1.0 to "0%"-"100%" */
-    function toPercent(p) {
-        return (100 * p) + "%";
+        /**
+         * Controller used by the `time-controller` template.
+         * @memberof platform/commonUI/general
+         * @constructor
+         * @param $scope the Angular scope for this controller
+         * @param {FormatService} formatService the service to user to format
+         *        domain values
+         * @param {string} defaultFormat the format to request when no
+         *        format has been otherwise specified
+         * @param {Function} now a function to return current system time
+         */
+        function TimeRangeController($scope, formatService, defaultFormat, now) {
+            var tickCount = 2,
+                innerMinimumSpan = 1000, // 1 second
+                outerMinimumSpan = 1000, // 1 second
+                initialDragValue,
+                formatter = formatService.getFormat(defaultFormat);
+
+            function formatTimestamp(ts) {
+                return formatter.format(ts);
+            }
+
+            // From 0.0-1.0 to "0%"-"100%"
+            function toPercent(p) {
+                return (100 * p) + "%";
+            }
+
+            function updateTicks() {
+                var i, p, ts, start, end, span;
+                end = $scope.ngModel.outer.end;
+                start = $scope.ngModel.outer.start;
+                span = end - start;
+                $scope.ticks = [];
+                for (i = 0; i < tickCount; i += 1) {
+                    p = i / (tickCount - 1);
+                    ts = p * span + start;
+                    $scope.ticks.push(formatTimestamp(ts));
+                }
+            }
+
+            function updateSpanWidth(w) {
+                tickCount = Math.max(Math.floor(w / TICK_SPACING_PX), 2);
+                updateTicks();
+            }
+
+            function updateViewForInnerSpanFromModel(ngModel) {
+                var span = ngModel.outer.end - ngModel.outer.start;
+
+                // Expose readable dates for the knobs
+                $scope.startInnerText = formatTimestamp(ngModel.inner.start);
+                $scope.endInnerText = formatTimestamp(ngModel.inner.end);
+
+                // And positions for the knobs
+                $scope.startInnerPct =
+                    toPercent((ngModel.inner.start - ngModel.outer.start) / span);
+                $scope.endInnerPct =
+                    toPercent((ngModel.outer.end - ngModel.inner.end) / span);
+            }
+
+            function defaultBounds() {
+                var t = now();
+                return {
+                    start: t - 24 * 3600 * 1000, // One day
+                    end: t
+                };
+            }
+
+            function copyBounds(bounds) {
+                return { start: bounds.start, end: bounds.end };
+            }
+
+            function updateViewFromModel(ngModel) {
+                ngModel = ngModel || {};
+                ngModel.outer = ngModel.outer || defaultBounds();
+                ngModel.inner = ngModel.inner || copyBounds(ngModel.outer);
+
+                // Stick it back is scope (in case we just set defaults)
+                $scope.ngModel = ngModel;
+
+                updateViewForInnerSpanFromModel(ngModel);
+                updateTicks();
+            }
+
+            function startLeftDrag() {
+                initialDragValue = $scope.ngModel.inner.start;
+            }
+
+            function startRightDrag() {
+                initialDragValue = $scope.ngModel.inner.end;
+            }
+
+            function startMiddleDrag() {
+                initialDragValue = {
+                    start: $scope.ngModel.inner.start,
+                    end: $scope.ngModel.inner.end
+                };
+            }
+
+            function toMillis(pixels) {
+                var span =
+                    $scope.ngModel.outer.end - $scope.ngModel.outer.start;
+                return (pixels / $scope.spanWidth) * span;
+            }
+
+            function clamp(value, low, high) {
+                return Math.max(low, Math.min(high, value));
+            }
+
+            function leftDrag(pixels) {
+                var delta = toMillis(pixels);
+                $scope.ngModel.inner.start = clamp(
+                    initialDragValue + delta,
+                    $scope.ngModel.outer.start,
+                    $scope.ngModel.inner.end - innerMinimumSpan
+                );
+                updateViewFromModel($scope.ngModel);
+            }
+
+            function rightDrag(pixels) {
+                var delta = toMillis(pixels);
+                $scope.ngModel.inner.end = clamp(
+                    initialDragValue + delta,
+                    $scope.ngModel.inner.start + innerMinimumSpan,
+                    $scope.ngModel.outer.end
+                );
+                updateViewFromModel($scope.ngModel);
+            }
+
+            function middleDrag(pixels) {
+                var delta = toMillis(pixels),
+                    edge = delta < 0 ? 'start' : 'end',
+                    opposite = delta < 0 ? 'end' : 'start';
+
+                // Adjust the position of the edge in the direction of drag
+                $scope.ngModel.inner[edge] = clamp(
+                    initialDragValue[edge] + delta,
+                    $scope.ngModel.outer.start,
+                    $scope.ngModel.outer.end
+                );
+                // Adjust opposite knob to maintain span
+                $scope.ngModel.inner[opposite] = $scope.ngModel.inner[edge] +
+                    initialDragValue[opposite] - initialDragValue[edge];
+
+                updateViewFromModel($scope.ngModel);
+            }
+
+            function updateFormModel() {
+                $scope.formModel = {
+                    start: (($scope.ngModel || {}).outer || {}).start,
+                    end: (($scope.ngModel || {}).outer || {}).end
+                };
+            }
+
+            function updateOuterStart(t) {
+                var ngModel = $scope.ngModel;
+
+                ngModel.inner.start =
+                    Math.max(ngModel.outer.start, ngModel.inner.start);
+                ngModel.inner.end = Math.max(
+                    ngModel.inner.start + innerMinimumSpan,
+                    ngModel.inner.end
+                );
+
+                updateFormModel();
+                updateViewForInnerSpanFromModel(ngModel);
+                updateTicks();
+            }
+
+            function updateOuterEnd(t) {
+                var ngModel = $scope.ngModel;
+
+                ngModel.inner.end =
+                    Math.min(ngModel.outer.end, ngModel.inner.end);
+                ngModel.inner.start = Math.min(
+                    ngModel.inner.end - innerMinimumSpan,
+                    ngModel.inner.start
+                );
+
+                updateFormModel();
+                updateViewForInnerSpanFromModel(ngModel);
+                updateTicks();
+            }
+
+            function updateFormat(key) {
+                formatter = formatService.getFormat(key || defaultFormat);
+                updateViewForInnerSpanFromModel($scope.ngModel);
+                updateTicks();
+            }
+
+            function updateBoundsFromForm() {
+                var start = $scope.formModel.start,
+                    end = $scope.formModel.end;
+                if (end >= start + outerMinimumSpan) {
+                    $scope.ngModel = $scope.ngModel || {};
+                    $scope.ngModel.outer = { start: start, end: end };
+                }
+            }
+
+            function validateStart(startValue) {
+                return startValue <= $scope.formModel.end - outerMinimumSpan;
+            }
+
+            function validateEnd(endValue) {
+                return endValue >= $scope.formModel.start + outerMinimumSpan;
+            }
+
+            $scope.startLeftDrag = startLeftDrag;
+            $scope.startRightDrag = startRightDrag;
+            $scope.startMiddleDrag = startMiddleDrag;
+            $scope.leftDrag = leftDrag;
+            $scope.rightDrag = rightDrag;
+            $scope.middleDrag = middleDrag;
+
+            $scope.updateBoundsFromForm = updateBoundsFromForm;
+
+            $scope.validateStart = validateStart;
+            $scope.validateEnd = validateEnd;
+
+            $scope.ticks = [];
+
+            // Initialize scope to defaults
+            updateViewFromModel($scope.ngModel);
+            updateFormModel();
+
+            $scope.$watchCollection("ngModel", updateViewFromModel);
+            $scope.$watch("spanWidth", updateSpanWidth);
+            $scope.$watch("ngModel.outer.start", updateOuterStart);
+            $scope.$watch("ngModel.outer.end", updateOuterEnd);
+            $scope.$watch("parameters.format", updateFormat);
+        }
+
+        return TimeRangeController;
     }
-
-    function clamp(value, low, high) {
-        return Math.max(low, Math.min(high, value));
-    }
-
-    function copyBounds(bounds) {
-        return {
-            start: bounds.start,
-            end: bounds.end
-        };
-    }
-
-    /**
-     * Controller used by the `time-controller` template.
-     * @memberof platform/commonUI/general
-     * @constructor
-     * @param $scope the Angular scope for this controller
-     * @param {FormatService} formatService the service to user to format
-     *        domain values
-     * @param {string} defaultFormat the format to request when no
-     *        format has been otherwise specified
-     * @param {Function} now a function to return current system time
-     */
-    function TimeRangeController($scope, formatService, defaultFormat, now) {
-        this.$scope = $scope;
-        this.formatService = formatService;
-        this.defaultFormat = defaultFormat;
-        this.now = now;
-
-        this.tickCount = 2;
-        this.innerMinimumSpan = 1000; // 1 second
-        this.outerMinimumSpan = 1000; // 1 second
-        this.initialDragValue = undefined;
-        this.formatter = formatService.getFormat(defaultFormat);
-        this.formStartChanged = false;
-        this.formEndChanged = false;
-
-        this.$scope.ticks = [];
-
-        this.updateViewFromModel(this.$scope.ngModel);
-        this.updateFormModel();
-
-        [
-            'updateViewFromModel',
-            'updateSpanWidth',
-            'updateOuterStart',
-            'updateOuterEnd',
-            'updateFormat',
-            'validateStart',
-            'validateEnd',
-            'onFormStartChange',
-            'onFormEndChange'
-        ].forEach(function (boundFn) {
-            this[boundFn] = this[boundFn].bind(this);
-        }, this);
-
-        this.$scope.$watchCollection("ngModel", this.updateViewFromModel);
-        this.$scope.$watch("spanWidth", this.updateSpanWidth);
-        this.$scope.$watch("ngModel.outer.start", this.updateOuterStart);
-        this.$scope.$watch("ngModel.outer.end", this.updateOuterEnd);
-        this.$scope.$watch("parameters.format", this.updateFormat);
-        this.$scope.$watch("formModel.start", this.onFormStartChange);
-        this.$scope.$watch("formModel.end", this.onFormEndChange);
-    }
-
-    TimeRangeController.prototype.formatTimestamp = function (ts) {
-        return this.formatter.format(ts);
-    };
-
-    TimeRangeController.prototype.updateTicks = function () {
-        var i, p, ts, start, end, span;
-        end = this.$scope.ngModel.outer.end;
-        start = this.$scope.ngModel.outer.start;
-        span = end - start;
-        this.$scope.ticks = [];
-        for (i = 0; i < this.tickCount; i += 1) {
-            p = i / (this.tickCount - 1);
-            ts = p * span + start;
-            this.$scope.ticks.push(this.formatTimestamp(ts));
-        }
-    };
-
-    TimeRangeController.prototype.updateSpanWidth = function (w) {
-        this.tickCount = Math.max(Math.floor(w / TICK_SPACING_PX), 2);
-        this.updateTicks();
-    };
-
-    TimeRangeController.prototype.updateViewForInnerSpanFromModel = function (
-        ngModel
-    ) {
-        var span = ngModel.outer.end - ngModel.outer.start;
-
-        // Expose readable dates for the knobs
-        this.$scope.startInnerText = this.formatTimestamp(ngModel.inner.start);
-        this.$scope.endInnerText = this.formatTimestamp(ngModel.inner.end);
-
-        // And positions for the knobs
-        this.$scope.startInnerPct =
-            toPercent((ngModel.inner.start - ngModel.outer.start) / span);
-        this.$scope.endInnerPct =
-            toPercent((ngModel.outer.end - ngModel.inner.end) / span);
-    };
-
-    TimeRangeController.prototype.defaultBounds = function () {
-        var t = this.now();
-        return {
-            start: t - 24 * 3600 * 1000, // One day
-            end: t
-        };
-    };
-
-
-    TimeRangeController.prototype.updateViewFromModel = function (ngModel) {
-        ngModel = ngModel || {};
-        ngModel.outer = ngModel.outer || this.defaultBounds();
-        ngModel.inner = ngModel.inner || copyBounds(ngModel.outer);
-
-        // Stick it back is scope (in case we just set defaults)
-        this.$scope.ngModel = ngModel;
-
-        this.updateViewForInnerSpanFromModel(ngModel);
-        this.updateTicks();
-    };
-
-    TimeRangeController.prototype.startLeftDrag = function () {
-        this.initialDragValue = this.$scope.ngModel.inner.start;
-    };
-
-    TimeRangeController.prototype.startRightDrag = function () {
-        this.initialDragValue = this.$scope.ngModel.inner.end;
-    };
-
-    TimeRangeController.prototype.startMiddleDrag = function () {
-        this.initialDragValue = {
-            start: this.$scope.ngModel.inner.start,
-            end: this.$scope.ngModel.inner.end
-        };
-    };
-
-    TimeRangeController.prototype.toMillis = function (pixels) {
-        var span =
-            this.$scope.ngModel.outer.end - this.$scope.ngModel.outer.start;
-        return (pixels / this.$scope.spanWidth) * span;
-    };
-
-    TimeRangeController.prototype.leftDrag = function (pixels) {
-        var delta = this.toMillis(pixels);
-        this.$scope.ngModel.inner.start = clamp(
-            this.initialDragValue + delta,
-            this.$scope.ngModel.outer.start,
-            this.$scope.ngModel.inner.end - this.innerMinimumSpan
-        );
-        this.updateViewFromModel(this.$scope.ngModel);
-    };
-
-    TimeRangeController.prototype.rightDrag = function (pixels) {
-        var delta = this.toMillis(pixels);
-        this.$scope.ngModel.inner.end = clamp(
-            this.initialDragValue + delta,
-            this.$scope.ngModel.inner.start + this.innerMinimumSpan,
-            this.$scope.ngModel.outer.end
-        );
-        this.updateViewFromModel(this.$scope.ngModel);
-    };
-
-    TimeRangeController.prototype.middleDrag = function (pixels) {
-        var delta = this.toMillis(pixels),
-            edge = delta < 0 ? 'start' : 'end',
-            opposite = delta < 0 ? 'end' : 'start';
-
-        // Adjust the position of the edge in the direction of drag
-        this.$scope.ngModel.inner[edge] = clamp(
-            this.initialDragValue[edge] + delta,
-            this.$scope.ngModel.outer.start,
-            this.$scope.ngModel.outer.end
-        );
-        // Adjust opposite knob to maintain span
-        this.$scope.ngModel.inner[opposite] =
-            this.$scope.ngModel.inner[edge] +
-            this.initialDragValue[opposite] -
-            this.initialDragValue[edge];
-
-        this.updateViewFromModel(this.$scope.ngModel);
-    };
-
-    TimeRangeController.prototype.updateFormModel = function () {
-        this.$scope.formModel = {
-            start: ((this.$scope.ngModel || {}).outer || {}).start,
-            end: ((this.$scope.ngModel || {}).outer || {}).end
-        };
-    };
-
-    TimeRangeController.prototype.updateOuterStart = function () {
-        var ngModel = this.$scope.ngModel;
-
-        ngModel.inner.start =
-            Math.max(ngModel.outer.start, ngModel.inner.start);
-        ngModel.inner.end = Math.max(
-            ngModel.inner.start + this.innerMinimumSpan,
-            ngModel.inner.end
-        );
-
-        this.updateFormModel();
-        this.updateViewForInnerSpanFromModel(ngModel);
-        this.updateTicks();
-    };
-
-    TimeRangeController.prototype.updateOuterEnd = function () {
-        var ngModel = this.$scope.ngModel;
-
-        ngModel.inner.end =
-            Math.min(ngModel.outer.end, ngModel.inner.end);
-        ngModel.inner.start = Math.min(
-            ngModel.inner.end - this.innerMinimumSpan,
-            ngModel.inner.start
-        );
-
-        this.updateFormModel();
-        this.updateViewForInnerSpanFromModel(ngModel);
-        this.updateTicks();
-    };
-
-    TimeRangeController.prototype.updateFormat = function (key) {
-        this.formatter = this.formatService.getFormat(key || this.defaultFormat);
-        this.updateViewForInnerSpanFromModel(this.$scope.ngModel);
-        this.updateTicks();
-    };
-
-    TimeRangeController.prototype.updateBoundsFromForm = function () {
-        if (this.formStartChanged) {
-            this.$scope.ngModel.outer.start =
-                this.$scope.ngModel.inner.start =
-                this.$scope.formModel.start;
-            this.formStartChanged = false;
-        }
-        if (this.formEndChanged) {
-            this.$scope.ngModel.outer.end =
-                this.$scope.ngModel.inner.end =
-                this.$scope.formModel.end;
-            this.formEndChanged = false;
-        }
-    };
-
-    TimeRangeController.prototype.onFormStartChange = function (
-        newValue,
-        oldValue
-    ) {
-        if (!this.formStartChanged && newValue !== oldValue) {
-            this.formStartChanged = true;
-        }
-    };
-
-    TimeRangeController.prototype.onFormEndChange = function (
-        newValue,
-        oldValue
-    ) {
-        if (!this.formEndChanged && newValue !== oldValue) {
-            this.formEndChanged = true;
-        }
-    };
-
-    TimeRangeController.prototype.validateStart = function (startValue) {
-        return startValue <=
-            this.$scope.formModel.end - this.outerMinimumSpan;
-    };
-
-    TimeRangeController.prototype.validateEnd = function (endValue) {
-        return endValue >=
-            this.$scope.formModel.start + this.outerMinimumSpan;
-    };
-
-    return TimeRangeController;
-});
+);

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

@@ -1,54 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define([
-    'angular',
-    '../ui/TreeView'
-], function (angular, TreeView) {
-    function MCTTree($parse, gestureService) {
-        function link(scope, element, attrs) {
-            var treeView = new TreeView(gestureService),
-                expr = $parse(attrs.mctModel),
-                unobserve = treeView.observe(function (domainObject) {
-                    if (domainObject !== expr(scope.$parent)) {
-                        expr.assign(scope.$parent, domainObject);
-                        scope.$apply();
-                    }
-                });
-
-            element.append(angular.element(treeView.elements()));
-
-            scope.$parent.$watch(attrs.mctModel, treeView.value.bind(treeView));
-            scope.$watch('mctObject', treeView.model.bind(treeView));
-            scope.$on('$destroy', unobserve);
-        }
-
-        return {
-            restrict: "E",
-            link: link,
-            scope: { mctObject: "=" }
-        };
-    }
-
-    return MCTTree;
-});

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

@@ -1,65 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define([
-    'zepto',
-    'text!../../res/templates/tree/toggle.html'
-], function ($, toggleTemplate) {
-    function ToggleView(state) {
-        this.expanded = !!state;
-        this.callbacks = [];
-        this.el = $(toggleTemplate);
-        this.el.on('click', function () {
-            this.value(!this.expanded);
-        }.bind(this));
-    }
-
-    ToggleView.prototype.value = function (state) {
-        this.expanded = state;
-
-        if (state) {
-            this.el.addClass('expanded');
-        } else {
-            this.el.removeClass('expanded');
-        }
-
-        this.callbacks.forEach(function (callback) {
-            callback(state);
-        });
-    };
-
-    ToggleView.prototype.observe = function (callback) {
-        this.callbacks.push(callback);
-        return function () {
-            this.callbacks = this.callbacks.filter(function (c) {
-                return c !== callback;
-            });
-        }.bind(this);
-    };
-
-    ToggleView.prototype.elements = function () {
-        return this.el;
-    };
-
-    return ToggleView;
-});

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

@@ -1,90 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define([
-    'zepto',
-    'text!../../res/templates/tree/tree-label.html'
-], function ($, labelTemplate) {
-    'use strict';
-
-    function TreeLabelView(gestureService) {
-        this.el = $(labelTemplate);
-        this.gestureService = gestureService;
-    }
-
-    function getGlyph(domainObject) {
-        var type = domainObject.getCapability('type');
-        return type.getGlyph();
-    }
-
-    function isLink(domainObject) {
-        var location = domainObject.getCapability('location');
-        return location.isLink();
-    }
-
-    TreeLabelView.prototype.updateView = function (domainObject) {
-        var titleEl = this.el.find('.t-title-label'),
-            glyphEl = this.el.find('.t-item-icon-glyph'),
-            iconEl = this.el.find('.t-item-icon');
-
-        titleEl.text(domainObject ? domainObject.getModel().name : "");
-        glyphEl.text(domainObject ? getGlyph(domainObject) : "");
-
-        if (domainObject && isLink(domainObject)) {
-            iconEl.addClass('l-icon-link');
-        } else {
-            iconEl.removeClass('l-icon-link');
-        }
-    };
-
-    TreeLabelView.prototype.model = function (domainObject) {
-        if (this.unlisten) {
-            this.unlisten();
-            delete this.unlisten;
-        }
-
-        if (this.activeGestures) {
-            this.activeGestures.destroy();
-            delete this.activeGestures;
-        }
-
-        this.updateView(domainObject);
-
-        if (domainObject) {
-            this.unlisten = domainObject.getCapability('mutation')
-                .listen(this.updateView.bind(this, domainObject));
-
-            this.activeGestures = this.gestureService.attachGestures(
-                this.elements(),
-                domainObject,
-                [ 'info', 'menu', 'drag' ]
-            );
-        }
-    };
-
-    TreeLabelView.prototype.elements = function () {
-        return this.el;
-    };
-
-    return TreeLabelView;
-});

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

@@ -1,157 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define([
-    'zepto',
-    'text!../../res/templates/tree/node.html',
-    './ToggleView',
-    './TreeLabelView'
-], function ($, nodeTemplate, ToggleView, TreeLabelView) {
-    'use strict';
-
-    function TreeNodeView(gestureService, subtreeFactory, selectFn) {
-        this.li = $('<li>');
-
-        this.statusClasses = [];
-
-        this.toggleView = new ToggleView(false);
-        this.toggleView.observe(function (state) {
-            if (state) {
-                if (!this.subtreeView) {
-                    this.subtreeView = subtreeFactory();
-                    this.subtreeView.model(this.activeObject);
-                    this.li.find('.tree-item-subtree').eq(0)
-                        .append($(this.subtreeView.elements()));
-                }
-                $(this.subtreeView.elements()).removeClass('hidden');
-            } else if (this.subtreeView) {
-                $(this.subtreeView.elements()).addClass('hidden');
-            }
-        }.bind(this));
-
-        this.labelView = new TreeLabelView(gestureService);
-
-        $(this.labelView.elements()).on('click', function () {
-            selectFn(this.activeObject);
-        }.bind(this));
-
-        this.li.append($(nodeTemplate));
-        this.li.find('span').eq(0)
-            .append($(this.toggleView.elements()))
-            .append($(this.labelView.elements()));
-
-        this.model(undefined);
-    }
-
-    TreeNodeView.prototype.updateStatusClasses = function (statuses) {
-        this.statusClasses.forEach(function (statusClass) {
-            this.li.removeClass(statusClass);
-        }.bind(this));
-
-        this.statusClasses = statuses.map(function (status) {
-            return 's-status-' + status;
-        });
-
-        this.statusClasses.forEach(function (statusClass) {
-            this.li.addClass(statusClass);
-        }.bind(this));
-    };
-
-    TreeNodeView.prototype.model = function (domainObject) {
-        if (this.unlisten) {
-            this.unlisten();
-        }
-
-        this.activeObject = domainObject;
-
-        if (domainObject && domainObject.hasCapability('composition')) {
-            $(this.toggleView.elements()).addClass('has-children');
-        } else {
-            $(this.toggleView.elements()).removeClass('has-children');
-        }
-
-        if (domainObject && domainObject.hasCapability('status')) {
-            this.unlisten = domainObject.getCapability('status')
-                .listen(this.updateStatusClasses.bind(this));
-            this.updateStatusClasses(
-                domainObject.getCapability('status').list()
-            );
-        }
-
-        this.labelView.model(domainObject);
-        if (this.subtreeView) {
-            this.subtreeView.model(domainObject);
-        }
-    };
-
-    function getIdPath(domainObject) {
-        var context = domainObject && domainObject.getCapability('context');
-
-        function getId(domainObject) {
-            return domainObject.getId();
-        }
-
-        return context ? context.getPath().map(getId) : [];
-    }
-
-    TreeNodeView.prototype.value = function (domainObject) {
-        var activeIdPath = getIdPath(this.activeObject),
-            selectedIdPath = getIdPath(domainObject);
-
-        if (this.onSelectionPath) {
-            this.li.find('.tree-item').eq(0).removeClass('selected');
-            if (this.subtreeView) {
-                this.subtreeView.value(undefined);
-            }
-        }
-
-        this.onSelectionPath =
-            !!domainObject &&
-            !!this.activeObject &&
-            (activeIdPath.length <= selectedIdPath.length) &&
-                activeIdPath.every(function (id, index) {
-                    return selectedIdPath[index] === id;
-                });
-
-        if (this.onSelectionPath) {
-            if (activeIdPath.length === selectedIdPath.length) {
-                this.li.find('.tree-item').eq(0).addClass('selected');
-            } else {
-                // Expand to reveal the selection
-                this.toggleView.value(true);
-                this.subtreeView.value(domainObject);
-            }
-        }
-    };
-
-    /**
-     *
-     * @returns {HTMLElement[]}
-     */
-    TreeNodeView.prototype.elements = function () {
-        return this.li;
-    };
-
-
-    return TreeNodeView;
-});

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

@@ -1,141 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define([
-    'zepto',
-    './TreeNodeView',
-    'text!../../res/templates/tree/wait-node.html'
-], function ($, TreeNodeView, spinnerTemplate) {
-    'use strict';
-
-    function TreeView(gestureService, selectFn) {
-        this.ul = $('<ul class="tree"></ul>');
-        this.nodeViews = [];
-        this.callbacks = [];
-        this.selectFn = selectFn || this.value.bind(this);
-        this.gestureService = gestureService;
-        this.pending = false;
-    }
-
-    TreeView.prototype.newTreeView = function () {
-        return new TreeView(this.gestureService, this.selectFn);
-    };
-
-    TreeView.prototype.setSize = function (sz) {
-        var nodeView;
-
-        while (this.nodeViews.length < sz) {
-            nodeView = new TreeNodeView(
-                this.gestureService,
-                this.newTreeView.bind(this),
-                this.selectFn
-            );
-            this.nodeViews.push(nodeView);
-            this.ul.append($(nodeView.elements()));
-        }
-
-        while (this.nodeViews.length > sz) {
-            nodeView = this.nodeViews.pop();
-            $(nodeView.elements()).remove();
-        }
-    };
-
-    TreeView.prototype.loadComposition = function () {
-        var self = this,
-            domainObject = this.activeObject;
-
-        function addNode(domainObject, index) {
-            self.nodeViews[index].model(domainObject);
-        }
-
-        function addNodes(domainObjects) {
-            if (self.pending) {
-                self.pending = false;
-                self.nodeViews = [];
-                self.ul.empty();
-            }
-
-            if (domainObject === self.activeObject) {
-                self.setSize(domainObjects.length);
-                domainObjects.forEach(addNode);
-                self.updateNodeViewSelection();
-            }
-        }
-
-        domainObject.useCapability('composition')
-            .then(addNodes);
-    };
-
-    TreeView.prototype.model = function (domainObject) {
-        if (this.unlisten) {
-            this.unlisten();
-        }
-
-        this.activeObject = domainObject;
-        this.ul.empty();
-
-        if (domainObject && domainObject.hasCapability('composition')) {
-            this.pending = true;
-            this.ul.append($(spinnerTemplate));
-            this.unlisten = domainObject.getCapability('mutation')
-                .listen(this.loadComposition.bind(this));
-            this.loadComposition(domainObject);
-        } else {
-            this.setSize(0);
-        }
-    };
-
-    TreeView.prototype.updateNodeViewSelection = function () {
-        this.nodeViews.forEach(function (nodeView) {
-            nodeView.value(this.selectedObject);
-        }.bind(this));
-    };
-
-    TreeView.prototype.value = function (domainObject) {
-        this.selectedObject = domainObject;
-        this.updateNodeViewSelection();
-        this.callbacks.forEach(function (callback) {
-            callback(domainObject);
-        });
-    };
-
-    TreeView.prototype.observe = function (callback) {
-        this.callbacks.push(callback);
-        return function () {
-            this.callbacks = this.callbacks.filter(function (c) {
-                return c !== callback;
-            });
-        }.bind(this);
-    };
-
-    /**
-     *
-     * @returns {HTMLElement[]}
-     */
-    TreeView.prototype.elements = function () {
-        return this.ul;
-    };
-
-
-    return TreeView;
-});

platform/commonUI/general/test/controllers/TimeRangeControllerSpec.js

@@ -94,18 +94,18 @@ define(
             it("exposes start time validator", function () {
                 var testValue = 42000000;
                 mockScope.formModel = { end: testValue };
-                expect(controller.validateStart(testValue + 1))
+                expect(mockScope.validateStart(testValue + 1))
                     .toBe(false);
-                expect(controller.validateStart(testValue - 60 * 60 * 1000 - 1))
+                expect(mockScope.validateStart(testValue - 60 * 60 * 1000 - 1))
                     .toBe(true);
             });
 
             it("exposes end time validator", function () {
                 var testValue = 42000000;
                 mockScope.formModel = { start:  testValue };
-                expect(controller.validateEnd(testValue - 1))
+                expect(mockScope.validateEnd(testValue - 1))
                     .toBe(false);
-                expect(controller.validateEnd(testValue + 60 * 60 * 1000 + 1))
+                expect(mockScope.validateEnd(testValue + 60 * 60 * 1000 + 1))
                     .toBe(true);
             });
 
@@ -119,87 +119,25 @@ define(
                         start: DAY * 10000,
                         end: DAY * 11000
                     };
-                });
-
-                it('updates all changed bounds when requested', function () {
+                    // These watches may not exist, but Angular would fire
+                    // them if they did.
                     fireWatchCollection("formModel", mockScope.formModel);
                     fireWatch("formModel.start", mockScope.formModel.start);
                     fireWatch("formModel.end", mockScope.formModel.end);
-
-                    expect(mockScope.ngModel.outer.start)
-                        .not.toEqual(mockScope.formModel.start);
-                    expect(mockScope.ngModel.inner.start)
-                        .not.toEqual(mockScope.formModel.start);
-
-                    expect(mockScope.ngModel.outer.end)
-                        .not.toEqual(mockScope.formModel.end);
-                    expect(mockScope.ngModel.inner.end)
-                        .not.toEqual(mockScope.formModel.end);
-
-                    controller.updateBoundsFromForm();
-
-                    expect(mockScope.ngModel.outer.start)
-                        .toEqual(mockScope.formModel.start);
-                    expect(mockScope.ngModel.inner.start)
-                        .toEqual(mockScope.formModel.start);
-
-                    expect(mockScope.ngModel.outer.end)
-                        .toEqual(mockScope.formModel.end);
-                    expect(mockScope.ngModel.inner.end)
-                        .toEqual(mockScope.formModel.end);
                 });
 
-                it('updates changed start bound when requested', function () {
-                    fireWatchCollection("formModel", mockScope.formModel);
-                    fireWatch("formModel.start", mockScope.formModel.start);
-
+                it("does not immediately make changes to the model", function () {
                     expect(mockScope.ngModel.outer.start)
                         .not.toEqual(mockScope.formModel.start);
-                    expect(mockScope.ngModel.inner.start)
-                        .not.toEqual(mockScope.formModel.start);
-
                     expect(mockScope.ngModel.outer.end)
                         .not.toEqual(mockScope.formModel.end);
-                    expect(mockScope.ngModel.inner.end)
-                        .not.toEqual(mockScope.formModel.end);
-
-                    controller.updateBoundsFromForm();
-
-                    expect(mockScope.ngModel.outer.start)
-                        .toEqual(mockScope.formModel.start);
-                    expect(mockScope.ngModel.inner.start)
-                        .toEqual(mockScope.formModel.start);
-
-                    expect(mockScope.ngModel.outer.end)
-                        .not.toEqual(mockScope.formModel.end);
-                    expect(mockScope.ngModel.inner.end)
-                        .not.toEqual(mockScope.formModel.end);
                 });
 
-                it('updates changed end bound when requested', function () {
-                    fireWatchCollection("formModel", mockScope.formModel);
-                    fireWatch("formModel.end", mockScope.formModel.end);
-
+                it("updates model bounds on request", function () {
+                    mockScope.updateBoundsFromForm();
                     expect(mockScope.ngModel.outer.start)
-                        .not.toEqual(mockScope.formModel.start);
-                    expect(mockScope.ngModel.inner.start)
-                        .not.toEqual(mockScope.formModel.start);
-
+                        .toEqual(mockScope.formModel.start);
                     expect(mockScope.ngModel.outer.end)
-                        .not.toEqual(mockScope.formModel.end);
-                    expect(mockScope.ngModel.inner.end)
-                        .not.toEqual(mockScope.formModel.end);
-
-                    controller.updateBoundsFromForm();
-
-                    expect(mockScope.ngModel.outer.start)
-                        .not.toEqual(mockScope.formModel.start);
-                    expect(mockScope.ngModel.inner.start)
-                        .not.toEqual(mockScope.formModel.start);
-
-                    expect(mockScope.ngModel.outer.end)
-                        .toEqual(mockScope.formModel.end);
-                    expect(mockScope.ngModel.inner.end)
                         .toEqual(mockScope.formModel.end);
                 });
             });
@@ -222,27 +160,27 @@ define(
                 });
 
                 it("updates the start time for left drags", function () {
-                    controller.startLeftDrag();
-                    controller.leftDrag(250);
+                    mockScope.startLeftDrag();
+                    mockScope.leftDrag(250);
                     expect(mockScope.ngModel.inner.start)
                         .toEqual(DAY * 1000 + HOUR * 9);
                 });
 
                 it("updates the end time for right drags", function () {
-                    controller.startRightDrag();
-                    controller.rightDrag(-250);
+                    mockScope.startRightDrag();
+                    mockScope.rightDrag(-250);
                     expect(mockScope.ngModel.inner.end)
                         .toEqual(DAY * 1000 + HOUR * 15);
                 });
 
                 it("updates both start and end for middle drags", function () {
-                    controller.startMiddleDrag();
-                    controller.middleDrag(-125);
+                    mockScope.startMiddleDrag();
+                    mockScope.middleDrag(-125);
                     expect(mockScope.ngModel.inner).toEqual({
                         start: DAY * 1000,
                         end: DAY * 1000 + HOUR * 18
                     });
-                    controller.middleDrag(250);
+                    mockScope.middleDrag(250);
                     expect(mockScope.ngModel.inner).toEqual({
                         start: DAY * 1000 + HOUR * 6,
                         end: DAY * 1001
@@ -250,8 +188,8 @@ define(
                 });
 
                 it("enforces a minimum inner span", function () {
-                    controller.startRightDrag();
-                    controller.rightDrag(-9999999);
+                    mockScope.startRightDrag();
+                    mockScope.rightDrag(-9999999);
                     expect(mockScope.ngModel.inner.end)
                         .toBeGreaterThan(mockScope.ngModel.inner.start);
                 });

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

@@ -1,95 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,describe,beforeEach,jasmine,it,expect*/
-
-define([
-    '../../src/directives/MCTTree'
-], function (MCTTree) {
-    describe("The mct-tree directive", function () {
-        var mockParse,
-            mockGestureService,
-            mockExpr,
-            mctTree;
-
-        beforeEach(function () {
-            mockGestureService = jasmine.createSpyObj(
-                'gestureService',
-                [ 'attachGestures' ]
-            );
-            mockParse = jasmine.createSpy('$parse');
-            mockExpr = jasmine.createSpy('expr');
-            mockExpr.assign = jasmine.createSpy('assign');
-            mockParse.andReturn(mockExpr);
-
-            mctTree = new MCTTree(mockParse, mockGestureService);
-        });
-
-        it("is applicable as an element", function () {
-            expect(mctTree.restrict).toEqual("E");
-        });
-
-        it("two-way binds to mctObject", function () {
-            expect(mctTree.scope).toEqual({ mctObject: "=" });
-        });
-
-        describe("link", function () {
-            var mockScope,
-                mockElement,
-                testAttrs;
-
-            beforeEach(function () {
-                mockScope = jasmine.createSpyObj('$scope', ['$watch', '$on']);
-                mockElement = jasmine.createSpyObj('element', ['append']);
-                testAttrs = { mctModel: "some-expression" };
-                mockScope.$parent =
-                    jasmine.createSpyObj('$scope', ['$watch', '$on']);
-                mctTree.link(mockScope, mockElement, testAttrs);
-            });
-
-            it("populates the mct-tree element", function () {
-                expect(mockElement.append).toHaveBeenCalled();
-            });
-
-            it("watches for mct-model's expression in the parent", function () {
-                expect(mockScope.$parent.$watch).toHaveBeenCalledWith(
-                    testAttrs.mctModel,
-                    jasmine.any(Function)
-                );
-            });
-
-            it("watches for changes to mct-object", function () {
-                expect(mockScope.$watch).toHaveBeenCalledWith(
-                    "mctObject",
-                    jasmine.any(Function)
-                );
-            });
-
-            it("listens for the $destroy event", function () {
-                expect(mockScope.$on).toHaveBeenCalledWith(
-                    "$destroy",
-                    jasmine.any(Function)
-                );
-            });
-        });
-    });
-
-});

platform/commonUI/general/test/ui/TreeViewSpec.js

@@ -1,313 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,describe,beforeEach,jasmine,it,expect*/
-
-define([
-    '../../src/ui/TreeView',
-    'zepto'
-], function (TreeView, $) {
-    'use strict';
-
-    describe("TreeView", function () {
-        var mockGestureService,
-            mockGestureHandle,
-            mockDomainObject,
-            mockMutation,
-            mockUnlisten,
-            testCapabilities,
-            treeView;
-
-        function makeMockDomainObject(id, model, capabilities) {
-            var mockDomainObject = jasmine.createSpyObj(
-                'domainObject-' + id,
-                [
-                    'getId',
-                    'getModel',
-                    'getCapability',
-                    'hasCapability',
-                    'useCapability'
-                ]
-            );
-            mockDomainObject.getId.andReturn(id);
-            mockDomainObject.getModel.andReturn(model);
-            mockDomainObject.hasCapability.andCallFake(function (c) {
-                return !!(capabilities[c]);
-            });
-            mockDomainObject.getCapability.andCallFake(function (c) {
-                return capabilities[c];
-            });
-            mockDomainObject.useCapability.andCallFake(function (c) {
-                return capabilities[c] && capabilities[c].invoke();
-            });
-            return mockDomainObject;
-        }
-
-        beforeEach(function () {
-            mockGestureService = jasmine.createSpyObj(
-                'gestureService',
-                [ 'attachGestures' ]
-            );
-
-            mockGestureHandle = jasmine.createSpyObj('gestures', ['destroy']);
-
-            mockGestureService.attachGestures.andReturn(mockGestureHandle);
-
-            mockMutation = jasmine.createSpyObj('mutation', ['listen']);
-            mockUnlisten = jasmine.createSpy('unlisten');
-            mockMutation.listen.andReturn(mockUnlisten);
-
-            testCapabilities = { mutation: mockMutation };
-
-            mockDomainObject =
-                makeMockDomainObject('parent', {}, testCapabilities);
-
-            treeView = new TreeView(mockGestureService);
-        });
-
-        describe("elements", function () {
-            var elements;
-
-            beforeEach(function () {
-                elements = treeView.elements();
-            });
-
-            it("is an unordered list", function () {
-                expect(elements[0].tagName.toLowerCase())
-                    .toEqual('ul');
-            });
-        });
-
-        describe("model", function () {
-            var mockComposition;
-
-            function makeGenericCapabilities() {
-                var mockContext =
-                        jasmine.createSpyObj('context', [ 'getPath' ]),
-                    mockType =
-                        jasmine.createSpyObj('type', [ 'getGlyph' ]),
-                    mockLocation =
-                        jasmine.createSpyObj('location', [ 'isLink' ]),
-                    mockMutation =
-                        jasmine.createSpyObj('mutation', [ 'listen' ]),
-                    mockStatus =
-                        jasmine.createSpyObj('status', [ 'listen', 'list' ]);
-
-                mockStatus.list.andReturn([]);
-
-                return {
-                    context: mockContext,
-                    type: mockType,
-                    mutation: mockMutation,
-                    location: mockLocation,
-                    status: mockStatus
-                };
-            }
-
-            function waitForCompositionCallback() {
-                var calledBack = false;
-                testCapabilities.composition.invoke().then(function (c) {
-                    calledBack = true;
-                });
-                waitsFor(function () {
-                    return calledBack;
-                });
-            }
-
-            beforeEach(function () {
-                mockComposition = ['a', 'b', 'c'].map(function (id) {
-                    var testCapabilities = makeGenericCapabilities(),
-                        mockChild =
-                            makeMockDomainObject(id, {}, testCapabilities);
-
-                    testCapabilities.context.getPath
-                        .andReturn([mockDomainObject, mockChild]);
-
-                    return mockChild;
-                });
-
-                testCapabilities.composition =
-                    jasmine.createSpyObj('composition', ['invoke']);
-                testCapabilities.composition.invoke
-                    .andReturn(Promise.resolve(mockComposition));
-
-                treeView.model(mockDomainObject);
-                waitForCompositionCallback();
-            });
-
-            it("adds one node per composition element", function () {
-                expect(treeView.elements()[0].childElementCount)
-                    .toEqual(mockComposition.length);
-            });
-
-            it("listens for mutation", function () {
-                expect(testCapabilities.mutation.listen)
-                    .toHaveBeenCalledWith(jasmine.any(Function));
-            });
-
-            describe("when mutation occurs", function () {
-                beforeEach(function () {
-                    mockComposition.pop();
-                    testCapabilities.mutation.listen
-                        .mostRecentCall.args[0](mockDomainObject.getModel());
-                    waitForCompositionCallback();
-                });
-
-                it("continues to show one node per composition element", function () {
-                    expect(treeView.elements()[0].childElementCount)
-                        .toEqual(mockComposition.length);
-                });
-            });
-
-            describe("when replaced with a non-compositional domain object", function () {
-                beforeEach(function () {
-                    delete testCapabilities.composition;
-                    treeView.model(mockDomainObject);
-                });
-
-                it("stops listening for mutation", function () {
-                    expect(mockUnlisten).toHaveBeenCalled();
-                });
-
-                it("removes all tree nodes", function () {
-                    expect(treeView.elements()[0].childElementCount)
-                        .toEqual(0);
-                });
-            });
-
-            describe("when selection state changes", function () {
-                var selectionIndex = 1;
-
-                beforeEach(function () {
-                    treeView.value(mockComposition[selectionIndex]);
-                });
-
-                it("communicates selection state to an appropriate node", function () {
-                    var selected = $(treeView.elements()[0]).find('.selected');
-                    expect(selected.length).toEqual(1);
-                });
-            });
-
-            describe("when a context-less object is selected", function () {
-                beforeEach(function () {
-                    var testCapabilities = makeGenericCapabilities(),
-                        mockDomainObject =
-                            makeMockDomainObject('xyz', {}, testCapabilities);
-                    delete testCapabilities.context;
-                    treeView.value(mockDomainObject);
-                });
-
-                it("clears all selection state", function () {
-                    var selected = $(treeView.elements()[0]).find('.selected');
-                    expect(selected.length).toEqual(0);
-                });
-            });
-
-            describe("when children contain children", function () {
-                beforeEach(function () {
-                    var newCapabilities = makeGenericCapabilities(),
-                        gcCapabilities = makeGenericCapabilities(),
-                        mockNewChild =
-                            makeMockDomainObject('d', {}, newCapabilities),
-                        mockGrandchild =
-                            makeMockDomainObject('gc', {}, gcCapabilities),
-                        calledBackInner = false;
-
-                    newCapabilities.composition =
-                        jasmine.createSpyObj('composition', [ 'invoke' ]);
-                    newCapabilities.composition.invoke
-                        .andReturn(Promise.resolve([mockGrandchild]));
-                    mockComposition.push(mockNewChild);
-
-                    newCapabilities.context.getPath.andReturn([
-                        mockDomainObject,
-                        mockNewChild
-                    ]);
-                    gcCapabilities.context.getPath.andReturn([
-                        mockDomainObject,
-                        mockNewChild,
-                        mockGrandchild
-                    ]);
-
-                    testCapabilities.mutation.listen
-                        .mostRecentCall.args[0](mockDomainObject);
-                    waitForCompositionCallback();
-                    runs(function () {
-                        // Select the innermost object to force expansion,
-                        // such that we can verify the subtree is present.
-                        treeView.value(mockGrandchild);
-                        newCapabilities.composition.invoke().then(function () {
-                            calledBackInner = true;
-                        });
-                    });
-                    waitsFor(function () {
-                        return calledBackInner;
-                    });
-                });
-
-                it("creates inner trees", function () {
-                    expect($(treeView.elements()[0]).find('ul').length)
-                        .toEqual(1);
-                });
-            });
-
-            describe("when status changes", function () {
-                var testStatuses;
-
-                beforeEach(function () {
-                    var mockStatus = mockComposition[1].getCapability('status');
-
-                    testStatuses = [ 'foo' ];
-
-                    mockStatus.list.andReturn(testStatuses);
-                    mockStatus.listen.mostRecentCall.args[0](testStatuses);
-                });
-
-                it("reflects the status change in the tree", function () {
-                    expect($(treeView.elements()).find('.s-status-foo').length)
-                        .toEqual(1);
-                });
-            });
-        });
-
-        describe("observe", function () {
-            var mockCallback,
-                unobserve;
-
-            beforeEach(function () {
-                mockCallback = jasmine.createSpy('callback');
-                unobserve = treeView.observe(mockCallback);
-            });
-
-            it("notifies listeners when value is changed", function () {
-                treeView.value(mockDomainObject);
-                expect(mockCallback).toHaveBeenCalledWith(mockDomainObject);
-            });
-
-            it("does not notify listeners when deactivated", function () {
-                unobserve();
-                treeView.value(mockDomainObject);
-                expect(mockCallback).not.toHaveBeenCalled();
-            });
-        });
-    });
-
-});