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

Merge branch 'master' of github.com:torkelo/grafana-private into pro

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-02-03 09:43:21 +01:00
commit 3e5223b98d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/features/dashboard/timeSrv.js
View File

@ -94,7 +94,7 @@ define([
// disable refresh if we have an absolute time // disable refresh if we have an absolute time
if (time.to !== 'now') { if (time.to !== 'now') {
this.old_refresh = this.dashboard.refresh; this.old_refresh = this.dashboard.refresh || this.old_refresh;
this.set_interval(false); this.set_interval(false);
} }
else if (this.old_refresh && this.old_refresh !== this.dashboard.refresh) { else if (this.old_refresh && this.old_refresh !== this.dashboard.refresh) {

2
src/app/panels/graph/graph.js
View File

@ -319,7 +319,7 @@ function (angular, $, kbn, moment, _, GraphTooltip) {
types[event.annotation.name] = { types[event.annotation.name] = {
level: _.keys(types).length + 1, level: _.keys(types).length + 1,
icon: { icon: {
icon: "icon-chevron-down", icon: "fa fa-chevron-down",
size: event.annotation.iconSize, size: event.annotation.iconSize,
color: event.annotation.iconColor, color: event.annotation.iconColor,
} }