diff --git a/app/_config.php b/app/_config.php index f90dc10..4994813 100644 --- a/app/_config.php +++ b/app/_config.php @@ -26,12 +26,13 @@ $cfg->setOption( 'h2[class|style|id],h3[class|style|id],h4[class|style|id],h5[class|style|id],h6[class|style|id],'. 'address[class|style|id],pre[class|style|id],hr,'. 'a[href|rel|title|target|class|style|id],'. - 'table[class|style|id],ul[class|style|id],ol[start|type|class|style|id],li[class|style|id],'. + 'table[class|style|id],tr,td,thead,tbody,th,'. + 'ul[class|style|id],ol[start|type|class|style|id],li[class|style|id],'. 'img[class|style|id|src|alt|title|hspace|vspace|width|height|align|name|usemap|data*],' . 'iframe[class|style|id|src|name|width|height|align|frameborder|marginwidth|marginheight|scrolling],' . 'object[class|style|id|width|height|data|type],' . 'embed[class|style|id|src|type|pluginspage|width|height|autoplay],' . 'param[class|style|id|name|value],' . 'map[class|style|id|name|id],' . - 'area[class|style|id|shape|coords|href|target|alt]' + 'area[class|style|id|shape|coords|href|target|alt]', ); diff --git a/app/client/src/js/_graphql.js b/app/client/src/js/_graphql.js index 44b562d..c861428 100644 --- a/app/client/src/js/_graphql.js +++ b/app/client/src/js/_graphql.js @@ -1,3 +1,5 @@ +/* eslint-disable global-require */ + import '@a2nt/mithril-ui/src/js/ui' import Events from '@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/js/_events' diff --git a/app/client/src/js/layout/index.js b/app/client/src/js/layout/index.js index 81329d7..40998ec 100644 --- a/app/client/src/js/layout/index.js +++ b/app/client/src/js/layout/index.js @@ -7,15 +7,15 @@ const LayoutUI = ((W) => { const D = document; const initFonts = () => { - console.log(`${NAME}: initFonts`); + console.log(`${NAME}: initFonts`) - const css = D.createElement('link'); - css.rel = 'stylesheet'; - css.type = 'text/css'; - css.media = 'all'; + const css = D.createElement('link') + css.rel = 'stylesheet' + css.type = 'text/css' + css.media = 'all' css.href = - 'https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,400;0,700;1,400&display=swap'; - D.getElementsByTagName('head')[0].appendChild(css); + 'https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,400;0,700;1,400&display=swap' + D.getElementsByTagName('head')[0].appendChild(css) }; const initAnalytics = () => { @@ -45,8 +45,15 @@ const LayoutUI = ((W) => { }; W.addEventListener(`${Events.LODEDANDREADY}`, () => { - initFonts(); - initAnalytics(); - }); -})(window); + initFonts() + initAnalytics() + const mainLegacy = document.querySelector('#MainContent[data-legacy="true"]') + if (mainLegacy) { + const spinner = document.getElementById('PageLoading'); + if (spinner) { + spinner.classList.add('d-none'); + } + } + }) +})(window) export default LayoutUI; diff --git a/app/src/Pages/PageController.php b/app/src/Pages/PageController.php index 629479d..0ed4466 100644 --- a/app/src/Pages/PageController.php +++ b/app/src/Pages/PageController.php @@ -6,14 +6,12 @@ use A2nt\CMSNiceties\Ajax\Ex\AjaxControllerEx; use SilverStripe\Control\Middleware\HTTPCacheControlMiddleware; -use A2nt\CMSNiceties\Ajax\Ex\AjaxControllerEx; use SilverStripe\CMS\Controllers\ContentController; use SilverStripe\CMS\Model\SiteTree; use SilverStripe\Control\Controller; use SilverStripe\Control\Director; use SilverStripe\View\SSViewer; use A2nt\CMSNiceties\Templates\DeferredRequirements; -use SilverStripe\Control\Middleware\HTTPCacheControlMiddleware; /** * Class \PageController