|
1152 | 1152 | var step = tickSize * timeUnitSize[unit]; |
1153 | 1153 |
|
1154 | 1154 | if (unit == "second") |
1155 | | - d.setUTCSeconds(floorInBase(d.getUTCSeconds(), tickSize)); |
| 1155 | + d.setSeconds(floorInBase(d.getSeconds(), tickSize)); |
1156 | 1156 | if (unit == "minute") |
1157 | | - d.setUTCMinutes(floorInBase(d.getUTCMinutes(), tickSize)); |
| 1157 | + d.setMinutes(floorInBase(d.getMinutes(), tickSize)); |
1158 | 1158 | if (unit == "hour") |
1159 | | - d.setUTCHours(floorInBase(d.getUTCHours(), tickSize)); |
| 1159 | + d.setHours(floorInBase(d.getHours(), tickSize)); |
1160 | 1160 | if (unit == "month") |
1161 | | - d.setUTCMonth(floorInBase(d.getUTCMonth(), tickSize)); |
| 1161 | + d.setMonth(floorInBase(d.getMonth(), tickSize)); |
1162 | 1162 | if (unit == "year") |
1163 | | - d.setUTCFullYear(floorInBase(d.getUTCFullYear(), tickSize)); |
| 1163 | + d.setFullYear(floorInBase(d.getFullYear(), tickSize)); |
1164 | 1164 |
|
1165 | 1165 | // reset smaller components |
1166 | | - d.setUTCMilliseconds(0); |
| 1166 | + d.setMilliseconds(0); |
1167 | 1167 | if (step >= timeUnitSize.minute) |
1168 | | - d.setUTCSeconds(0); |
| 1168 | + d.setSeconds(0); |
1169 | 1169 | if (step >= timeUnitSize.hour) |
1170 | | - d.setUTCMinutes(0); |
| 1170 | + d.setMinutes(0); |
1171 | 1171 | if (step >= timeUnitSize.day) |
1172 | | - d.setUTCHours(0); |
| 1172 | + d.setHours(0); |
1173 | 1173 | if (step >= timeUnitSize.day * 4) |
1174 | | - d.setUTCDate(1); |
| 1174 | + d.setDate(1); |
1175 | 1175 | if (step >= timeUnitSize.year) |
1176 | | - d.setUTCMonth(0); |
| 1176 | + d.setMonth(0); |
1177 | 1177 |
|
1178 | 1178 |
|
1179 | 1179 | var carry = 0, v = Number.NaN, prev; |
|
1186 | 1186 | // a bit complicated - we'll divide the month |
1187 | 1187 | // up but we need to take care of fractions |
1188 | 1188 | // so we don't end up in the middle of a day |
1189 | | - d.setUTCDate(1); |
| 1189 | + d.setDate(1); |
1190 | 1190 | var start = d.getTime(); |
1191 | | - d.setUTCMonth(d.getUTCMonth() + 1); |
| 1191 | + d.setMonth(d.getMonth() + 1); |
1192 | 1192 | var end = d.getTime(); |
1193 | 1193 | 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); |
1196 | 1196 | } |
1197 | 1197 | else |
1198 | | - d.setUTCMonth(d.getUTCMonth() + tickSize); |
| 1198 | + d.setMonth(d.getMonth() + tickSize); |
1199 | 1199 | } |
1200 | 1200 | else if (unit == "year") { |
1201 | | - d.setUTCFullYear(d.getUTCFullYear() + tickSize); |
| 1201 | + d.setFullYear(d.getFullYear() + tickSize); |
1202 | 1202 | } |
1203 | 1203 | else |
1204 | 1204 | d.setTime(v + step); |
|
2514 | 2514 |
|
2515 | 2515 | var r = []; |
2516 | 2516 | var escape = false, padNext = false; |
2517 | | - var hours = d.getUTCHours(); |
| 2517 | + var hours = d.getHours(); |
2518 | 2518 | var isAM = hours < 12; |
2519 | 2519 | if (monthNames == null) |
2520 | 2520 | monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]; |
|
2533 | 2533 | switch (c) { |
2534 | 2534 | case 'h': c = "" + hours; break; |
2535 | 2535 | 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; |
2542 | 2542 | case 'p': c = (isAM) ? ("" + "am") : ("" + "pm"); break; |
2543 | 2543 | case 'P': c = (isAM) ? ("" + "AM") : ("" + "PM"); break; |
2544 | 2544 | case '0': c = ""; padNext = true; break; |
|
0 commit comments