Skip to content

Commit ba9a868

Browse files
flot time series are now local, instead of UTC
1 parent 913ab62 commit ba9a868

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

js/_jquery.flot.js

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,28 +1152,28 @@
11521152
var step = tickSize * timeUnitSize[unit];
11531153

11541154
if (unit == "second")
1155-
d.setUTCSeconds(floorInBase(d.getUTCSeconds(), tickSize));
1155+
d.setSeconds(floorInBase(d.getSeconds(), tickSize));
11561156
if (unit == "minute")
1157-
d.setUTCMinutes(floorInBase(d.getUTCMinutes(), tickSize));
1157+
d.setMinutes(floorInBase(d.getMinutes(), tickSize));
11581158
if (unit == "hour")
1159-
d.setUTCHours(floorInBase(d.getUTCHours(), tickSize));
1159+
d.setHours(floorInBase(d.getHours(), tickSize));
11601160
if (unit == "month")
1161-
d.setUTCMonth(floorInBase(d.getUTCMonth(), tickSize));
1161+
d.setMonth(floorInBase(d.getMonth(), tickSize));
11621162
if (unit == "year")
1163-
d.setUTCFullYear(floorInBase(d.getUTCFullYear(), tickSize));
1163+
d.setFullYear(floorInBase(d.getFullYear(), tickSize));
11641164

11651165
// reset smaller components
1166-
d.setUTCMilliseconds(0);
1166+
d.setMilliseconds(0);
11671167
if (step >= timeUnitSize.minute)
1168-
d.setUTCSeconds(0);
1168+
d.setSeconds(0);
11691169
if (step >= timeUnitSize.hour)
1170-
d.setUTCMinutes(0);
1170+
d.setMinutes(0);
11711171
if (step >= timeUnitSize.day)
1172-
d.setUTCHours(0);
1172+
d.setHours(0);
11731173
if (step >= timeUnitSize.day * 4)
1174-
d.setUTCDate(1);
1174+
d.setDate(1);
11751175
if (step >= timeUnitSize.year)
1176-
d.setUTCMonth(0);
1176+
d.setMonth(0);
11771177

11781178

11791179
var carry = 0, v = Number.NaN, prev;
@@ -1186,19 +1186,19 @@
11861186
// a bit complicated - we'll divide the month
11871187
// up but we need to take care of fractions
11881188
// so we don't end up in the middle of a day
1189-
d.setUTCDate(1);
1189+
d.setDate(1);
11901190
var start = d.getTime();
1191-
d.setUTCMonth(d.getUTCMonth() + 1);
1191+
d.setMonth(d.getMonth() + 1);
11921192
var end = d.getTime();
11931193
d.setTime(v + carry * timeUnitSize.hour + (end - start) * tickSize);
1194-
carry = d.getUTCHours();
1195-
d.setUTCHours(0);
1194+
carry = d.getHours();
1195+
d.setHours(0);
11961196
}
11971197
else
1198-
d.setUTCMonth(d.getUTCMonth() + tickSize);
1198+
d.setMonth(d.getMonth() + tickSize);
11991199
}
12001200
else if (unit == "year") {
1201-
d.setUTCFullYear(d.getUTCFullYear() + tickSize);
1201+
d.setFullYear(d.getFullYear() + tickSize);
12021202
}
12031203
else
12041204
d.setTime(v + step);
@@ -2514,7 +2514,7 @@
25142514

25152515
var r = [];
25162516
var escape = false, padNext = false;
2517-
var hours = d.getUTCHours();
2517+
var hours = d.getHours();
25182518
var isAM = hours < 12;
25192519
if (monthNames == null)
25202520
monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
@@ -2533,12 +2533,12 @@
25332533
switch (c) {
25342534
case 'h': c = "" + hours; break;
25352535
case 'H': c = leftPad(hours); break;
2536-
case 'M': c = leftPad(d.getUTCMinutes()); break;
2537-
case 'S': c = leftPad(d.getUTCSeconds()); break;
2538-
case 'd': c = "" + d.getUTCDate(); break;
2539-
case 'm': c = "" + (d.getUTCMonth() + 1); break;
2540-
case 'y': c = "" + d.getUTCFullYear(); break;
2541-
case 'b': c = "" + monthNames[d.getUTCMonth()]; break;
2536+
case 'M': c = leftPad(d.getMinutes()); break;
2537+
case 'S': c = leftPad(d.getSeconds()); break;
2538+
case 'd': c = "" + d.getDate(); break;
2539+
case 'm': c = "" + (d.getMonth() + 1); break;
2540+
case 'y': c = "" + d.getFullYear(); break;
2541+
case 'b': c = "" + monthNames[d.getMonth()]; break;
25422542
case 'p': c = (isAM) ? ("" + "am") : ("" + "pm"); break;
25432543
case 'P': c = (isAM) ? ("" + "AM") : ("" + "PM"); break;
25442544
case '0': c = ""; padNext = true; break;

0 commit comments

Comments
 (0)