From 588052ff0ddd6c399659f4545ef4525967a3a4e1 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 30 Oct 2024 22:27:28 +0100 Subject: [PATCH] DEV: Convert helpers to plain functions (#640) (`format-event-name` was unused) --- assets/javascripts/discourse/helpers/format-event-name.js | 4 ---- .../javascripts/discourse/helpers/format-future-date.js | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/assets/javascripts/discourse/helpers/format-event-name.js b/assets/javascripts/discourse/helpers/format-event-name.js index 1625890e..77d93b15 100644 --- a/assets/javascripts/discourse/helpers/format-event-name.js +++ b/assets/javascripts/discourse/helpers/format-event-name.js @@ -1,7 +1,3 @@ -import { htmlHelper } from "discourse-common/lib/helpers"; - export function formatEventName(event) { return event.name || event.post.topic.title; } - -export default htmlHelper((event) => formatEventName(event)); diff --git a/assets/javascripts/discourse/helpers/format-future-date.js b/assets/javascripts/discourse/helpers/format-future-date.js index efab43e1..59071752 100644 --- a/assets/javascripts/discourse/helpers/format-future-date.js +++ b/assets/javascripts/discourse/helpers/format-future-date.js @@ -1,8 +1,8 @@ -import { htmlHelper } from "discourse-common/lib/helpers"; +import { htmlSafe } from "@ember/template"; import guessDateFormat from "../lib/guess-best-date-format"; -export default htmlHelper((date) => { +export default function (date) { date = moment.utc(date).tz(moment.tz.guess()); const format = guessDateFormat(date); - return date.format(format); -}); + return htmlSafe(date.format(format)); +}