From ee7c450e1144147f3d654c0c89b61ef433a78d37 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 20 Jun 2016 16:18:26 -0700 Subject: [PATCH] [Tables] Enabled auto-scroll by default fixes #1040 --- .../table/res/templates/rt-table.html | 2 +- .../controllers/RealtimeTableController.js | 23 ------------------- .../RealtimeTableControllerSpec.js | 7 ------ 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/platform/features/table/res/templates/rt-table.html b/platform/features/table/res/templates/rt-table.html index c5ae6de0dc..c6fb0d2422 100644 --- a/platform/features/table/res/templates/rt-table.html +++ b/platform/features/table/res/templates/rt-table.html @@ -5,6 +5,6 @@ enableFilter="true" enableSort="true" class="tabular-holder t-exportable" - auto-scroll="autoScroll"> + auto-scroll="true"> \ No newline at end of file diff --git a/platform/features/table/src/controllers/RealtimeTableController.js b/platform/features/table/src/controllers/RealtimeTableController.js index 545367e5b6..f3d24b30fc 100644 --- a/platform/features/table/src/controllers/RealtimeTableController.js +++ b/platform/features/table/src/controllers/RealtimeTableController.js @@ -38,30 +38,7 @@ define( function RealtimeTableController($scope, telemetryHandler, telemetryFormatter) { TableController.call(this, $scope, telemetryHandler, telemetryFormatter); - $scope.autoScroll = false; this.maxRows = 100000; - - /* - * Determine if auto-scroll should be enabled. Is enabled - * automatically when telemetry type is string - */ - function hasStringTelemetry(domainObject) { - var telemetry = domainObject && - domainObject.getCapability('telemetry'), - metadata = telemetry ? telemetry.getMetadata() : {}, - ranges = metadata.ranges || []; - - return ranges.some(function (range) { - return range.format === 'string'; - }); - } - $scope.$watch('domainObject', function (domainObject) { - //When a domain object becomes available, check whether the - // view should auto-scroll to the bottom. - if (domainObject && hasStringTelemetry(domainObject)) { - $scope.autoScroll = true; - } - }); } RealtimeTableController.prototype = Object.create(TableController.prototype); diff --git a/platform/features/table/test/controllers/RealtimeTableControllerSpec.js b/platform/features/table/test/controllers/RealtimeTableControllerSpec.js index ada85baa3c..b3d7819c26 100644 --- a/platform/features/table/test/controllers/RealtimeTableControllerSpec.js +++ b/platform/features/table/test/controllers/RealtimeTableControllerSpec.js @@ -155,13 +155,6 @@ define( expect(mockScope.rows[0].row).toBe(1); }); }); - - it('enables autoscroll for event telemetry', function () { - controller.subscribe(); - mockScope.$watch.mostRecentCall.args[1](mockDomainObject); - expect(mockScope.autoScroll).toBe(true); - }); - }); } );