diff options
| -rw-r--r-- | interface/css/d3evolution.css | 2 | ||||
| -rw-r--r-- | interface/js/rspamd.js | 29 |
2 files changed, 16 insertions, 15 deletions
diff --git a/interface/css/d3evolution.css b/interface/css/d3evolution.css index a27a61d47..9998c6258 100644 --- a/interface/css/d3evolution.css +++ b/interface/css/d3evolution.css @@ -13,7 +13,7 @@ } .d3evolution .axis, .d3evolution .legend { - font-size: 13px; + font-size: 12px; } .d3evolution .axis path, .d3evolution .axis line { diff --git a/interface/js/rspamd.js b/interface/js/rspamd.js index be757ce4d..9ce9c76cb 100644 --- a/interface/js/rspamd.js +++ b/interface/js/rspamd.js @@ -37,11 +37,11 @@ var checked_server = "All SERVERS"; var timer_id = []; - var selected = []; // Keep graph selectors state + var selData; // Graph's dataset selector state // Bind event handlers to selectors $("#selData").change(function () { - selected.selData = this.value; + selData = this.value; tabClick("#throughput_nav"); }); $("#selConvert").change(function () { @@ -107,13 +107,13 @@ getChart(); break; case "#throughput_nav": - getGraphData(selected.selData); + getGraphData(selData); const autoRefresh = { hourly: 60000, daily: 300000 }; - timer_id.throughput = Visibility.every(autoRefresh[selected.selData] || 3600000, function () { - getGraphData(selected.selData); + timer_id.throughput = Visibility.every(autoRefresh[selData] || 3600000, function () { + getGraphData(selData); }); break; case "#configuration_nav": @@ -654,10 +654,6 @@ height: 370, yAxisLabel: "Message rate, msg/s", - type: selected.selType, - interpolate: selected.selInterpolate, - convert: selected.selConvert, - legend: { space: 140, entries: [{ @@ -684,13 +680,18 @@ function initGraph() { // Get selectors' current state - var selIds = ["selData", "selConvert", "selType", "selInterpolate"]; - selIds.forEach(function (id) { + function getSelector(id) { var e = document.getElementById(id); - selected[id] = e.options[e.selectedIndex].value; - }); + return e.options[e.selectedIndex].value; + } + + selData = getSelector("selData"); - graph = new D3Evolution("graph", graph_options); + graph = new D3Evolution("graph", $.extend({}, graph_options, { + type: getSelector("selType"), + interpolate: getSelector("selInterpolate"), + convert: getSelector("selConvert"), + })); } function getRrdSummary(json) { |