Merge branch 'master' of github.com:torkelo/grafana

ca258deb · Torkel Odegaard · 79ca0164 · bf9c0bb9 · ca258deb
Commit ca258deb authored Feb 09, 2014 by Torkel Odegaard
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletions

src/app/directives/grafanaGraph.js
+6 -1

No files found.
--- a/src/app/directives/grafanaGraph.js
+++ b/src/app/directives/grafanaGraph.js
@@ -141,7 +141,12 @@ function (angular, $, kbn, moment, _) {
            });

            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({
                yaxis: { from: panel.grid.threshold2, to: limit2 },
                color: panel.grid.threshold2Color