From db407309e13daba612df389c37de4cbb156734d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Weber?= Date: Fri, 28 Feb 2025 07:57:01 +0100 Subject: [PATCH] topbar: avoid JS error on layouts without topbar eg. 404 pages --- assets/js/theme.js | 26 ++++++++++++++------------ layouts/partials/version.txt | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/assets/js/theme.js b/assets/js/theme.js index 33b4690cf4..dcd1ab92c9 100644 --- a/assets/js/theme.js +++ b/assets/js/theme.js @@ -1903,19 +1903,21 @@ ready(function () { moveTopbarButtons(); adjustEmptyTopbarContents(); } - var mqs = window.matchMedia('only screen and (max-width: 47.999rem)'); - mqs.addEventListener('change', onWidthChange.bind(null, setWidthS)); - var mqm = window.matchMedia('only screen and (min-width: 48rem) and (max-width: 59.999rem)'); - mqm.addEventListener('change', onWidthChange.bind(null, setWidthM)); - var mql = window.matchMedia('only screen and (min-width: 60rem)'); - mql.addEventListener('change', onWidthChange.bind(null, setWidthL)); + if (topbar) { + var mqs = window.matchMedia('only screen and (max-width: 47.999rem)'); + mqs.addEventListener('change', onWidthChange.bind(null, setWidthS)); + var mqm = window.matchMedia('only screen and (min-width: 48rem) and (max-width: 59.999rem)'); + mqm.addEventListener('change', onWidthChange.bind(null, setWidthM)); + var mql = window.matchMedia('only screen and (min-width: 60rem)'); + mql.addEventListener('change', onWidthChange.bind(null, setWidthL)); - addTopbarButtonInfos(); - setWidthS(mqs); - setWidthM(mqm); - setWidthL(mql); - moveTopbarButtons(); - adjustEmptyTopbarContents(); + addTopbarButtonInfos(); + setWidthS(mqs); + setWidthM(mqm); + setWidthL(mql); + moveTopbarButtons(); + adjustEmptyTopbarContents(); + } })(); (function () { diff --git a/layouts/partials/version.txt b/layouts/partials/version.txt index 46143a2eca..25265223af 100644 --- a/layouts/partials/version.txt +++ b/layouts/partials/version.txt @@ -1 +1 @@ -7.4.1+ec1b461d3886edd1383ec154518b970e72ca3f08 \ No newline at end of file +7.4.1+8f55271c7781cd53f9f3c9145035f2cbe0b4dfb5 \ No newline at end of file