From 5c3e3661925c70a70bfcc489ca5581907017a58c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 3 Feb 2015 09:18:00 +0100 Subject: [PATCH 1/2] Fixed wrong icon class in annotations, broken after recent upgrade of font-awesome, Fixes #1416 --- src/app/panels/graph/graph.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/panels/graph/graph.js b/src/app/panels/graph/graph.js index 20648af5751..2f86240a5f2 100755 --- a/src/app/panels/graph/graph.js +++ b/src/app/panels/graph/graph.js @@ -319,7 +319,7 @@ function (angular, $, kbn, moment, _, GraphTooltip) { types[event.annotation.name] = { level: _.keys(types).length + 1, icon: { - icon: "icon-chevron-down", + icon: "fa fa-chevron-down", size: event.annotation.iconSize, color: event.annotation.iconColor, } From 6b6b97c8d8d8403b9944fa617e3ee8ca02552d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 3 Feb 2015 09:27:00 +0100 Subject: [PATCH 2/2] Minor bug fix for rememeber refresh interval after zooming two or more times, Fixes #1408 --- src/app/features/dashboard/timeSrv.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/dashboard/timeSrv.js b/src/app/features/dashboard/timeSrv.js index 0d8dc31567b..ef493e07e16 100644 --- a/src/app/features/dashboard/timeSrv.js +++ b/src/app/features/dashboard/timeSrv.js @@ -94,7 +94,7 @@ define([ // disable refresh if we have an absolute time if (time.to !== 'now') { - this.old_refresh = this.dashboard.refresh; + this.old_refresh = this.dashboard.refresh || this.old_refresh; this.set_interval(false); } else if (this.old_refresh && this.old_refresh !== this.dashboard.refresh) {