diff options
Diffstat (limited to 'app/javascript/packs')
-rw-r--r-- | app/javascript/packs/admin.jsx (renamed from app/javascript/packs/admin.js) | 0 | ||||
-rw-r--r-- | app/javascript/packs/public-path.js | 2 | ||||
-rw-r--r-- | app/javascript/packs/public.jsx (renamed from app/javascript/packs/public.js) | 9 | ||||
-rw-r--r-- | app/javascript/packs/share.jsx (renamed from app/javascript/packs/share.js) | 0 |
4 files changed, 6 insertions, 5 deletions
diff --git a/app/javascript/packs/admin.js b/app/javascript/packs/admin.jsx index 599015000..599015000 100644 --- a/app/javascript/packs/admin.js +++ b/app/javascript/packs/admin.jsx diff --git a/app/javascript/packs/public-path.js b/app/javascript/packs/public-path.js index f96109f4f..f4d166a77 100644 --- a/app/javascript/packs/public-path.js +++ b/app/javascript/packs/public-path.js @@ -17,5 +17,5 @@ function formatPublicPath(host = '', path = '') { const cdnHost = document.querySelector('meta[name=cdn-host]'); -// eslint-disable-next-line camelcase, no-undef, no-unused-vars +// eslint-disable-next-line no-undef __webpack_public_path__ = formatPublicPath(cdnHost ? cdnHost.content : '', process.env.PUBLIC_OUTPUT_PATH); diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.jsx index 8017734d5..ad6bf237f 100644 --- a/app/javascript/packs/public.js +++ b/app/javascript/packs/public.jsx @@ -100,11 +100,12 @@ function main() { const datetime = new Date(content.getAttribute('datetime')); const now = new Date(); - content.title = dateTimeFormat.format(datetime); + const timeGiven = content.getAttribute('datetime').includes('T'); + content.title = timeGiven ? dateTimeFormat.format(datetime) : dateFormat.format(datetime); content.textContent = timeAgoString({ formatMessage: ({ id, defaultMessage }, values) => (new IntlMessageFormat(messages[id] || defaultMessage, locale)).format(values), formatDate: (date, options) => (new Intl.DateTimeFormat(locale, options)).format(date), - }, datetime, now, now.getFullYear(), content.getAttribute('datetime').includes('T')); + }, datetime, now, now.getFullYear(), timeGiven); }); const reactComponents = document.querySelectorAll('[data-component]'); @@ -188,10 +189,10 @@ function main() { if (sidebar.classList.contains('visible')) { document.body.style.overflow = null; - toggleButton.setAttribute('aria-expanded', false); + toggleButton.setAttribute('aria-expanded', 'false'); } else { document.body.style.overflow = 'hidden'; - toggleButton.setAttribute('aria-expanded', true); + toggleButton.setAttribute('aria-expanded', 'true'); } toggleButton.classList.toggle('active'); diff --git a/app/javascript/packs/share.js b/app/javascript/packs/share.jsx index 1225d7b52..1225d7b52 100644 --- a/app/javascript/packs/share.js +++ b/app/javascript/packs/share.jsx |