deac/fullcalendar
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

parse unix timestamps with decimal points (issue 826)

Browse source
This commit is contained in:
Adam Shaw 2011-04-09 10:15:24 -07:00
parent b110e2bf51
commit be32715d3c
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/date_util.js
View file

@ -146,8 +146,8 @@ function parseDate(s, ignoreTimezone) { // ignoreTimezone defaults to true
return new Date(s * 1000); return new Date(s * 1000);
} }
if (typeof s == 'string') { if (typeof s == 'string') {
if (s.match(/^\d+$/)) { // a UNIX timestamp if (s.match(/^\d+(\.\d+)?$/)) { // a UNIX timestamp
return new Date(parseInt(s, 10) * 1000); return new Date(parseFloat(s) * 1000);
} }
if (ignoreTimezone === undefined) { if (ignoreTimezone === undefined) {
ignoreTimezone = true; ignoreTimezone = true;

4
tests/sources.html
View file

@ -83,6 +83,10 @@
start: new Date(y, m, 28), start: new Date(y, m, 28),
end: new Date(y, m, 29), end: new Date(y, m, 29),
url: 'http://google.com/' url: 'http://google.com/'
},
{
title: 'Float String Timestamp Event',
start: '1295078400.0'
} }
]; ];