Revert "Merge pull request #275 from citizen-cyberscience-centre/master".

This reverts commit b900581605e7612bd896e4f1bec7837784a1ebbc, reversing
changes made to 3226d8b11b1d41bdafcdab6f9ea424d3f553cbe3.
This commit is contained in:
Rufus Pollock 2012-11-19 12:24:06 +00:00
parent b900581605
commit b2cd87cec4

View File

@ -142,10 +142,7 @@ my.Timeline = Backbone.View.extend({
var out = date.trim();
out = out.replace(/(\d)th/g, '$1');
out = out.replace(/(\d)st/g, '$1');
// parse a date in yyyy-mm-dd hh:mm format
var parts = out.match(/(\d+)/g);
out = new Date(parts[0],parts[1]-1,parts[2],parts[3],parts[4]);
out = moment(out);
out = out.trim() ? moment(out) : null;
if (out.toDate() == 'Invalid Date') {
return null;
} else {