Don't treat telemtry points any different than other objects when migrating display layouts.

index.html

@@ -86,7 +86,6 @@
         openmct.install(openmct.plugins.LADTable());
         openmct.install(openmct.plugins.Filters(['table', 'telemetry.plot.overlay']));
         openmct.install(openmct.plugins.ObjectMigration());
-        openmct.install(openmct.plugins.GoToOriginalAction());
         openmct.start();
     </script>
 </html>

platform/commonUI/dialog/res/templates/notification-message.html

@@ -9,17 +9,17 @@
                          ng-model="ngModel"
                          ng-show="ngModel.progressPerc !== undefined"></mct-include>
         </div>
-    </div>
-    <div class="c-overlay__button-bar">
-        <button ng-repeat="dialogOption in ngModel.options"
+        <div class="c-overlay__button-bar">
+            <button ng-repeat="dialogOption in ngModel.options"
                 class="c-button"
                 ng-click="dialogOption.callback()">
-            {{dialogOption.label}}
-        </button>
-        <button class="c-button c-button--major"
+                    {{dialogOption.label}}
+            </button>
+            <button class="c-button c-button--major"
                 ng-if="ngModel.primaryOption"
                 ng-click="ngModel.primaryOption.callback()">
-            {{ngModel.primaryOption.label}}
-        </button>
+                    {{ngModel.primaryOption.label}}
+            </button>
+        </div>
     </div>
 </div>

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

