Graph: graph spinner should not stop until annotation request is complete, #1235

2014-12-19 08:39:23 +01:00
parent 731bb6ba03
commit 1b3bddd622
1 changed files with 3 additions and 2 deletions
@@ -146,10 +146,9 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) {
    };

    $scope.dataHandler = function(results) {
-      $scope.panelMeta.loading = false;
-
      // png renderer returns just a url
      if (_.isString(results)) {
+        $scope.panelMeta.loading = false;
        $scope.render(results);
        return;
      }
@@ -164,9 +163,11 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) {

      $scope.annotationsPromise
        .then(function(annotations) {
+          $scope.panelMeta.loading = false;
          $scope.seriesList.annotations = annotations;
          $scope.render($scope.seriesList);
        }, function() {
+          $scope.panelMeta.loading = false;
          $scope.render($scope.seriesList);
        });
    };