Skip to content

Commit e7935ac

Browse files
Merge pull request #1227 from Codeinwp/fix/issue-1221
fix: number format not being applied properly
2 parents 454131f + 212d212 commit e7935ac

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

js/render-google.js

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -352,19 +352,14 @@ var isResizeRequest = false;
352352
}
353353
break;
354354
default:
355-
for (i = 0; i < settings.series.length; i++) {
356-
if (!series[i + 1] || typeof settings.series[i] === 'undefined') {
357-
continue;
358-
}
359-
var seriesIndexToUse = i + 1;
360-
361-
// if an annotation "swallowed" a series, use the following one.
362-
if(series_annotations.includes(i)){
363-
seriesIndexToUse++;
364-
}
365-
if ( series[seriesIndexToUse] ) {
366-
format_data(id, table, series[seriesIndexToUse].type, settings.series[i].format, seriesIndexToUse);
367-
}
355+
// Single-pass: walk columns, skip annotation/helper roles, apply formats in order.
356+
var k = 0; // index into settings.series (visible series)
357+
for (var c = 1; c < series.length && k < settings.series.length; c++) { // skip label at 0
358+
if (table.getColumnProperty(c, 'role')) continue; // helper/annotation column
359+
var s = settings.series[k++];
360+
if (!s || !s.format) continue;
361+
if (!series[c]) continue;
362+
format_data(id, table, series[c].type, s.format, c);
368363
}
369364
break;
370365
}

0 commit comments

Comments
 (0)