From 52d0b76e0ddd49439ceadeba6c95a566e1e4ca1f Mon Sep 17 00:00:00 2001 From: Nico Gevers Date: Thu, 26 Jun 2014 22:31:23 +0200 Subject: [PATCH] Added default unix timestamp format --- ember-datepicker.js | 9 +++++++-- src/component.js | 10 ++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ember-datepicker.js b/ember-datepicker.js index 585bc3b..c1277d9 100644 --- a/ember-datepicker.js +++ b/ember-datepicker.js @@ -1,5 +1,6 @@ (function() { Em.DatePickerComponent = Em.TextField.extend({ + isUnix: true, format: 'YYYY-MM-DD', defaultDate: function() { // must be a moment value return moment().format(this.get('format')); @@ -22,8 +23,12 @@ that.set('date', moment(that.get('value'))); } }), - dd = that.get('date') || that.get('defaultDate'); - picker.setDate(moment(dd).format(that.get('format'))); + dd = that.get('date'); + if (this.get('isUnix') && !Em.isBlank(dd)) { + picker.setDate(moment.unix(dd).format(that.get('format'))); + } else { + picker.setDate(moment(dd).format(that.get('format'))); + } this.set("_picker", picker); } }); diff --git a/src/component.js b/src/component.js index 11ebe8b..2c72b26 100644 --- a/src/component.js +++ b/src/component.js @@ -3,6 +3,7 @@ * the calendar widget. */ Em.DatePickerComponent = Em.TextField.extend({ + isUnix: true, // unix timestamp format format: 'YYYY-MM-DD', defaultDate: function() { // must be a moment value return moment().format(this.get('format')); @@ -25,8 +26,13 @@ Em.DatePickerComponent = Em.TextField.extend({ that.set('date', moment(that.get('value'))); } }), - dd = that.get('date') || that.get('defaultDate'); - picker.setDate(moment(dd).format(that.get('format'))); + dd = that.get('date'); + if (this.get('isUnix') && !Em.isBlank(dd)) { + picker.setDate(moment.unix(dd).format(that.get('format'))); + } else { + picker.setDate(moment(dd).format(that.get('format'))); + } + this.set("_picker", picker); this.set("_picker", picker); } });