From 1eef84dd7e05a5d0f36825a20b6db72f46f55705 Mon Sep 17 00:00:00 2001 From: Philipp Klaus Date: Mon, 18 Sep 2017 18:18:02 +0200 Subject: [PATCH] DASH: fix shadowing of var gradient in sparkline.js --- python_suite/dashboard/static/js/sparkline.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/python_suite/dashboard/static/js/sparkline.js b/python_suite/dashboard/static/js/sparkline.js index 56ebee3..8150bbc 100644 --- a/python_suite/dashboard/static/js/sparkline.js +++ b/python_suite/dashboard/static/js/sparkline.js @@ -177,9 +177,9 @@ function sparkline() { function createGradient() { var color; - var upper_perc_offset = margin.top / (height + margin.top + margin.bottom); - var lower_perc_offset = (margin.top + height) / (height + margin.top + margin.bottom); - var gradient = (lower_perc_offset - upper_perc_offset) / 100; + var upper_perc_offset = margin.top / (height + margin.top + margin.bottom) * 100; + var lower_perc_offset = (margin.top + height) / (height + margin.top + margin.bottom) * 100; + var m = (lower_perc_offset - upper_perc_offset) / 100; gradient = svg.append("defs") .append("linearGradient") @@ -192,7 +192,7 @@ function sparkline() { .attr("spreadMethod", "pad"); if (upper_alarm_limit !== null) { perc_val = (upper_alarm_limit-upper_disp_limit)/(lower_disp_limit-upper_disp_limit)*100; - perc_val = upper_perc_offset + gradient * perc_val; + perc_val = upper_perc_offset + m * perc_val; gradient.append("stop") .attr("offset", perc_val + '%') .attr("stop-color", gradientColors[2]) // ALARM color @@ -208,7 +208,7 @@ function sparkline() { } if (upper_warning_limit !== null) { perc_val = (upper_warning_limit-upper_disp_limit)/(lower_disp_limit-upper_disp_limit)*100; - perc_val = upper_perc_offset + gradient * perc_val; + perc_val = upper_perc_offset + m * perc_val; gradient.append("stop") .attr("offset", perc_val + '%') .attr("stop-color", gradientColors[1]) // WARNING color @@ -231,7 +231,7 @@ function sparkline() { .attr("stop-opacity", 0.7); if (lower_warning_limit !== null) { perc_val = (lower_warning_limit-upper_disp_limit)/(lower_disp_limit-upper_disp_limit)*100; - perc_val = upper_perc_offset + gradient * perc_val; + perc_val = upper_perc_offset + m * perc_val; gradient.append("stop") .attr("offset", perc_val + '%') .attr("stop-color", gradientColors[0]) // OK color @@ -243,7 +243,7 @@ function sparkline() { } if (lower_alarm_limit !== null) { perc_val = (lower_alarm_limit-upper_disp_limit)/(lower_disp_limit-upper_disp_limit)*100; - perc_val = upper_perc_offset + gradient * perc_val; + perc_val = upper_perc_offset + m * perc_val; if (lower_warning_limit !== null) color = gradientColors[1]; // WARNING color else -- 2.43.0