IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Also use timeline date format on the bottom of the timeline

Browse Source
This commit is contained in:
Robin Ward 2016-05-25 12:46:26 -04:00
parent e5ad297ef0
commit 288b407bd1
No known key found for this signature in database
GPG Key ID: 0E091E2B4ED1B83D
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/lib/formatter.js.es6
View File

@ -163,7 +163,7 @@ function relativeAgeTiny(date, ageOpts) {
formatted = t("x_days", {count: Math.round(distanceInMinutes / 1440.0)}); formatted = t("x_days", {count: Math.round(distanceInMinutes / 1440.0)});
break; break;
default: default:
formatted = smartShortDate(date); formatted = (ageOpts.defaultFormat || smartShortDate)(date);
break; break;
} }

2
app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
View File

@ -238,7 +238,7 @@ export default createWidget('topic-timeline', {
this.attach('link', { this.attach('link', {
className: 'now-date', className: 'now-date',
icon: 'dot-circle-o', icon: 'dot-circle-o',
rawLabel: relativeAge(new Date(topic.last_posted_at), { addAgo: true }), rawLabel: relativeAge(new Date(topic.last_posted_at), { addAgo: true, defaultFormat: timelineDate }),
action: 'jumpBottom' action: 'jumpBottom'
}) ]; }) ];
} }