Added default unix timestamp format

alexandre-melard · Jun 26, 2014 · 52d0b76 · 52d0b76
1 parent 4e47e69
commit 52d0b76
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git 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
@@ -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);
   }
 });