Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions js/render-google.js
Original file line number Diff line number Diff line change
Expand Up @@ -352,19 +352,14 @@ var isResizeRequest = false;
}
break;
default:
for (i = 0; i < settings.series.length; i++) {
if (!series[i + 1] || typeof settings.series[i] === 'undefined') {
continue;
}
var seriesIndexToUse = i + 1;

// if an annotation "swallowed" a series, use the following one.
if(series_annotations.includes(i)){
seriesIndexToUse++;
}
if ( series[seriesIndexToUse] ) {
format_data(id, table, series[seriesIndexToUse].type, settings.series[i].format, seriesIndexToUse);
}
// Single-pass: walk columns, skip annotation/helper roles, apply formats in order.
var k = 0; // index into settings.series (visible series)
for (var c = 1; c < series.length && k < settings.series.length; c++) { // skip label at 0
if (table.getColumnProperty(c, 'role')) continue; // helper/annotation column
var s = settings.series[k++];
if (!s || !s.format) continue;
if (!series[c]) continue;
format_data(id, table, series[c].type, s.format, c);
}
break;
}
Expand Down
Loading