@@ -64,6 +64,7 @@ define(
          * @returns boolean
          */
         EditorCapability.prototype.inEditContext = function () {
+            console.warn('DEPRECATION WARNING: isEditing checks must be done via openmct.editor.');
             return this.openmct.editor.isEditing();
         };
 
@@ -73,6 +74,7 @@ define(
          * @returns {*}
          */
         EditorCapability.prototype.isEditContextRoot = function () {
+            console.warn('DEPRECATION WARNING: isEditing checks must be done via openmct.editor.');
             return this.openmct.editor.isEditing();
         };
 

platform/entanglement/bundle.js

@@ -24,6 +24,7 @@ define([
     "./src/actions/MoveAction",
     "./src/actions/CopyAction",
     "./src/actions/LinkAction",
+    "./src/actions/GoToOriginalAction",
     "./src/actions/SetPrimaryLocationAction",
     "./src/services/LocatingCreationDecorator",
     "./src/services/LocatingObjectDecorator",
@@ -40,6 +41,7 @@ define([
     MoveAction,
     CopyAction,
     LinkAction,
+    GoToOriginalAction,
     SetPrimaryLocationAction,
     LocatingCreationDecorator,
     LocatingObjectDecorator,
@@ -102,6 +104,14 @@ define([
                         "linkService"
                     ]
                 },
+                {
+                    "key": "follow",
+                    "name": "Go To Original",
+                    "description": "Go to the original, un-linked instance of this object.",
+                    "cssClass": "",
+                    "category": "contextual",
+                    "implementation": GoToOriginalAction
+                },
                 {
                     "key": "locate",
                     "name": "Set Primary Location",

platform/entanglement/src/actions/GoToOriginalAction.js

@@ -0,0 +1,60 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    function () {
+
+        /**
+         * Implements the "Go To Original" action, which follows a link back
+         * to an original instance of an object.
+         *
+         * @implements {Action}
+         * @constructor
+         * @private
+         * @memberof platform/entanglement
+         * @param {ActionContext} context the context in which the action
+         *        will be performed
+         */
+        function GoToOriginalAction(context) {
+            this.domainObject = context.domainObject;
+        }
+
+        GoToOriginalAction.prototype.perform = function () {
+            return this.domainObject.getCapability("location").getOriginal()
+                .then(function (originalObject) {
+                    var actionCapability =
+                        originalObject.getCapability("action");
+                    return actionCapability &&
+                            actionCapability.perform("navigate");
+                });
+        };
+
+        GoToOriginalAction.appliesTo = function (context) {
+            var domainObject = context.domainObject;
+            return domainObject && domainObject.hasCapability("location") &&
+                domainObject.getCapability("location").isLink();
+        };
+
+        return GoToOriginalAction;
+    }
+);
+

platform/entanglement/test/actions/GoToOriginalActionSpec.js

@@ -0,0 +1,93 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+
+define(
+    [
+        '../../src/actions/GoToOriginalAction',
+        '../DomainObjectFactory',
+        '../ControlledPromise'
+    ],
+    function (GoToOriginalAction, domainObjectFactory, ControlledPromise) {
+
+        describe("The 'go to original' action", function () {
+            var testContext,
+                originalDomainObject,
+                mockLocationCapability,
+                mockOriginalActionCapability,
+                originalPromise,
+                action;
+
+            beforeEach(function () {
+                mockLocationCapability = jasmine.createSpyObj(
+                    'location',
+                    ['isLink', 'isOriginal', 'getOriginal']
+                );
+                mockOriginalActionCapability = jasmine.createSpyObj(
+                    'action',
+                    ['perform', 'getActions']
+                );
+                originalPromise = new ControlledPromise();
+                mockLocationCapability.getOriginal.and.returnValue(originalPromise);
+                mockLocationCapability.isLink.and.returnValue(true);
+                mockLocationCapability.isOriginal.and.callFake(function () {
+                    return !mockLocationCapability.isLink();
+                });
+                testContext = {
+                    domainObject: domainObjectFactory({
+                        capabilities: {
+                            location: mockLocationCapability
+                        }
+                    })
+                };
+                originalDomainObject = domainObjectFactory({
+                    capabilities: {
+                        action: mockOriginalActionCapability
+                    }
+                });
+
+                action = new GoToOriginalAction(testContext);
+            });
+
+            it("is applicable to links", function () {
+                expect(GoToOriginalAction.appliesTo(testContext))
+                    .toBeTruthy();
+            });
+
+            it("is not applicable to originals", function () {
+                mockLocationCapability.isLink.and.returnValue(false);
+                expect(GoToOriginalAction.appliesTo(testContext))
+                    .toBeFalsy();
+            });
+
+            it("navigates to original objects when performed", function () {
+                expect(mockOriginalActionCapability.perform)
+                    .not.toHaveBeenCalled();
+                action.perform();
+                originalPromise.resolve(originalDomainObject);
+                expect(mockOriginalActionCapability.perform)
+                    .toHaveBeenCalledWith('navigate');
+            });
+
+        });
+    }
+);

src/adapter/views/LegacyViewProvider.js

@@ -45,27 +45,22 @@ define([
             view: function (domainObject) {
                 let $rootScope = openmct.$injector.get('$rootScope');
                 let templateLinker = openmct.$injector.get('templateLinker');
-                let scope = $rootScope.$new(true);
+                let scope = $rootScope.$new();
                 let legacyObject = convertToLegacyObject(domainObject);
                 let isDestroyed = false;
                 let unlistenToStatus;
-                let element;
                 scope.domainObject = legacyObject;
                 scope.model = legacyObject.getModel();
-                let child;
-                let parent;
+
 
                 return {
                     show: function (container) {
-                        parent = container;
-                        child = document.createElement('div');
-                        parent.appendChild(child);
                         let statusCapability = legacyObject.getCapability('status');
                         unlistenToStatus = statusCapability.listen((newStatus) => {
-                            child.classList.remove('s-status-timeconductor-unsynced');
+                            container.classList.remove('s-status-timeconductor-unsynced');
 
                             if (newStatus.includes('timeconductor-unsynced')) {
-                                child.classList.add('s-status-timeconductor-unsynced');
+                                container.classList.add('s-status-timeconductor-unsynced');
                             }
                         });
 
@@ -89,13 +84,12 @@ define([
                             uses.forEach(function (key, i) {
                                 scope[key] = results[i];
                             });
-                            element = openmct.$angular.element(child);
                             templateLinker.link(
                                 scope,
-                                element,
+                                openmct.$angular.element(container),
                                 legacyView
                             );
-                            child.classList.add('u-contents');
+                            container.classList.add('u-contents');
                         }
 
                         if (promises.length) {
@@ -109,11 +103,7 @@ define([
                         }
                     },
                     destroy: function () {
-                        element.off();
-                        element.remove();
                         scope.$destroy();
-                        element = null;
-                        scope = null;
                         unlistenToStatus();
                     }
                 }

src/adapter/views/TypeInspectorViewProvider.js

@@ -41,18 +41,15 @@ define([
                 let domainObject = selection[0][0].context.item;
                 let $rootScope = openmct.$injector.get('$rootScope');
                 let templateLinker = openmct.$injector.get('templateLinker');
-                let scope = $rootScope.$new(true);
+                let scope = $rootScope.$new();
                 let legacyObject = convertToLegacyObject(domainObject);
                 let isDestroyed = false;
-                let element;
                 scope.domainObject = legacyObject;
                 scope.model = legacyObject.getModel();
 
 
                 return {
                     show: function (container) {
-                        let child = document.createElement('div');
-                        container.appendChild(child);
                         // TODO: implement "gestures" support ?
                         let uses = representation.uses || [];
                         let promises = [];
@@ -73,10 +70,9 @@ define([
                             uses.forEach(function (key, i) {
                                 scope[key] = results[i];
                             });
-                            element = openmct.$angular.element(child)
                             templateLinker.link(
                                 scope,
-                                element,
+                                openmct.$angular.element(container),
                                 representation
                             );
                             container.style.height = '100%';
@@ -93,11 +89,7 @@ define([
                         }
                     },
                     destroy: function () {
-                        element.off();
-                        element.remove();
                         scope.$destroy();
-                        element = null;
-                        scope = null;
                     }
                 }
             }

src/api/overlays/components/OverlayComponent.vue

@@ -92,7 +92,6 @@
             display: flex;
             flex-direction: column;
             flex: 1 1 auto;
-            height: 0; // Chrome 73 overflow bug fix
             overflow: auto;
             padding-right: $interiorMargin; // fend off scroll bar
         }

src/plugins/displayLayout/components/DisplayLayout.vue

@@ -269,63 +269,33 @@
                     _.cloneDeep(this.selectedLayoutItems).forEach(selectedItem => {
                         if (selectedItem.type === 'line-view') {
                             this.initialPositions[selectedItem.id] = [selectedItem.x, selectedItem.y, selectedItem.x2, selectedItem.y2];
-                            this.startingMinX2 = this.startingMinX2 !== undefined ? Math.min(this.startingMinX2, selectedItem.x2) : selectedItem.x2;
-                            this.startingMinY2 = this.startingMinY2 !== undefined ? Math.min(this.startingMinY2, selectedItem.y2) : selectedItem.y2;
                         } else {
                             this.initialPositions[selectedItem.id] = [selectedItem.x, selectedItem.y];
                         }
-
-                        this.startingMinX = this.startingMinX !== undefined ? Math.min(this.startingMinX, selectedItem.x) : selectedItem.x;
-                        this.startingMinY = this.startingMinY !== undefined ? Math.min(this.startingMinY, selectedItem.y) : selectedItem.y;
                     });
                 }
 
                 let layoutItems = this.layoutItems.map(item => {
                     if (this.initialPositions[item.id]) {
-                        this.updateItemPosition(item, gridDelta);
+                        let startingPosition = this.initialPositions[item.id];
+                        let [startingX, startingY, startingX2, startingY2] = startingPosition;
+                        item.x = startingX + gridDelta[0];
+                        item.y = startingY + gridDelta[1];
+
+                        if (item.x2) {
+                            item.x2 = startingX2 + gridDelta[0];
+                        }
+
+                        if (item.y2) {
+                            item.y2 = startingY2 + gridDelta[1];
+                        }
                     }
                     return item;
                 });
             },
-            updateItemPosition(item, gridDelta) {
-                let startingPosition = this.initialPositions[item.id];
-                let [startingX, startingY, startingX2, startingY2] = startingPosition;
-
-                if (this.startingMinX + gridDelta[0] >= 0) {
-                    if (item.x2 !== undefined) {
-                        if (this.startingMinX2 + gridDelta[0] >= 0) {
-                            item.x = startingX + gridDelta[0];
-                        }
-                    } else {
-                        item.x = startingX + gridDelta[0];
-                    }
-                }
-
-                if (this.startingMinY + gridDelta[1] >= 0) {
-                    if (item.y2 !== undefined) {
-                        if (this.startingMinY2 + gridDelta[1] >= 0) {
-                            item.y = startingY + gridDelta[1];
-                        }
-                    } else {
-                        item.y = startingY + gridDelta[1];
-                    }
-                }
-
-                if (item.x2 !== undefined && this.startingMinX2 + gridDelta[0] >= 0 && this.startingMinX + gridDelta[0] >= 0) {
-                    item.x2 = startingX2 + gridDelta[0];
-                }
-
-                if (item.y2 !== undefined && this.startingMinY2 + gridDelta[1] >= 0 && this.startingMinY + gridDelta[1] >= 0) {
-                    item.y2 = startingY2 + gridDelta[1];
-                }
-            },
             endMove() {
                 this.mutate('configuration.items', this.layoutItems);
                 this.initialPositions = undefined;
-                this.startingMinX = undefined;
-                this.startingMinY = undefined;
-                this.startingMinX2 = undefined;
-                this.startingMinY2 = undefined;
             },
             mutate(path, value) {
                 this.openmct.objects.mutate(this.internalDomainObject, path, value);

src/plugins/displayLayout/components/EditMarquee.vue

@@ -116,7 +116,7 @@
                 let height = Number.NEGATIVE_INFINITY;
 
                 this.selectedLayoutItems.forEach(item => {
-                    if (item.x2 !== undefined) {
+                    if (item.x2) {
                         let lineWidth = Math.abs(item.x - item.x2);
                         let lineMinX = Math.min(item.x, item.x2);
                         x = Math.min(lineMinX, x);
@@ -126,7 +126,7 @@
                         width = Math.max(item.width + item.x, width);
                     }
 
-                    if (item.y2 !== undefined) {
+                    if (item.y2) {
                         let lineHeight = Math.abs(item.y - item.y2);
                         let lineMinY = Math.min(item.y, item.y2);
                         y = Math.min(lineMinY, y);

src/plugins/goToOriginalAction/goToOriginalAction.js

@@ -1,53 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-export default class GoToOriginalAction {
-    constructor(openmct) {
-        this.name = 'Go To Original';
-        this.description = 'Go to the original unlinked instance of this object';
-
-        this._openmct = openmct;
-    }
-    invoke(objectPath) {
-        this._openmct.objects.getOriginalPath(objectPath[0].identifier)
-            .then((originalPath) => {
-                let url = '#/browse/' + originalPath
-                    .map(function (o) {
-                        return o && this._openmct.objects.makeKeyString(o.identifier);
-                    }.bind(this))
-                    .reverse()
-                    .slice(1)
-                    .join('/');
-
-                window.location.href = url;
-            });
-    }
-    appliesTo(objectPath) {
-        let parentKeystring = objectPath[1] && this._openmct.objects.makeKeyString(objectPath[1].identifier);
-
-        if (!parentKeystring) {
-            return false;
-        }
-
-        return (parentKeystring !== objectPath[0].location);
-    }
-}

src/plugins/goToOriginalAction/plugin.js

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

src/plugins/objectMigration/Migrations.js

@@ -64,41 +64,12 @@ define([
             Object.keys(panels).forEach(key => {
                 let panel = panels[key];
                 let domainObject = childObjects[key];
-                let identifier = undefined;
-
-                if (isTelemetry(domainObject)) {
-                    // If object is a telemetry point, convert it to a plot and
-                    // replace the object in migratedObject composition with the plot.
-                    identifier = {
-                        key: uuid(),
-                        namespace: migratedObject.identifier.namespace
-                    };
-                    let plotObject = {
-                        identifier: identifier,
-                        location: domainObject.location,
-                        name: domainObject.name,
-                        type: "telemetry.plot.overlay"
-                    };
-                    let plotType = openmct.types.get('telemetry.plot.overlay');
-                    plotType.definition.initialize(plotObject);
-                    plotObject.composition.push(domainObject.identifier);
-                    openmct.objects.mutate(plotObject, 'persisted', Date.now());
-
-                    let keyString = openmct.objects.makeKeyString(domainObject.identifier);
-                    let clonedComposition = Object.assign([], migratedObject.composition);
-                    clonedComposition.forEach((identifier, index) => {
-                        if (openmct.objects.makeKeyString(identifier) === keyString) {
-                            migratedObject.composition[index] = plotObject.identifier;
-                        }
-                    });
-                }
-
                 items.push({
                     width: panel.dimensions[0],
                     height: panel.dimensions[1],
                     x: panel.position[0],
                     y: panel.position[1],
-                    identifier: identifier || domainObject.identifier,
+                    identifier: domainObject.identifier,
                     id: uuid(),
                     type: 'subobject-view',
                     hasFrame: panel.hasFrame

src/plugins/plugins.js

@@ -41,8 +41,7 @@ define([
     './tabs/plugin',
     './LADTable/plugin',
     './filters/plugin',
-    './objectMigration/plugin',
-    './goToOriginalAction/plugin'
+    './objectMigration/plugin'
 ], function (
     _,
     UTCTimeSystem,
@@ -64,8 +63,7 @@ define([
     Tabs,
     LADTable,
     Filters,
-    ObjectMigration,
-    GoToOriginalAction
+    ObjectMigration
 ) {
     var bundleMap = {
         LocalStorage: 'platform/persistence/local',
@@ -162,7 +160,6 @@ define([
     plugins.LADTable = LADTable;
     plugins.Filters = Filters;
     plugins.ObjectMigration = ObjectMigration.default;
-    plugins.GoToOriginalAction = GoToOriginalAction.default;
 
     return plugins;
 });

src/plugins/telemetryTable/TelemetryTable.js

@@ -239,7 +239,7 @@ define([
             this.filteredRows.destroy();
             Object.keys(this.subscriptions).forEach(this.unsubscribe, this);
             this.openmct.time.off('bounds', this.refreshData);
-            this.openmct.time.off('timeSystem', this.refreshData);
+            this.openmct.time.on('timeSystem', this.refreshData);
             if (this.filterObserver) {
                 this.filterObserver();
             }

src/plugins/telemetryTable/components/table.vue

@@ -78,7 +78,7 @@
     <!-- Content table -->
     <div class="c-table__body-w c-telemetry-table__body-w js-telemetry-table__body-w" @scroll="scroll" :style="{ 'max-width': widthWithScroll}">
         <div class="c-telemetry-table__scroll-forcer" :style="{ width: totalWidth + 'px' }"></div>
-        <table class="c-table__body c-telemetry-table__body js-telemetry-table__content"
+        <table class="c-table__body c-telemetry-table__body"
                :style="{ height: totalHeight + 'px'}">
             <tbody>
                 <telemetry-table-row v-for="(row, rowIndex) in visibleRows"
@@ -284,7 +284,7 @@ import _ from 'lodash';
 const VISIBLE_ROW_COUNT = 100;
 const ROW_HEIGHT = 17;
 const RESIZE_POLL_INTERVAL = 200;
-const AUTO_SCROLL_TRIGGER_HEIGHT = 100;
+const AUTO_SCROLL_TRIGGER_HEIGHT = 20;
 const RESIZE_HOT_ZONE = 10;
 const MOVE_TRIGGER_WAIT = 500;
 const VERTICAL_SCROLL_WIDTH = 30;
@@ -364,48 +364,42 @@ export default {
     },
     methods: {
         updateVisibleRows() {
-            if (!this.updatingView) {
-                this.updatingView = true;
-                requestAnimationFrame(()=> {
 
-                    let start = 0;
-                    let end = VISIBLE_ROW_COUNT;
-                    let filteredRows = this.table.filteredRows.getRows();
-                    let filteredRowsLength = filteredRows.length;
+            let start = 0;
+            let end = VISIBLE_ROW_COUNT;
+            let filteredRows = this.table.filteredRows.getRows();
+            let filteredRowsLength = filteredRows.length;
 
-                    if (filteredRowsLength < VISIBLE_ROW_COUNT) {
-                        end = filteredRowsLength;
-                    } else {
-                        let firstVisible = this.calculateFirstVisibleRow();
-                        let lastVisible = this.calculateLastVisibleRow();
-                        let totalVisible = lastVisible - firstVisible;
+            this.totalHeight = this.rowHeight * filteredRowsLength - 1;
 
-                        let numberOffscreen = VISIBLE_ROW_COUNT - totalVisible;
-                        start = firstVisible - Math.floor(numberOffscreen / 2);
-                        end = lastVisible + Math.ceil(numberOffscreen / 2);
+            if (filteredRowsLength < VISIBLE_ROW_COUNT) {
+                end = filteredRowsLength;
+            } else {
+                let firstVisible = this.calculateFirstVisibleRow();
+                let lastVisible = this.calculateLastVisibleRow();
+                let totalVisible = lastVisible - firstVisible;
 
-                        if (start < 0) {
-                            start = 0;
-                            end = Math.min(VISIBLE_ROW_COUNT, filteredRowsLength);
-                        } else if (end >= filteredRowsLength) {
-                            end = filteredRowsLength;
-                            start = end - VISIBLE_ROW_COUNT + 1;
-                        }
-                    }
-                    this.rowOffset = start;
-                    this.visibleRows = filteredRows.slice(start, end);
+                let numberOffscreen = VISIBLE_ROW_COUNT - totalVisible;
+                start = firstVisible - Math.floor(numberOffscreen / 2);
+                end = lastVisible + Math.ceil(numberOffscreen / 2);
 
-                    this.updatingView = false;
-                });
+                if (start < 0) {
+                    start = 0;
+                    end = Math.min(VISIBLE_ROW_COUNT, filteredRowsLength);
+                } else if (end >= filteredRowsLength) {
+                    end = filteredRowsLength;
+                    start = end - VISIBLE_ROW_COUNT + 1;
+                }
             }
+            this.rowOffset = start;
+            this.visibleRows = filteredRows.slice(start, end);
         },
         calculateFirstVisibleRow() {
-            let scrollTop = this.scrollable.scrollTop;
-            return Math.floor(scrollTop / this.rowHeight);
+            return Math.floor(this.scrollable.scrollTop / this.rowHeight);
         },
         calculateLastVisibleRow() {
-            let scrollBottom = this.scrollable.scrollTop + this.scrollable.offsetHeight;
-            return Math.ceil(scrollBottom / this.rowHeight);
+            let bottomScroll = this.scrollable.scrollTop + this.scrollable.offsetHeight;
+            return Math.floor(bottomScroll / this.rowHeight);
         },
         updateHeaders() {
             this.headers = this.table.configuration.getVisibleHeaders();
@@ -449,23 +443,29 @@ export default {
             }
             this.table.sortBy(this.sortOptions);
         },
-        scroll () {
-            this.updateVisibleRows();
-            this.synchronizeScrollX();
+        scroll() {
+            if (!this.processingScroll) {
+                this.processingScroll = true;
+                requestAnimationFrame(()=> {
+                    this.updateVisibleRows();
+                    this.synchronizeScrollX();
 
-            if (this.shouldSnapToBottom()) {
-                this.autoScroll = true;
-            } else {
-                // If user scrolls away from bottom, disable auto-scroll.
-                // Auto-scroll will be re-enabled if user scrolls to bottom again.
-                this.autoScroll = false;
+                    if (this.shouldSnapToBottom()) {
+                        this.autoScroll = true;
+                    } else {
+                        // If user scrolls away from bottom, disable auto-scroll.
+                        // Auto-scroll will be re-enabled if user scrolls to bottom again.
+                        this.autoScroll = false;
+                    }
+                    this.processingScroll = false;
+                });
             }
         },
         shouldSnapToBottom() {
             return this.scrollable.scrollTop >= (this.scrollable.scrollHeight - this.scrollable.offsetHeight - AUTO_SCROLL_TRIGGER_HEIGHT);
         },
         scrollToBottom() {
-            this.scrollable.scrollTop = Number.MAX_SAFE_INTEGER;
+            this.scrollable.scrollTop = this.scrollable.scrollHeight;
         },
         synchronizeScrollX() {
             this.headersHolderEl.scrollLeft = this.scrollable.scrollLeft;
@@ -477,40 +477,37 @@ export default {
             this.filters[columnKey] = '';
             this.table.filteredRows.setColumnFilter(columnKey, '');
         },
-        rowsAdded (rows) {
-            this.setHeight();
-
+        rowsAdded(rows) {
             let sizingRow;
             if (Array.isArray(rows)) {
                 sizingRow = rows[0];
             } else {
                 sizingRow = rows;
             }
-
             if (!this.sizingRows[sizingRow.objectKeyString]) {
                 this.sizingRows[sizingRow.objectKeyString] = sizingRow;
                 this.$nextTick().then(this.calculateColumnWidths);
             }
 
-            if (this.autoScroll) {
-                this.scrollToBottom();
+            if (!this.updatingView) {
+                this.updatingView = true;
+                requestAnimationFrame(()=> {
+                    this.updateVisibleRows();
+                    if (this.autoScroll) {
+                        this.$nextTick().then(this.scrollToBottom);
+                    }
+                    this.updatingView = false;
+                });
             }
-
-            this.updateVisibleRows();
         },
-        rowsRemoved (rows) {
-            this.setHeight();
-            this.updateVisibleRows();
-        },
-        /**
-         * Calculates height based on total number of rows, and sets table height.
-         */
-        setHeight() {
-            let filteredRowsLength = this.table.filteredRows.getRows().length;
-            this.totalHeight = this.rowHeight * filteredRowsLength - 1;
-            // Set element height directly to avoid having to wait for Vue to update DOM 
-            // which causes subsequent scroll to use an out of date height.
-            this.contentTable.style.height = this.totalHeight + 'px'; 
+        rowsRemoved(rows) {
+            if (!this.updatingView) {
+                this.updatingView = true;
+                requestAnimationFrame(()=> {
+                    this.updateVisibleRows();
+                    this.updatingView = false;
+                });
+            }
         },
         exportAsCSV() {
             const headerKeys = Object.keys(this.headers);
@@ -598,11 +595,7 @@ export default {
                     this.calculateTableSize();
                     // On some resize events scrollTop is reset to 0. Possibly due to a transition we're using?
                     // Need to preserve scroll position in this case.
-                    if (this.autoScroll) {
-                        this.scrollToBottom();
-                    } else {
-                        this.scrollable.scrollTop = scrollTop;
-                    }
+                    this.scrollable.scrollTop = scrollTop;
                     width = el.clientWidth;
                     height = el.clientHeight;
                 }
@@ -615,9 +608,6 @@ export default {
         this.filterChanged = _.debounce(this.filterChanged, 500);
     },
     mounted() {
-        this.rowsAdded = _.throttle(this.rowsAdded, 200);
-        this.rowsRemoved = _.throttle(this.rowsRemoved, 200);
-        this.scroll = _.throttle(this.scroll, 100);
 
         this.table.on('object-added', this.addObject);
         this.table.on('object-removed', this.removeObject);
@@ -631,7 +621,6 @@ export default {
         //Default sort
         this.sortOptions = this.table.filteredRows.sortBy();
         this.scrollable = this.$el.querySelector('.js-telemetry-table__body-w');
-        this.contentTable = this.$el.querySelector('.js-telemetry-table__content');
         this.sizingTable = this.$el.querySelector('.js-telemetry-table__sizing');
         this.headersHolderEl = this.$el.querySelector('.js-table__headers-w');
 

src/styles-new/_about.scss

@@ -54,11 +54,10 @@
 
     &:after {
         // App logo
-        $d: 25%;
-        top: $d;
-        right: $d;
-        bottom: $d;
-        left: $d;
+        top: 0;
+        right: 15%;
+        bottom: 0;
+        left: 15%;
     }
 }
 
@@ -76,20 +75,12 @@
 
     &__image,
     &__text {
-        flex: 1 1 auto;
-    }
-
-    &__image {
-        height: 35%;
+        height: 50%;
+        flex: 1 1 0;
     }
 
     &__text {
-        height: 65%;
         overflow: auto;
-        > * + * {
-            border-top: 1px solid $colorInteriorBorder;
-            margin-top: 1em;
-        }
     }
 
     &--licenses {
@@ -116,7 +107,7 @@
 
     h1, h2, h3 {
         font-weight: normal;
-        margin-bottom: .25em;
+        margin-bottom: 1em;
     }
 
     h1 {

src/styles-new/_controls.scss

@@ -393,11 +393,6 @@ select {
             color: $colorMenuIc;
             font-size: 1em;
             margin-right: $interiorMargin;
-            min-width: 1em;
-        }
-
-        &:not([class]):before {
-             content: ''; // Add this element so that menu items without an icon still indent properly
         }
     }
 }

src/styles-new/core.scss

@@ -33,4 +33,3 @@
 @import "table";
 @import "legacy";
 @import "legacy-plots";
-@import "legacy-messages";

src/ui/layout/AboutDialog.vue

@@ -1,24 +1,23 @@
 <template>
 <div class="c-about c-about--splash">
-    <div class="c-about__image c-splash-image"></div>
+    <div v-if="!branding.aboutHtml" class="c-about__image c-splash-image"></div>
+
     <div class="c-about__text s-text">
-        <div class="c-about__text__element" v-if="branding.aboutHtml" v-html="branding.aboutHtml"></div>
-        <div class="c-about__text__element">
-            <h1 class="l-title s-title">Open MCT</h1>
-            <div class="l-description s-description">
-                <p>Open MCT, Copyright &copy; 2014-2019, 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 @click="showLicenses">click here for third party licensing information</a>.</p>
-            </div>
-            <h2>Version Information</h2>
-            <ul class="t-info l-info s-info">
-                <li>Version: {{buildInfo.version || 'Unknown'}}</li>
-                <li>Build Date: {{buildInfo.buildDate || 'Unknown'}}</li>
-                <li>Revision: {{buildInfo.revision || 'Unknown'}}</li>
-                <li>Branch: {{buildInfo.branch || 'Unknown'}}</li>
-            </ul>
+        <div v-if="branding.aboutHtml" class="s-text l-content" v-html="branding.aboutHtml"></div>
+        <h1 class="l-title s-title">Open MCT</h1>
+        <div class="l-description s-description">
+	        <p>Open MCT, Copyright &copy; 2014-2019, 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 @click="showLicenses">click here for third party licensing information</a>.</p>
         </div>
+        <h2>Version Information</h2>
+        <ul class="t-info l-info s-info">
+            <li>Version: {{buildInfo.version || 'Unknown'}}</li>
+            <li>Build Date: {{buildInfo.buildDate || 'Unknown'}}</li>
+            <li>Revision: {{buildInfo.revision || 'Unknown'}}</li>
+            <li>Branch: {{buildInfo.branch || 'Unknown'}}</li>
+        </ul>
     </div>
 </div>
 </template>

src/ui/layout/tree-item.vue

@@ -70,18 +70,17 @@
                 this.domainObject = newObject;
             });
             this.$once('hook:destroyed', removeListener);
-
             if (this.openmct.composition.get(this.node.object)) {
                 this.hasChildren = true;
             }
 
             this.openmct.router.on('change:path', this.highlightIfNavigated);
         },
-        destroyed() {
-            this.openmct.router.off('change:path', this.highlightIfNavigated);
+        destroy() {
             if (this.composition) {
                 this.composition.off('add', this.addChild);
                 this.composition.off('remove', this.removeChild);
+                this.openmct.router.off('change:path', this.highlightIfNavigated);
                 delete this.composition;
             }
         },

src/ui/mixins/context-menu-gesture.js

@@ -18,7 +18,7 @@ export default {
 
         this.objectPath.forEach(object => {
             if (object) {
-                this.$once('hook:destroyed',
+                this.$once('hook:destroy',
                     this.openmct.objects.observe(object, '*', updateObject.bind(this, object)))
             }
         });

src/ui/preview/Preview.vue

@@ -116,7 +116,7 @@
                 this.notebookEnabled = true;
             }
         },
-        destroyed() {
+        destroy() {
             this.view.destroy();
         }
     }