knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[view/timeline,bugfix][xs]: Fixing Date parsing for TimeLine in Safari from @teleyinex.
This commit is contained in:
Rufus Pollock
2012-11-13 08:35:17 -08:00
parent 3226d8b11b 7af166ed85
commit b900581605
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/view.timeline.js
View File

@@ -142,7 +142,10 @@ my.Timeline = Backbone.View.extend({
var out = date.trim(); var out = date.trim();
out = out.replace(/(\d)th/g, '$1'); out = out.replace(/(\d)th/g, '$1');
out = out.replace(/(\d)st/g, '$1'); out = out.replace(/(\d)st/g, '$1');
out = out.trim() ? moment(out) : null; // 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);
if (out.toDate() == 'Invalid Date') { if (out.toDate() == 'Invalid Date') {
return null; return null;
} else { } else {