Merge pull request #41 from kpfefferle/luxon-fix

Fall back to ISO if timestamp is not milliseconds

Author: achambers

lib/legacy-table.js

@@ -38,7 +38,9 @@ module.exports = CoreObject.extend({
       let value = revision[key.name] ? revision[key.name] : "";
 
       if(key.name === 'timestamp') {
-        value = DateTime.fromMillis(value).toFormat("yyyy/MM/dd HH:mm:ss");
+        // ember-cli-deploy-revision-data uses ISO timestamps, so fall back to ISO if not milliseconds
+        let dt = typeof value === 'number' ? DateTime.fromMillis(value) : DateTime.fromISO(value);
+        value = dt.toFormat("yyyy/MM/dd HH:mm:ss");
       }
 
       if(key.maxLength !== -1) {

lib/scm-table.js

@@ -70,7 +70,10 @@ module.exports = CoreObject.extend({
       ];
 
       if (this._isWide()) {
-        let value = DateTime.fromMillis(data.timestamp).toFormat('yyyy/MM/dd HH:mm:ss');
+        let { timestamp } = data;
+        // ember-cli-deploy-revision-data uses ISO timestamps, so fall back to ISO if not milliseconds
+        let dt = typeof timestamp === 'number' ? DateTime.fromMillis(timestamp) : DateTime.fromISO(timestamp);
+        let value = dt.toFormat('yyyy/MM/dd HH:mm:ss');
         row.push(value);
       }