Merge pull request #42 from kpfefferle/luxon-take-3

Author: achambers

lib/legacy-table.js

@@ -38,8 +38,8 @@ module.exports = CoreObject.extend({
       let value = revision[key.name] ? revision[key.name] : "";
 
       if(key.name === 'timestamp') {
-        // 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);
+        // ember-cli-deploy-revision-data provides a JS Date object, so fall back to that if not milliseconds
+        let dt = typeof value === 'number' ? DateTime.fromMillis(value) : DateTime.fromJSDate(value);
         value = dt.toFormat("yyyy/MM/dd HH:mm:ss");
       }
 

lib/scm-table.js

@@ -71,8 +71,8 @@ module.exports = CoreObject.extend({
 
       if (this._isWide()) {
         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);
+        // ember-cli-deploy-revision-data provides a JS Date object, so fall back to that if not milliseconds
+        let dt = typeof timestamp === 'number' ? DateTime.fromMillis(timestamp) : DateTime.fromJSDate(timestamp);
         let value = dt.toFormat('yyyy/MM/dd HH:mm:ss');
         row.push(value);
       }