From dbd16776fae162ad70be4a1adecd2ff554149dc3 Mon Sep 17 00:00:00 2001 From: Kris Date: Thu, 6 Jun 2024 11:27:12 -0400 Subject: [PATCH] UX: improve topic timeline date titles (#27351) --- .../discourse/app/components/topic-timeline/container.hbs | 2 +- .../discourse/app/components/topic-timeline/container.js | 1 + .../javascripts/discourse/app/helpers/age-with-tooltip.js | 1 + app/assets/javascripts/discourse/app/lib/formatter.js | 4 +++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/topic-timeline/container.hbs b/app/assets/javascripts/discourse/app/components/topic-timeline/container.hbs index f1a2c5bf7b2..0e7be9bd5c3 100644 --- a/app/assets/javascripts/discourse/app/components/topic-timeline/container.hbs +++ b/app/assets/javascripts/discourse/app/components/topic-timeline/container.hbs @@ -74,7 +74,7 @@ {{this.startDate}} diff --git a/app/assets/javascripts/discourse/app/components/topic-timeline/container.js b/app/assets/javascripts/discourse/app/components/topic-timeline/container.js index ccca528ebb1..d06273d5eb9 100644 --- a/app/assets/javascripts/discourse/app/components/topic-timeline/container.js +++ b/app/assets/javascripts/discourse/app/components/topic-timeline/container.js @@ -193,6 +193,7 @@ export default class TopicTimelineScrollArea extends Component { get nowDateOptions() { return { + customTitle: I18n.t("topic_entrance.sr_jump_bottom_button"), addAgo: true, defaultFormat: timelineDate, }; diff --git a/app/assets/javascripts/discourse/app/helpers/age-with-tooltip.js b/app/assets/javascripts/discourse/app/helpers/age-with-tooltip.js index 9623cc0e38d..110aaf25b90 100644 --- a/app/assets/javascripts/discourse/app/helpers/age-with-tooltip.js +++ b/app/assets/javascripts/discourse/app/helpers/age-with-tooltip.js @@ -7,6 +7,7 @@ registerRawHelper("age-with-tooltip", ageWithTooltip); export default function ageWithTooltip(dt, params = {}) { return htmlSafe( autoUpdatingRelativeAge(new Date(dt), { + customTitle: params.customTitle, title: true, addAgo: params.addAgo || false, ...(params.defaultFormat && { defaultFormat: params.defaultFormat }), diff --git a/app/assets/javascripts/discourse/app/lib/formatter.js b/app/assets/javascripts/discourse/app/lib/formatter.js index 76ba4a84085..aecb943c192 100644 --- a/app/assets/javascripts/discourse/app/lib/formatter.js +++ b/app/assets/javascripts/discourse/app/lib/formatter.js @@ -98,7 +98,9 @@ export function autoUpdatingRelativeAge(date, options) { append += " with-year"; } - if (options.title) { + if (options.customTitle) { + append += "' title='" + options.customTitle; + } else if (options.title) { append += "' title='" + longDate(date); }