From 25309db2b336b77ad3e28494af01a04194fe6d1f Mon Sep 17 00:00:00 2001 From: Tony Air Date: Wed, 3 Jul 2024 15:24:11 +0200 Subject: [PATCH] IMPR: Minor fixtures --- app/client/src/js/_graphql.js | 9 ++++++++- app/src/Pages/PageController.php | 2 ++ app/templates/Includes/LoadingSpinner.ss | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/client/src/js/_graphql.js b/app/client/src/js/_graphql.js index cfc0859..44b562d 100644 --- a/app/client/src/js/_graphql.js +++ b/app/client/src/js/_graphql.js @@ -11,7 +11,7 @@ window.addEventListener('prefetch-loaded', () => { const MainContentContainer = document.getElementById('MainContent') const MainContent = document.createElement('div') - if (!MainContentContainer.dataset['legacy']) { + if (!MainContentContainer.dataset.legacy) { MainContent.classList.add('page--container') MainContentContainer.append(MainContent) @@ -30,5 +30,12 @@ window.addEventListener('prefetch-loaded', () => { }) } } + + document.querySelectorAll('a.legacy').forEach((el) => { + el.addEventListener('click', (e) => { + window.location = e.currentTarget.getAttribute('href') + }) + }) + window.initAjaxOnce = true }) diff --git a/app/src/Pages/PageController.php b/app/src/Pages/PageController.php index e258d9c..629479d 100644 --- a/app/src/Pages/PageController.php +++ b/app/src/Pages/PageController.php @@ -4,6 +4,7 @@ // extends global PageController class //namespace App\Pages; +use A2nt\CMSNiceties\Ajax\Ex\AjaxControllerEx; use SilverStripe\Control\Middleware\HTTPCacheControlMiddleware; use A2nt\CMSNiceties\Ajax\Ex\AjaxControllerEx; use SilverStripe\CMS\Controllers\ContentController; @@ -12,6 +13,7 @@ use SilverStripe\Control\Controller; use SilverStripe\Control\Director; use SilverStripe\View\SSViewer; use A2nt\CMSNiceties\Templates\DeferredRequirements; +use SilverStripe\Control\Middleware\HTTPCacheControlMiddleware; /** * Class \PageController diff --git a/app/templates/Includes/LoadingSpinner.ss b/app/templates/Includes/LoadingSpinner.ss index 528218c..6c2ba60 100644 --- a/app/templates/Includes/LoadingSpinner.ss +++ b/app/templates/Includes/LoadingSpinner.ss @@ -11,6 +11,7 @@ .breadcrumb{list-style:none} .breadcrumb-item{display:inline-block} .d-none{display:none!important} + .visually-hidden,.visually-hidden-focusable:not(:focus):not(:focus-within){height:1px!important;margin:-1px!important;overflow:hidden!important;padding:0!important;width:1px!important;clip:rect(0,0,0,0)!important;border:0!important;white-space:nowrap!important} <%-- always show scroll bar --%> html {overflow-y:scroll} .meta-MetaWindow-overlay{display:none}