X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=share%2Fcollection.js;h=6aff20fb41d4883b00d366b5de64574a89bd005e;hp=c7200868b0417c56165d485d94f192181ea2d268;hb=a5ffcea3f2edf3bce54d3e7b8863a8287366b686;hpb=13fbd841132a9bb8ddf83f614662113b3b36653c diff --git a/share/collection.js b/share/collection.js index c720086..6aff20f 100644 --- a/share/collection.js +++ b/share/collection.js @@ -218,7 +218,6 @@ function def_draw_one (def, data, chart_opts) /* {{{ */ var chart_series = new Object (); chart_series.type = 'line'; - chart_series.name = def.legend || def.data_source; chart_series.pointInterval = data.interval * 1000; chart_series.pointStart = data.first_value_time * 1000; chart_series.data = data.data; @@ -226,6 +225,11 @@ function def_draw_one (def, data, chart_opts) /* {{{ */ chart_series.shadow = false; chart_series.marker = { enabled: false }; + if (def.legend) + chart_series.name = def.legend; + else if (def.ds_name) + chart_series.name = def.ds_name; + if (def.area) chart_series.type = 'area';