Merge pull request nasa#1042 from nasa/open1040

VWoeltjen · web-flow · commit cefb40856b7f · 2016-06-20T16:24:58.000-07:00
[Tables] Enabled auto-scroll by default fixes nasa#1040
diff --git 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">
     </mct-table>
 </div>
diff --git 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
@@ -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);
-            });
-
         });
     }
 );
