|
|
|
@ -1,5 +1,5 @@ |
|
|
|
/* |
|
|
|
/* |
|
|
|
TimelineJS - ver. 2014-11-19-22-14-30 - 2014-11-19 |
|
|
|
TimelineJS - ver. 2.35.1 - 2014-11-19 |
|
|
|
Copyright (c) 2012-2013 Northwestern University |
|
|
|
Copyright (c) 2012-2013 Northwestern University |
|
|
|
a project of the Northwestern University Knight Lab, originally created by Zach Wise |
|
|
|
a project of the Northwestern University Knight Lab, originally created by Zach Wise |
|
|
|
https://github.com/NUKnightLab/TimelineJS
|
|
|
|
https://github.com/NUKnightLab/TimelineJS
|
|
|
|
@ -1258,6 +1258,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Date == 'undefined') { |
|
|
|
date = d; |
|
|
|
date = d; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
date = new Date(0);
|
|
|
|
date = new Date(0);
|
|
|
|
|
|
|
|
date.setMonth(0); date.setDate(1); date.setHours(0); date.setMinutes(0); date.setSeconds(0); date.setMilliseconds(0); |
|
|
|
if ( d.match(/,/gi) ) { |
|
|
|
if ( d.match(/,/gi) ) { |
|
|
|
date_array = d.split(","); |
|
|
|
date_array = d.split(","); |
|
|
|
for(var i = 0; i < date_array.length; i++) { |
|
|
|
for(var i = 0; i < date_array.length; i++) { |
|
|
|
@ -1329,9 +1330,9 @@ if(typeof VMM != 'undefined' && typeof VMM.Date == 'undefined') { |
|
|
|
if (date_array[0] >= 0) { |
|
|
|
if (date_array[0] >= 0) { |
|
|
|
var month = date_array[0] - 1; |
|
|
|
var month = date_array[0] - 1; |
|
|
|
date.setMonth(month); |
|
|
|
date.setMonth(month); |
|
|
|
if (date.getMonth() != month) {
|
|
|
|
// if (date.getMonth() != month) {
|
|
|
|
date.setMonth(month); |
|
|
|
// date.setMonth(month); // WTF javascript?
|
|
|
|
} |
|
|
|
// }
|
|
|
|
p.month = true; |
|
|
|
p.month = true; |
|
|
|
} |
|
|
|
} |
|
|
|
if (date_array[1] >= 0) { |
|
|
|
if (date_array[1] >= 0) { |
|
|
|
|
Joe Germuska
10 years ago