Skip to content

Luxon Take 3: Use fromJSDate instead of fromISO for ember-cli-deploy-revision-data #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2020
Merged

Luxon Take 3: Use fromJSDate instead of fromISO for ember-cli-deploy-revision-data #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/legacy-table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down
4 changes: 2 additions & 2 deletions lib/scm-table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down