From 1b3bddd6225b1cad328e68814e1ef6d7270fc902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 19 Dec 2014 08:39:23 +0100
Subject: [PATCH] Graph: graph spinner should not stop until annotation request
 is complete, #1235

---
 src/app/panels/graph/module.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/panels/graph/module.js b/src/app/panels/graph/module.js
index 90b6957b8b5..335fd4e52a3 100644
--- a/src/app/panels/graph/module.js
+++ b/src/app/panels/graph/module.js
@@ -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);
         });
     };