UI: Minor fixes

ui/src/app/api/datasource.service.js

@@ -357,23 +357,8 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic
         return data;
     }
 
-    function generateSeries(dataKey) {
+    function generateSeries(dataKey, startTime, endTime) {
-
         var data = [];
-        var startTime;
-        var endTime;
-
-        if (realtime) {
-            endTime = (new Date).getTime();
-            if (dataKey.lastUpdateTime) {
-                startTime = dataKey.lastUpdateTime + frequency;
-            } else {
-                startTime = endTime - datasourceSubscription.subscriptionTimewindow.realtimeWindowMs;
-            }
-        } else {
-            startTime = datasourceSubscription.subscriptionTimewindow.fixedWindow.startTimeMs;
-            endTime = datasourceSubscription.subscriptionTimewindow.fixedWindow.endTimeMs;
-        }
         var prevSeries;
         var datasourceKeyData = datasourceData[dataKey.key];
         if (datasourceKeyData.length > 0) {
@@ -429,9 +414,33 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic
     }
 
     function onTick() {
-        for (var key in dataKeys) {
+        var key;
-            dataGenFunction(dataKeys[key]);
+        if (datasourceSubscription.type === types.widgetType.timeseries.value) {
+            var startTime;
+            var endTime;
+            for (key in dataKeys) {
+                var dataKey = dataKeys[key];
+                if (!startTime) {
+                    if (realtime) {
+                        endTime = (new Date).getTime();
+                        if (dataKey.lastUpdateTime) {
+                            startTime = dataKey.lastUpdateTime + frequency;
+                        } else {
+                            startTime = endTime - datasourceSubscription.subscriptionTimewindow.realtimeWindowMs;
                         }
+                    } else {
+                        startTime = datasourceSubscription.subscriptionTimewindow.fixedWindow.startTimeMs;
+                        endTime = datasourceSubscription.subscriptionTimewindow.fixedWindow.endTimeMs;
+                    }
+                }
+                generateSeries(dataKey, startTime, endTime);
+            }
+        } else if (datasourceSubscription.type === types.widgetType.latest.value) {
+            for (key in dataKeys) {
+                generateLatest(dataKeys[key]);
+            }
+        }
+
         if (!history) {
             timer = $timeout(onTick, frequency / 2, false);
         }

ui/src/app/components/menu-toggle.tpl.html

@@ -26,7 +26,7 @@
 	class=" pull-right fa fa-chevron-down md-toggle-icon"
 	ng-class="{'tb-toggled' : sectionActive()}"></span>
 </md-button>
-<ul id="docs-menu-{{section.name | nospace}}" class="tb-menu-toggle-list" style="height: {{sectionHeight()}};">
+<ul id="docs-menu-{{section.name | nospace}}" class="tb-menu-toggle-list" ng-style="{height: sectionHeight()}">
 	<li ng-repeat="page in section.pages">
      	<tb-menu-link section="page"></tb-menu-link>
 	</li>