From 6f312285209c4c987a2d66502afd1e879c5f7f59 Mon Sep 17 00:00:00 2001 From: Rufus Pollock Date: Wed, 30 May 2012 23:36:29 +0100 Subject: [PATCH] [#135,view/timeline][s]: switch to using momentjs for date parsing. --- src/view-timeline.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/view-timeline.js b/src/view-timeline.js index 58091d1a..8c943ffd 100644 --- a/src/view-timeline.js +++ b/src/view-timeline.js @@ -79,13 +79,16 @@ my.Timeline = Backbone.View.extend({ } }; this.model.currentDocuments.each(function(doc) { - var tlEntry = { - "startDate": doc.get(self.state.get('startField')), - "endDate": doc.get(self.state.get('endField')) || null, - "headline": String(doc.get(self.model.fields.models[0].id)), - "text": '' - }; - if (tlEntry.startDate) { + var start = doc.get(self.state.get('startField')); + if (start) { + var end = moment(doc.get(self.state.get('endField'))); + end = end ? end.toDate() : null; + var tlEntry = { + "startDate": moment(start).toDate(), + "endDate": end, + "headline": String(doc.get(self.model.fields.models[0].id)), + "text": '' + }; out.timeline.date.push(tlEntry); } });