[Frontend] Only include grippy when there's more than one element (#2055 )

Fixes #2053
recognize difference between android tablet and phones (#2048 )
2025-06-26 03:00:13 +00:00 · 2018-06-01 16:28:40 -07:00 · 2018-05-25 22:18:18 -07:00 · 2018-05-25 18:58:49 -07:00 · 2018-05-25 11:19:27 -07:00 · 2018-05-18 10:52:24 -07:00
876 changed files with 4169 additions and 1425 deletions
--- a/API.md
+++ b/API.md
@ -23,7 +23,7 @@
          - [Value Hints](#value-hints)
        - [The Time Conductor and Telemetry](#the-time-conductor-and-telemetry)
      - [Telemetry Providers](#telemetry-providers)
-      - [Telemetry Requests](#telemetry-requests)
+      - [Telemetry Requests and Responses.](#telemetry-requests-and-responses)
      - [Request Strategies **draft**](#request-strategies-draft)
        - [`latest` request strategy](#latest-request-strategy)
        - [`minmax` request strategy](#minmax-request-strategy)
@ -32,7 +32,7 @@
      - [Telemetry Data](#telemetry-data)
        - [Telemetry Datums](#telemetry-datums)
      - [Limit Evaluators **draft**](#limit-evaluators-draft)
-    - [Telemetry Visualization APIs **draft**](#telemetry-visualization-apis-draft)
+    - [Telemetry Consumer APIs **draft**](#telemetry-consumer-apis-draft)
  - [Time API](#time-api)
    - [Time Systems and Bounds](#time-systems-and-bounds)
      - [Defining and Registering Time Systems](#defining-and-registering-time-systems)
@ -449,7 +449,7 @@ A telemetry provider is a javascript object with up to four methods:
 * `supportsSubscribe(domainObject, callback, options)` optional.  Must be implemented to provide realtime telemetry.  Should return `true` if the provider supports subscriptions for the given domain object (and request options).
 * `subscribe(domainObject, callback, options)` required if `supportsSubscribe` is implemented.  Establish a subscription for realtime data for the given domain object.  Should invoke `callback` with a single telemetry datum every time data is received.  Must return an unsubscribe function.  Multiple views can subscribe to the same telemetry object, so it should always return a new unsubscribe function.
 * `supportsRequest(domainObject, options)` optional.  Must be implemented to provide historical telemetry.  Should return `true` if the provider supports historical requests for the given domain object.
-* `request(domainObject, options)` required if `supportsRequest` is implemented.  Must return a promise for an array of telemetry datums that fulfills the request.  The `options` argument will include a `start`, `end`, and `domain` attribute representing the query bounds.  For more request properties, see Request Properties below.
+* `request(domainObject, options)` required if `supportsRequest` is implemented.  Must return a promise for an array of telemetry datums that fulfills the request.  The `options` argument will include a `start`, `end`, and `domain` attribute representing the query bounds.  See [Telemetry Requests and Responses](#telemetry-requests-and-responses) for more info on how to respond to requests.
 * `supportsMetadata(domainObject)` optional.  Implement and return `true` for objects that you want to provide dynamic metadata for.
 * `getMetadata(domainObject)` required if `supportsMetadata` is implemented.  Must return a valid telemetry metadata definition that includes at least one valueMetadata definition.
 * `supportsLimits(domainObject)` optional.  Implement and return `true` for domain objects that you want to provide a limit evaluator for.
@ -466,7 +466,7 @@ openmct.telemetry.addProvider({

 Note: it is not required to implement all of the methods on every provider.  Depending on the complexity of your implementation, it may be helpful to instantiate and register your realtime, historical, and metadata providers separately.

-#### Telemetry Requests
+#### Telemetry Requests and Responses.

 Telemetry requests support time bounded queries. A call to a _Telemetry Provider_'s `request` function will include an `options` argument. These are simply javascript objects with attributes for the request parameters. An example of a telemetry request object with a start and end time is included below:

@ -480,8 +480,7 @@ Telemetry requests support time bounded queries. A call to a _Telemetry Provider

 In this case, the `domain` is the currently selected time-system, and the start and end dates are valid dates in that time system.

-The response to a telemetry request is an array of telemetry datums.  
-These datums must be sorted by `domain` in ascending order.
+A telemetry provider's `request` method should return a promise for an array of telemetry datums.  These datums must be sorted by `domain` in ascending order.

 #### Request Strategies **draft**

--- a/circle.yml
+++ b/circle.yml
@ -1,6 +1,6 @@
 machine:
  node:
-    version: 4.7.0
+    version: 8.11.0

 dependencies:
  pre:
@ -24,4 +24,4 @@ test:
 general:
  branches:
    ignore:
-      - gh-pages
+      - gh-pages
--- a/example/generator/StateGeneratorProvider.js
+++ b/example/generator/StateGeneratorProvider.js
@ -47,7 +47,9 @@ define([

        var interval = setInterval(function () {
            var now = Date.now();
-            callback(pointForTimestamp(now, duration, domainObject.name));
+            var datum = pointForTimestamp(now, duration, domainObject.name);
+            datum.value += "";
+            callback(datum);
        }, duration);

        return function () {
--- a/example/styleguide/res/sass/_style-guide-base.scss
+++ b/example/styleguide/res/sass/_style-guide-base.scss
@ -101,11 +101,11 @@
        padding-top: 1em;

        .cols {
-            @include display(flex);
-            @include flex-direction(row);
+            display: flex;
+            flex-direction: row;

            .col {
-                @include flex(1 1 auto);
+                flex: 1 1 auto;
                &:not(:last-child) {
                    $v: $interiorMargin * 4;
                    border-right: 1px solid $colorInteriorBorder;
@ -199,7 +199,7 @@
                border-radius: 15%;
                position: absolute;
                left: 50%;
-                @include transform(translateX(-50%));
+                transform: translateX(-50%);
            }
        }
    }
--- a/index.html
+++ b/index.html
@ -21,68 +21,69 @@
 -->
 <!doctype html>
 <html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <title></title>
-    <script src="bower_components/requirejs/require.js"> </script>
-    <script>
-        var THIRTY_MINUTES = 30 * 60 * 1000;
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no">
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <title></title>
+        <script src="bower_components/requirejs/require.js"> </script>
+        <script>
+            var THIRTY_MINUTES = 30 * 60 * 1000;

-        require(['openmct'], function (openmct) {
-            [
-                'example/eventGenerator',
-                'example/styleguide'
-            ].forEach(
-                openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
-            );
-            openmct.install(openmct.plugins.MyItems());
-            openmct.install(openmct.plugins.LocalStorage());
-            openmct.install(openmct.plugins.Espresso());
-            openmct.install(openmct.plugins.Generator());
-            openmct.install(openmct.plugins.ExampleImagery());
-            openmct.install(openmct.plugins.UTCTimeSystem());
-            openmct.install(openmct.plugins.ImportExport());
-            openmct.install(openmct.plugins.AutoflowView({
-                type: "telemetry.panel"
-            }));
-            openmct.install(openmct.plugins.Conductor({
-                menuOptions: [
-                    {
-                        name: "Fixed",
-                        timeSystem: 'utc',
-                        bounds: {
-                            start: Date.now() - THIRTY_MINUTES,
-                            end: Date.now()
+            require(['openmct'], function (openmct) {
+                [
+                    'example/eventGenerator',
+                    'example/styleguide'
+                ].forEach(
+                    openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
+                );
+                openmct.install(openmct.plugins.MyItems());
+                openmct.install(openmct.plugins.LocalStorage());
+                openmct.install(openmct.plugins.Espresso());
+                openmct.install(openmct.plugins.Generator());
+                openmct.install(openmct.plugins.ExampleImagery());
+                openmct.install(openmct.plugins.UTCTimeSystem());
+                openmct.install(openmct.plugins.ImportExport());
+                openmct.install(openmct.plugins.AutoflowView({
+                    type: "telemetry.panel"
+                }));
+                openmct.install(openmct.plugins.Conductor({
+                    menuOptions: [
+                        {
+                            name: "Fixed",
+                            timeSystem: 'utc',
+                            bounds: {
+                                start: Date.now() - THIRTY_MINUTES,
+                                end: Date.now()
+                            }
+                        },
+                        {
+                            name: "Realtime",
+                            timeSystem: 'utc',
+                            clock: 'local',
+                            clockOffsets: {
+                                start: -25 * 60 * 1000,
+                                end: 5 * 60 * 1000
+                            }
                        }
-                    },
-                    {
-                        name: "Realtime",
-                        timeSystem: 'utc',
-                        clock: 'local',
-                        clockOffsets: {
-                            start: -25 * 60 * 1000,
-                            end: 5 * 60 * 1000
-                        }
-                    }
-                ]
-            }));
-            openmct.install(openmct.plugins.SummaryWidget());
-            openmct.time.clock('local', {start: -THIRTY_MINUTES, end: 0});
-            openmct.time.timeSystem('utc');
-            openmct.start();
-        });
-    </script>
-    <link rel="stylesheet" href="platform/commonUI/general/res/css/startup-base.css">
-    <link rel="stylesheet" href="platform/commonUI/general/res/css/openmct.css">
-    <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico">
-</head>
-<body class="user-environ">
-    <div class="l-splash-holder s-splash-holder">
-        <div class="l-splash s-splash"></div>
-    </div>
-</body>
+                    ]
+                }));
+                openmct.install(openmct.plugins.SummaryWidget());
+                openmct.time.clock('local', {start: -THIRTY_MINUTES, end: 0});
+                openmct.time.timeSystem('utc');
+                openmct.start();
+            });
+        </script>
+        <link rel="stylesheet" href="platform/commonUI/general/res/css/startup-base.css">
+        <link rel="stylesheet" href="platform/commonUI/general/res/css/openmct.css">
+        <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-32x32.png" sizes="32x32">
+        <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-96x96.png" sizes="96x96">
+        <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-16x16.png" sizes="16x16">
+        <link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico">
+    </head>
+    <body>
+        <div class="l-splash-holder s-splash-holder">
+            <div class="l-splash s-splash"></div>
+        </div>
+    </body>
 </html>
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "openmct",
-  "version": "0.13.3-SNAPSHOT",
+  "version": "0.14.0-SNAPSHOT",
  "description": "The Open MCT core platform",
  "dependencies": {
    "d3-array": "1.2.x",
--- a/platform/commonUI/about/bundle.js
+++ b/platform/commonUI/about/bundle.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/res/templates/about-dialog.html
+++ b/platform/commonUI/about/res/templates/about-dialog.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@ -24,7 +24,7 @@
    <div class="s-text l-content">
        <h1 class="l-title s-title">Open MCT</h1>
        <div class="l-description s-description">
-	        <p>Open MCT, Copyright &copy; 2014-2017, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.</p>
+	        <p>Open MCT, Copyright &copy; 2014-2018, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.</p>
 	        <p>Open MCT is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.</p>
 	        <p>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.</p>
 	        <p>Open MCT includes source code licensed under additional open source licenses. See the Open Source Licenses file included with this distribution or <a ng-click="about.openLicenses()">click here for licensing information</a>.</p>
--- a/platform/commonUI/about/res/templates/about-logo.html
+++ b/platform/commonUI/about/res/templates/about-logo.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/app-logo.html
+++ b/platform/commonUI/about/res/templates/app-logo.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/license-apache.html
+++ b/platform/commonUI/about/res/templates/license-apache.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/license-mit.html
+++ b/platform/commonUI/about/res/templates/license-mit.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/licenses-export-md.html
+++ b/platform/commonUI/about/res/templates/licenses-export-md.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/licenses.html
+++ b/platform/commonUI/about/res/templates/licenses.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/res/templates/overlay-about.html
+++ b/platform/commonUI/about/res/templates/overlay-about.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/about/src/AboutController.js
+++ b/platform/commonUI/about/src/AboutController.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/src/LicenseController.js
+++ b/platform/commonUI/about/src/LicenseController.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/src/LogoController.js
+++ b/platform/commonUI/about/src/LogoController.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/test/AboutControllerSpec.js
+++ b/platform/commonUI/about/test/AboutControllerSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/test/LicenseControllerSpec.js
+++ b/platform/commonUI/about/test/LicenseControllerSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/about/test/LogoControllerSpec.js
+++ b/platform/commonUI/about/test/LogoControllerSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/bundle.js
+++ b/platform/commonUI/browse/bundle.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@ -113,7 +113,8 @@ define([
                        "agentService",
                        "$window",
                        "$location",
-                        "$attrs"
+                        "$attrs",
+                        "navigationService"
                    ]
                },
                {
--- a/platform/commonUI/browse/res/templates/back-arrow.html
+++ b/platform/commonUI/browse/res/templates/back-arrow.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/browse-object.html
+++ b/platform/commonUI/browse/res/templates/browse-object.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/browse.html
+++ b/platform/commonUI/browse/res/templates/browse.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/browse/inspector-region.html
+++ b/platform/commonUI/browse/res/templates/browse/inspector-region.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/browse/object-header-frame.html
+++ b/platform/commonUI/browse/res/templates/browse/object-header-frame.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/browse/object-header.html
+++ b/platform/commonUI/browse/res/templates/browse/object-header.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/browse/object-properties.html
+++ b/platform/commonUI/browse/res/templates/browse/object-properties.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/items/grid-item.html
+++ b/platform/commonUI/browse/res/templates/items/grid-item.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/items/items.html
+++ b/platform/commonUI/browse/res/templates/items/items.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/res/templates/menu-arrow.html
+++ b/platform/commonUI/browse/res/templates/menu-arrow.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/browse/src/BrowseController.js
+++ b/platform/commonUI/browse/src/BrowseController.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/BrowseObjectController.js
+++ b/platform/commonUI/browse/src/BrowseObjectController.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/InspectorRegion.js
+++ b/platform/commonUI/browse/src/InspectorRegion.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/MenuArrowController.js
+++ b/platform/commonUI/browse/src/MenuArrowController.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/ObjectHeaderController.js
+++ b/platform/commonUI/browse/src/ObjectHeaderController.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/PaneController.js
+++ b/platform/commonUI/browse/src/PaneController.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@ -24,14 +24,14 @@
 define(
    [],
    function () {
-
+        var navigationListenerAdded = false;
        /**
         * Controller to provide the ability to show/hide the tree in
         * Browse mode.
         * @constructor
         * @memberof platform/commonUI/browse
         */
-        function PaneController($scope, agentService, $window, $location, $attrs) {
+        function PaneController($scope, agentService, $window, $location, $attrs, navigationService) {
            var self = this;
            this.agentService = agentService;
            var hideParameterPresent = $location.search().hasOwnProperty($attrs.hideParameter);
@ -61,6 +61,11 @@ define(
                    self.state = false;
                }
            };
+
+            if (navigationService && navigationService.addListener && !navigationListenerAdded) {
+                navigationService.addListener(this.callback);
+                navigationListenerAdded = true;
+            }
        }

        /**
--- a/platform/commonUI/browse/src/navigation/NavigateAction.js
+++ b/platform/commonUI/browse/src/navigation/NavigateAction.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/navigation/NavigationService.js
+++ b/platform/commonUI/browse/src/navigation/NavigationService.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/navigation/OrphanNavigationHandler.js
+++ b/platform/commonUI/browse/src/navigation/OrphanNavigationHandler.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/windowing/FullscreenAction.js
+++ b/platform/commonUI/browse/src/windowing/FullscreenAction.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/windowing/NewTabAction.js
+++ b/platform/commonUI/browse/src/windowing/NewTabAction.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/src/windowing/WindowTitler.js
+++ b/platform/commonUI/browse/src/windowing/WindowTitler.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/BrowseControllerSpec.js
+++ b/platform/commonUI/browse/test/BrowseControllerSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/BrowseObjectControllerSpec.js
+++ b/platform/commonUI/browse/test/BrowseObjectControllerSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/InspectorRegionSpec.js
+++ b/platform/commonUI/browse/test/InspectorRegionSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/MenuArrowControllerSpec.js
+++ b/platform/commonUI/browse/test/MenuArrowControllerSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/ObjectHeaderControllerSpec.js
+++ b/platform/commonUI/browse/test/ObjectHeaderControllerSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/PaneControllerSpec.js
+++ b/platform/commonUI/browse/test/PaneControllerSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/navigation/NavigateActionSpec.js
+++ b/platform/commonUI/browse/test/navigation/NavigateActionSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/navigation/NavigationServiceSpec.js
+++ b/platform/commonUI/browse/test/navigation/NavigationServiceSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/navigation/OrphanNavigationHandlerSpec.js
+++ b/platform/commonUI/browse/test/navigation/OrphanNavigationHandlerSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
-* Open MCT, Copyright (c) 2014-2017, United States Government
+* Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js
+++ b/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/windowing/NewTabActionSpec.js
+++ b/platform/commonUI/browse/test/windowing/NewTabActionSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js
+++ b/platform/commonUI/browse/test/windowing/WindowTitlerSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/dialog/bundle.js
+++ b/platform/commonUI/dialog/bundle.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/dialog/res/templates/dialog.html
+++ b/platform/commonUI/dialog/res/templates/dialog.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/dialog/res/templates/overlay-blocking-message.html
+++ b/platform/commonUI/dialog/res/templates/overlay-blocking-message.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/dialog/res/templates/overlay-dialog.html
+++ b/platform/commonUI/dialog/res/templates/overlay-dialog.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/dialog/res/templates/overlay-options.html
+++ b/platform/commonUI/dialog/res/templates/overlay-options.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/dialog/res/templates/overlay.html
+++ b/platform/commonUI/dialog/res/templates/overlay.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/dialog/src/DialogService.js
+++ b/platform/commonUI/dialog/src/DialogService.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/dialog/src/OverlayService.js
+++ b/platform/commonUI/dialog/src/OverlayService.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/dialog/test/DialogServiceSpec.js
+++ b/platform/commonUI/dialog/test/DialogServiceSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/dialog/test/OverlayServiceSpec.js
+++ b/platform/commonUI/dialog/test/OverlayServiceSpec.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/bundle.js
+++ b/platform/commonUI/edit/bundle.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/res/templates/create/create-button.html
+++ b/platform/commonUI/edit/res/templates/create/create-button.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/edit/res/templates/create/create-menu.html
+++ b/platform/commonUI/edit/res/templates/create/create-menu.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/edit/res/templates/create/locator.html
+++ b/platform/commonUI/edit/res/templates/create/locator.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/edit/res/templates/edit-action-buttons.html
+++ b/platform/commonUI/edit/res/templates/edit-action-buttons.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/edit/res/templates/edit-object.html
+++ b/platform/commonUI/edit/res/templates/edit-object.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/edit/res/templates/elements.html
+++ b/platform/commonUI/edit/res/templates/elements.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

@ -25,9 +25,17 @@
                 ng-model="filterBy">
    </mct-include>
    <div class="flex-elem grows vscroll">
-        <ul class="tree" ng-if="composition.length > 0">
+        <ul class="tree" id="inspector-elements-tree"
+            ng-if="composition.length > 0">
            <li ng-repeat="containedObject in composition | filter:searchElements">
                <span class="tree-item">
+                    <span class="grippy-sm"
+                          ng-if="composition.length > 1"
+                          data-id="{{ containedObject.id }}"
+                          mct-drag-down="dragDown($event)"
+                          mct-drag="drag($event)"
+                          mct-drag-up="dragUp($event)">
+                    </span>
                    <mct-representation
                            class="rep-object-label"
                            key="'label'"
--- a/platform/commonUI/edit/res/templates/library.html
+++ b/platform/commonUI/edit/res/templates/library.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/edit/res/templates/topbar-edit.html
+++ b/platform/commonUI/edit/res/templates/topbar-edit.html
@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2017, United States Government
+ Open MCT, Copyright (c) 2014-2018, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/platform/commonUI/edit/src/actions/CancelAction.js
+++ b/platform/commonUI/edit/src/actions/CancelAction.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/actions/EditAction.js
+++ b/platform/commonUI/edit/src/actions/EditAction.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/actions/EditAndComposeAction.js
+++ b/platform/commonUI/edit/src/actions/EditAndComposeAction.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/actions/PropertiesAction.js
+++ b/platform/commonUI/edit/src/actions/PropertiesAction.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/actions/PropertiesDialog.js
+++ b/platform/commonUI/edit/src/actions/PropertiesDialog.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/actions/RemoveAction.js
+++ b/platform/commonUI/edit/src/actions/RemoveAction.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/actions/SaveAction.js
+++ b/platform/commonUI/edit/src/actions/SaveAction.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js
+++ b/platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/actions/SaveAsAction.js
+++ b/platform/commonUI/edit/src/actions/SaveAsAction.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/capabilities/EditorCapability.js
+++ b/platform/commonUI/edit/src/capabilities/EditorCapability.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/capabilities/TransactionCapabilityDecorator.js
+++ b/platform/commonUI/edit/src/capabilities/TransactionCapabilityDecorator.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/capabilities/TransactionalPersistenceCapability.js
+++ b/platform/commonUI/edit/src/capabilities/TransactionalPersistenceCapability.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/controllers/EditActionController.js
+++ b/platform/commonUI/edit/src/controllers/EditActionController.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/controllers/EditObjectController.js
+++ b/platform/commonUI/edit/src/controllers/EditObjectController.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/controllers/EditPanesController.js
+++ b/platform/commonUI/edit/src/controllers/EditPanesController.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/controllers/ElementsController.js
+++ b/platform/commonUI/edit/src/controllers/ElementsController.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@ -21,8 +21,8 @@
 *****************************************************************************/

 define(
-    [],
-    function () {
+    ['zepto'],
+    function ($) {

        /**
         * The ElementsController prepares the elements view for display
@ -32,6 +32,10 @@ define(
        function ElementsController($scope, openmct) {
            this.scope = $scope;
            this.scope.composition = [];
+            this.openmct = openmct;
+            this.dragDown = this.dragDown.bind(this);
+            this.dragUp = this.dragUp.bind(this);
+
            var self = this;

            function filterBy(text) {
@ -65,6 +69,7 @@ define(
                self.refreshComposition(domainObject);

                if (domainObject) {
+
                    self.mutationListener = domainObject.getCapability('mutation')
                        .listen(self.refreshComposition.bind(self, domainObject));
                }
@ -76,11 +81,80 @@ define(
            openmct.selection.on('change', setSelection);
            setSelection(openmct.selection.get());

+            $scope.dragDown = this.dragDown;
+            $scope.drag = this.drag;
+            $scope.dragUp = this.dragUp;
+
            $scope.$on("$destroy", function () {
                openmct.selection.off("change", setSelection);
            });
        }

+        /**
+         * Invoked on DragStart - Adds reordering class to parent UL element
+         * Sets selected object ID, to be used on Drag End
+         *
+         * @param {object} event | Mouse Event
+         */
+        ElementsController.prototype.dragDown = function (event) {
+            if (!this.parentUL) {
+                this.parentUL = $(document).find('#inspector-elements-tree');
+            }
+
+            this.selectedTreeItem = $(event.target).parent();
+            this.selectedObjectId = event.target.getAttribute('data-id');
+
+            this.parentUL.addClass('reordering');
+            this.selectedTreeItem.addClass('reorder-actor');
+        };
+
+        /**
+         * Invoked on dragEnd - Removes selected object from position in composition
+         * and replaces it at the target position. Composition is then updated with current
+         * scope
+         *
+         * @param {object} event - Mouse Event
+         */
+        ElementsController.prototype.dragUp = function (event) {
+            this.targetObjectId = event.target.getAttribute('data-id');
+
+            if (this.targetObjectId && this.selectedObjectId) {
+                var selectedObjectPosition,
+                    targetObjectPosition;
+
+                selectedObjectPosition = findObjectInCompositionFromId(this.selectedObjectId, this.scope.composition);
+                targetObjectPosition = findObjectInCompositionFromId(this.targetObjectId, this.scope.composition);
+
+                if ((selectedObjectPosition !== -1) && (targetObjectPosition !== -1)) {
+                    var selectedObject = this.scope.composition.splice(selectedObjectPosition, 1),
+                        selection = this.openmct.selection.get(),
+                        domainObject = selection ? selection[0].context.oldItem : undefined;
+
+                    this.scope.composition.splice(targetObjectPosition, 0, selectedObject[0]);
+
+                    if (domainObject) {
+                        domainObject.getCapability('mutation').mutate(function (model) {
+                            model.composition = this.scope.composition.map(function (dObject) {
+                                return dObject.id;
+                            });
+                        }.bind(this));
+                    }
+                }
+            }
+
+            if (this.parentUL) {
+                this.parentUL.removeClass('reordering');
+            }
+
+            if (this.selectedTreeItem) {
+                this.selectedTreeItem.removeClass('reorder-actor');
+            }
+        };
+
+        ElementsController.prototype.drag = function (event) {
+
+        };
+
        /**
         * Gets the composition for the selected object and populates the scope with it.
         *
@ -103,6 +177,21 @@ define(
            }
        };

+        /**
+         * Finds position of object with given ID in Composition
+         *
+         * @param {String} id
+         * @param {Array} composition
+         * @private
+         */
+        function findObjectInCompositionFromId(id, composition) {
+            var mapped = composition.map(function (element) {
+                return element.id;
+            });
+
+            return mapped.indexOf(id);
+        }
+
        return ElementsController;
    }
 );
--- a/platform/commonUI/edit/src/creation/AddAction.js
+++ b/platform/commonUI/edit/src/creation/AddAction.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/creation/AddActionProvider.js
+++ b/platform/commonUI/edit/src/creation/AddActionProvider.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/creation/CreateAction.js
+++ b/platform/commonUI/edit/src/creation/CreateAction.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/creation/CreateActionProvider.js
+++ b/platform/commonUI/edit/src/creation/CreateActionProvider.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/creation/CreateMenuController.js
+++ b/platform/commonUI/edit/src/creation/CreateMenuController.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/creation/CreateWizard.js
+++ b/platform/commonUI/edit/src/creation/CreateWizard.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/creation/CreationPolicy.js
+++ b/platform/commonUI/edit/src/creation/CreationPolicy.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/creation/CreationService.js
+++ b/platform/commonUI/edit/src/creation/CreationService.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/platform/commonUI/edit/src/creation/LocatorController.js
+++ b/platform/commonUI/edit/src/creation/LocatorController.js
@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Charles Hacskaylo	2e99f90b7c	[Frontend] Only include grippy when there's more than one element (#2055 ) Fixes #2053	2018-06-01 16:28:40 -07:00
Andrew Henry	0520b03b97	recognize difference between android tablet and phones (#2048 )	2018-05-25 22:18:18 -07:00
Andrew Henry	08bed6c23a	Fluid layouts 2 electric boogaloo (#2047 ) * [Frontend] Viewport metatag updated Fixes #2008 - Added shrink-to-fit=no; * [Frontend] Fix to Time Conductor for Safari Fixes #2008 - CSS mod for gradient blockers in TC * [Frontend] Remove data visualization element in TC Fixes #2008 - Note: this element holds the TOI indicator! * [Frontend] Hide TC ticks when on mobile Fixes #2008 - Added class `mobile-hide` to <conductor-axis> * [Frontend] Significant mobile fixes for panes and viewport Fixes #2008 Fixes #1770 Fixes #1928 - Left and right panes now positioning properly in mobile; - Fixed body overflow problem for #2008 "viewport" issue; * fixes multiple issues related to 2008 context menu firing too often - fixed by setting a isDragging flag Add and Remove respective classes on mobile orientation change by using mathMedia Close tree pane when navigating in mobile portrait only * [Frontend] Various Fixes #2008 - Always show Timeline zoom controls; - Prevent inline editing of object names in the main view when in mobile; * Add touch functionality to mct-drag it allows users to use the splitter in mobile and include appropriate tests * remove couchdb and reinstall localStorage * [Frontend] Mods to imagery CSS Fixes #2008 - Reduced size of image thumbnails; - Changed min-heights of image and thumbnail holders for .mobile.phone * [Frontend] Add Advanced CSS property to Display Layouts - WIP! - Add property to bundle; - Add CSS for column, row and fit-all classes; * [Frontend] Grid holder and class prefixing - WIP! - Edit grid-holder set to position: absolute - Added "fl-" prefix to fluid layout class names; * [Frontend] More CSS tweaks - WIP! * [Frontend] Added .drag-vertical - For use in Elements pool; - Applied in elements.html; * fix: check if stats is present before reseting zoom (#2029) * [Timer] Fix regression in timer visual indication and add tests * [TimeConductor] Fixes Issue #925 (#2020) * [TimeConductor] Fixes Issue #925` - Pressing enter in date field will update bounds properly in Safari * [Copyright] Update copyright year across platform code references Fixes #2034. * fixes issue #1999 - Use Object name as default export filename (#2001) * fixes issue #1999 add dynamic name(object name) to exportAsCSV filename * make requested changes * [Frontend] Add Advanced CSS property to Display Layouts - WIP! - Add property to bundle; - Add CSS for column, row and fit-all classes; * [Frontend] Grid holder and class prefixing - WIP! - Edit grid-holder set to position: absolute - Added "fl-" prefix to fluid layout class names; * [Frontend] More CSS tweaks - WIP! * [Frontend] Added .drag-vertical - For use in Elements pool; - Applied in elements.html; * [Frontend] More CSS tweaks - WIP! - Added .fl-phone-best-fit * working drag and switch, need to mutate * fix conflict * add ability to rearrange composition using drag gestures * add maxHeight and maxWidth to layout frames * [Frontend] Added fl-mobile-best-fit * [Frontend] Allow editor to set mins dimensions for fluid layout - Cleanups in CSS; - Mod to LayoutController.js to use minWidth and minHeight; * [Frontend] Styles for reordering in Elements pool - Changed class "dragging" to "reordering"; - Visual styling WIP; - TODO: style "reorder-actor" when implemented; * add reorder-actor class to draggable item in elements pool when selected and remove class when dropped * stacked plots reload on composition change * [Frontend] Tweaks to Elements pool reordering styles - "reorder-actor" added/removed from parent tree item; - Refined styling for drag in process in list; * [Frontend] Added new 12px list view glyph - Font files and CSS updates; * [Frontend] Added new 12px grippy glyph - Font files and CSS updates for Elements pool sorting styling; * fix failing test * make reviewer requested changes * remove create dialog from mobile	2018-05-25 18:58:49 -07:00
Charles Hacskaylo	c909831dd4	Review and integrate mobile-2008 (#2040 ) Fixes #2008 * Viewport metatag updated * Fix to Time Conductor for Safari * Remove data visualization element in TC * Hide TC ticks when on mobile * Add touch functionality to mct-drag * Reduced size of image thumbnails; Changed min-heights of image and thumbnail holders for .mobile.phone * remove create dialog from mobile	2018-05-25 11:19:27 -07:00
Charles Hacskaylo	e19ce4ac8c	[Frontend] Adds overflow scrolling to .l-view-section (#2039 ) Fixes #1878 - Add overflow: auto; - Better naming of $overflow arg; - Fixed and unit tested in plots and tables;	2018-05-18 10:52:24 -07:00
Deep Tailor	fab1def790	fixes issue #1999 - Use Object name as default export filename (#2001 ) * fixes issue #1999 add dynamic name(object name) to exportAsCSV filename * make requested changes	2018-05-16 13:20:58 -07:00
Pete Richards	28311fd4dd	Merge pull request #2033 from PunkChameleon/fix-timer-indicator [Timer] Fix regression in timer visual indication and add tests	2018-05-16 13:17:02 -07:00
Nick Weingartner	c55eaeb193	[Copyright] Update copyright year across platform code references Fixes #2034.	2018-05-14 15:46:17 -07:00
Dhrubomoy Das Gupta	2e6cdfc457	[TimeConductor] Fixes Issue #925 (#2020 ) * [TimeConductor] Fixes Issue #925` - Pressing enter in date field will update bounds properly in Safari	2018-05-11 15:56:27 -07:00
Nick Weingartner	210808ed54	[Timer] Fix regression in timer visual indication and add tests	2018-05-09 17:35:56 -04:00
Even Stensberg	062ba4a9d7	fix: check if stats is present before reseting zoom (#2029 )	2018-05-08 15:24:02 -07:00
Pete Richards	e2217e008a	don't allow plot or table view of summary widget (#2030 )	2018-05-04 13:26:10 -07:00
Dhrubomoy Das Gupta	61e583dbb2	[TimeConductor] Fixes issue #1955 (#2023 ) - Open in New Tab will preserve TC settings	2018-05-03 16:10:25 -07:00
Pete Richards	7d754ea143	[plot] set minimum marquee size (#2003 ) Users must draw a marquee box with diagonal size of atleast 7.5 pixels. This prevents clicks from being translated to zooms on the plot. Because startMarquee triggers a plot history update. endMarquee must remove the plot history update when preventing marqueeZoom. This has a side effect of causing a requery for data, but is a simple enough solution for now. Fixes #2002.	2018-05-02 13:53:17 -07:00
Pete Richards	865b99f445	Handle string states (#2019 ) * State generator realtime uses strings Change the state generator's realtime data to return string values instead of number values. This exercises an edge case where enumerations could be a string instead of a number. Exposes #2018. * [Telemetry] handle string enumeration value Don't treat all strings as properly formatted enumeration values. Instead, check any input value against known enumerations and if one matches, return it. Otherwise, return input. Fixes #2018	2018-05-02 11:42:42 -07:00
Deep Tailor	ec8b4db2e5	Merge pull request #2004 from nasa/bump-circleci-node-env Bump Node Version	2018-05-01 13:50:35 -07:00
Pete Richards	d6bd09fabf	Bump Node Version	2018-04-30 10:41:32 -07:00
Pete Richards	241d75e393	Summary widget telemetry provider (#1943 ) * Summary Widgets produce telemetry Adds a summary widget telemetry provider and metadata provider to the summary widget plugin. Supports subscribing to realtime summary widget evaluations without needing the summary widget UI. Fixes https://github.com/nasa/openmct/issues/1893 * Use metadata to determine telemetry types Update summary widgets to use metadata to determine telemetry types. fixes https://github.com/nasa/openmct/issues/1801 fixes https://github.com/nasa/openmct/issues/1883 * shared evaluators, more telemetry values Share summary widget evaluators to reduce number of times a object needs to be loaded when dealing with multiple queries. Fixes https://github.com/nasa/openmct/issues/1893 * Separate view for editing fixes https://github.com/nasa/openmct/issues/1827 * Update summary widget tests * Workaround incorrect telemetry capability application In the case where an object support telemetry but does not support the specific type of telemetry request i.e. a summary widget has request for lad but not for historical, an error will be thrown. * use makeKeyString use makeKeyString when storing configuration of objects in summary widgets. Otherwise, namespace information would not be properly tracked. Fixes https://github.com/nasa/openmct/issues/1949 * [Tests] coverage for EvaluatorPool Add tests for EvaluatorPool and fix a bug where the same evaluator was returned for different objects. * Add copyright headers * Update metadata provider registration * attach title to a element * Only evaluate realtime when all data available * Prevent update after destroy * Don't error when no telemetry exists * Don't mutate on view destroy Improper removal of listeners was triggering a mutation on view destroy, which happens after the initial persist call to server that occurs when saving. This mutation occurs after the edit transaction has been closed, which would result in an immediate persist call. This can cause a race condition when the first persist call has not completed, which causes a 409 conflict and a persistence error. Fix #1827 * Spec for telemetryProvider * update on time system change Summary Widgets now resubscribe and requery for data when time system changes, in order to ensure they're showing the correct data to the user. * link to telemetry request details * rename variables, update jsdoc Addresses comments in https://github.com/nasa/openmct/pull/1943	2018-04-20 15:46:09 -07:00
Charles Hacskaylo	f4271c96a3	Review SCSS refactoring for to-be-deprecated Bourbon functions (#1959 ) * [Frontend] Refactor SCSS to remove deprecated @includes Fixes #1891 - In progress * [Frontend] Refactor SCSS to remove deprecated @includes Fixes #1891 Making bourbon happy by refactoring to-be-deprecated calls to prefixing @includes: - transform and related CSS; - flex and related CSS; - Fixed double semi-colons to single;	2018-04-20 10:18:29 -07:00
Deep Tailor	8c739e9fd9	[Imagery] Issue #1962 - History shows oldest image (#1983 ) * force update to latest image when history is received * force update to latest history image on response received * remove console log" * change requestLAD function to last item in array, in case response is an array with more than one item * fix checkstyle * remove requestLAD because its requesting history twice in cases where server does not have latest flag	2018-04-20 09:15:25 -07:00
Pegah Sarram	75ae5ab3bb	[Toolbar] set selection initially in fixed controller and toolbar... (#1994 ) * [Toolbar] set selection initially in fixed controller and toolbar... ... to make the add button appear in the toolbar when a fixed position is created. Remove selection change listener on destroy. Start a digest cycle when handling selection in toolbar to avoid delays in toolbar. Fixes #1991, #1987 * fixed checkstyle and lint errors * Fix tests * Update comment	2018-04-20 08:45:29 -07:00
Deep Tailor	78a5ace18d	Merge pull request #1967 from nasa/better-startup-1966 [Frontend] CSS for better startup	2018-04-18 17:02:42 -07:00
Charles Hacskaylo	ba0077498c	[Frontend] Added return at eof Fixes #1966	2018-04-18 16:33:02 -07:00
Deep Tailor	909a21ee8a	Merge pull request #1990 from nasa/plot-fixes [plot] cleanup alarms, don't error on mutate, fallback on context lost	2018-04-18 13:05:08 -07:00
Deep Tailor	94c35a67c5	fixes issue 1973 and 1911 (#1992 ) Remove previous icon class name before adding the new class name	2018-04-17 17:52:07 -07:00
Andrew Henry	19fc05b76d	Enterprise-galactica (#1993 ) * Tagged release to close Enterprise sprint * Updated version number to open sprint Galactica	2018-04-17 17:51:46 -07:00
Pete Richards	1326dae27a	Fix style	2018-04-13 16:54:18 -07:00
Pete Richards	7d8dc00996	Only listen on overlay plots Only listen for mutations on overlay plots, as other mutations should be ignored by plot configuration. Fixes https://github.com/nasa/openmct/issues/1945	2018-04-13 16:52:27 -07:00
Pete Richards	a958055f50	Remove alarm set when removing series Remove alarm marker sets when removing series, so that they don't continue to display. Fixes https://github.com/nasa/openmct/issues/1935	2018-04-13 16:46:10 -07:00
Pete Richards	1f86a5a131	Fallback to 2d on context lost When webgl contexts are lost, fallback to 2d rendering context. Because it's not possible for a canvas to generate a different context after one has already been created, the canvas elements must be recreated from scratch, and event handlers must also be updated. This resolves https://github.com/nasa/openmct/issues/1976	2018-04-13 16:28:28 -07:00
Pete Richards	8ad07fa8de	cleanup chart controllers	2018-04-13 16:24:36 -07:00
Pete Richards	fa7298a752	[Plot] Wait for width before loading (#1975 ) Plot waits for element to have width before loading. Otherwise, it may make a minmax request with an invalid size parameter. Fixes https://github.com/nasa/openmct/issues/1974	2018-04-03 15:03:35 -07:00
Charles Hacskaylo	ae42298d08	[Frontend] CSS for better startup Fixes #1966 - Transitions and opacity styles moved to new _app-start.scss, which loads at the very end of all other CSS needed by the app;	2018-03-28 18:00:56 -07:00