IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-12-19 08:39:23 +01:00
parent 731bb6ba03
commit 1b3bddd622
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/panels/graph/module.js
View File

@ -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);
});
};