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' into develop

Browse Source
This commit is contained in:
Torkel Ödegaard 2018-11-13 17:24:51 +01:00
commit b530b9ce7f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/vendor/flot/jquery.flot.js vendored
View File

@ -2310,12 +2310,13 @@ Licensed under the MIT license.
} }
function drawSeries(series) { function drawSeries(series) {
if (series.lines.show) if (series.lines.show) {
drawSeriesLines(series); drawSeriesLines(series);
if (!series.points.show && !series.bars.show) { if (!series.points.show && !series.bars.show) {
// not necessary if user wants points displayed for everything // not necessary if user wants points displayed for everything
drawOrphanedPoints(series); drawOrphanedPoints(series);
} }
}
if (series.bars.show) if (series.bars.show)
drawSeriesBars(series); drawSeriesBars(series);
if (series.points.show) if (series.points.show)