Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-11-10 21:36:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved date handling: now recognises YYYY-MM dates.

Browse Source 
(also fix a silly math error)
This commit is contained in:
Olly Smith 2012-02-22 16:51:43 +00:00
parent eba644feca
commit f740d80c14
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
morris.js
View File

@ -3,8 +3,12 @@
function parse_year(year) {
var m = year.toString().match(/(\d+) Q(\d)/);
var n = year.toString().match(/(\d+)\-(\d+)/);
if (m) {
return parseInt(m[1], 10) + (parseInt(m[2], 19) * 3 - 1) / 12;
return parseInt(m[1], 10) + (parseInt(m[2], 10) * 3 - 1) / 12;
}
else if (n) {
return parseInt(n[1], 10) + (parseInt(n[2], 10) - 1) / 12;
}
else {
return parseInt(year, 10);