From c06013234d16ab3889bd7fce09f6606b45fd2b9f Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Thu, 01 Jan 2026 23:38:14 +0000
Subject: [PATCH] Merge branch 'main' of https://github.com/jakevdwerf/jvb
---
assets/js/concise/UtilityFunctions.js | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/assets/js/concise/UtilityFunctions.js b/assets/js/concise/UtilityFunctions.js
index 4a7b85b..fe2f543 100644
--- a/assets/js/concise/UtilityFunctions.js
+++ b/assets/js/concise/UtilityFunctions.js
@@ -25,7 +25,7 @@
* @param {string|Date} dateStr Date to format
* @returns {string} Formatted time string
*/
-window.formatTimeAgo = function(dateStr) {
+window.formatTimeAgo = function(dateStr, dateFormat = 'default') {
const date = dateStr instanceof Date ? dateStr : new Date(dateStr);
const now = new Date();
const diffMs = date - now;
@@ -57,14 +57,43 @@
timeStr = `${minutes} ${minutes === 1 ? 'minute' : 'minutes'}`;
} else {
// Hours
- timeStr = `${hours} ${hours === 1 ? 'hour' : 'hours'}`;
+ timeStr = `about ${hours} ${hours === 1 ? 'hour' : 'hours'}`;
}
} else if (days < 7) {
+ if (days === 1) {
+ return isPast ? 'yesterday' : 'tomorrow';
+ }
+ timeStr = `about ${days} days`;
// Days
timeStr = `${days} ${days === 1 ? 'day' : 'days'}`;
} else {
- // More than a week - just show the date
- return date.toLocaleDateString();
+ // More than a week - show the date based on format
+ if (dateFormat === 'default') {
+ return date.toLocaleDateString();
+ }
+
+ // Parse PHP-style format string
+ const formatMap = {
+ 'Y': date.getFullYear(),
+ 'y': String(date.getFullYear()).slice(-2),
+ 'F': date.toLocaleDateString('en-CA', { month: 'long' }),
+ 'M': date.toLocaleDateString('en-CA', { month: 'short' }),
+ 'm': String(date.getMonth() + 1).padStart(2, '0'),
+ 'n': date.getMonth() + 1,
+ 'd': String(date.getDate()).padStart(2, '0'),
+ 'j': date.getDate(),
+ 'D': date.toLocaleDateString('en-CA', { weekday: 'short' }),
+ 'l': date.toLocaleDateString('en-CA', { weekday: 'long' }),
+ 'H': String(date.getHours()).padStart(2, '0'),
+ 'i': String(date.getMinutes()).padStart(2, '0'),
+ 's': String(date.getSeconds()).padStart(2, '0'),
+ 'h': String(date.getHours() % 12 || 12).padStart(2, '0'),
+ 'g': date.getHours() % 12 || 12,
+ 'A': date.getHours() >= 12 ? 'PM' : 'AM',
+ 'a': date.getHours() >= 12 ? 'pm' : 'am',
+ };
+
+ return dateFormat.replace(/[YyFMmnjDlHishgAa]/g, match => formatMap[match]);
}
// Add appropriate prefix/suffix based on past or future
--
Gitblit v1.10.0