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

Browse Source
This commit is contained in:
Torkel Odegaard 2014-02-09 21:57:37 +01:00
commit ca258deb7a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/directives/grafanaGraph.js
View File

@ -141,7 +141,12 @@ function (angular, $, kbn, moment, _) {
}); });
if (panel.grid.threshold2) { if (panel.grid.threshold2) {
var limit2 = panel.grid.thresholdLine ? panel.grid.threshold2 : null; var limit2;
if (panel.grid.thresholdLine) {
limit2 = panel.grid.threshold2;
} else {
limit2 = panel.grid.threshold1 > panel.grid.threshold2 ? -Infinity : +Infinity;
}
options.grid.markings.push({ options.grid.markings.push({
yaxis: { from: panel.grid.threshold2, to: limit2 }, yaxis: { from: panel.grid.threshold2, to: limit2 },
color: panel.grid.threshold2Color color: panel.grid.threshold2Color
@ -340,4 +345,4 @@ function (angular, $, kbn, moment, _) {
}; };
}); });
}); });