tonyair/silverstripe-webpack
1
1
Fork 0
mirror of https://github.com/a2nt/silverstripe-webpack.git synced 2024-10-22 17:05:31 +02:00
Code Issues Projects Releases Wiki Activity

FIX: Minor

Browse Source
This commit is contained in:
Tony Air 2024-08-14 18:13:10 +02:00
parent ba1789b44d
commit 5f153685e6
4 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/_config.php
View File

@ -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],'. '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,'. 'address[class|style|id],pre[class|style|id],hr,'.
'a[href|rel|title|target|class|style|id],'. '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*],' . '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],' . 'iframe[class|style|id|src|name|width|height|align|frameborder|marginwidth|marginheight|scrolling],' .
'object[class|style|id|width|height|data|type],' . 'object[class|style|id|width|height|data|type],' .
'embed[class|style|id|src|type|pluginspage|width|height|autoplay],' . 'embed[class|style|id|src|type|pluginspage|width|height|autoplay],' .
'param[class|style|id|name|value],' . 'param[class|style|id|name|value],' .
'map[class|style|id|name|id],' . 'map[class|style|id|name|id],' .
'area[class|style|id|shape|coords|href|target|alt]' 'area[class|style|id|shape|coords|href|target|alt]',
); );

2
app/client/src/js/_graphql.js
View File

@ -1,3 +1,5 @@
/* eslint-disable global-require */
import '@a2nt/mithril-ui/src/js/ui' import '@a2nt/mithril-ui/src/js/ui'
import Events from '@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/js/_events' import Events from '@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/js/_events'

29
app/client/src/js/layout/index.js
View File

@ -7,15 +7,15 @@ const LayoutUI = ((W) => {
const D = document; const D = document;
const initFonts = () => { const initFonts = () => {
console.log(`${NAME}: initFonts`); console.log(`${NAME}: initFonts`)
const css = D.createElement('link'); const css = D.createElement('link')
css.rel = 'stylesheet'; css.rel = 'stylesheet'
css.type = 'text/css'; css.type = 'text/css'
css.media = 'all'; css.media = 'all'
css.href = css.href =
'https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,400;0,700;1,400&display=swap'; 'https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,400;0,700;1,400&display=swap'
D.getElementsByTagName('head')[0].appendChild(css); D.getElementsByTagName('head')[0].appendChild(css)
}; };
const initAnalytics = () => { const initAnalytics = () => {
@ -45,8 +45,15 @@ const LayoutUI = ((W) => {
}; };
W.addEventListener(`${Events.LODEDANDREADY}`, () => { W.addEventListener(`${Events.LODEDANDREADY}`, () => {
initFonts(); initFonts()
initAnalytics(); initAnalytics()
}); const mainLegacy = document.querySelector('#MainContent[data-legacy="true"]')
})(window); if (mainLegacy) {
const spinner = document.getElementById('PageLoading');
if (spinner) {
spinner.classList.add('d-none');
}
}
})
})(window)
export default LayoutUI; export default LayoutUI;

2
app/src/Pages/PageController.php
View File

@ -6,14 +6,12 @@
use A2nt\CMSNiceties\Ajax\Ex\AjaxControllerEx; use A2nt\CMSNiceties\Ajax\Ex\AjaxControllerEx;
use SilverStripe\Control\Middleware\HTTPCacheControlMiddleware; use SilverStripe\Control\Middleware\HTTPCacheControlMiddleware;
use A2nt\CMSNiceties\Ajax\Ex\AjaxControllerEx;
use SilverStripe\CMS\Controllers\ContentController; use SilverStripe\CMS\Controllers\ContentController;
use SilverStripe\CMS\Model\SiteTree; use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;
use SilverStripe\Control\Director; use SilverStripe\Control\Director;
use SilverStripe\View\SSViewer; use SilverStripe\View\SSViewer;
use A2nt\CMSNiceties\Templates\DeferredRequirements; use A2nt\CMSNiceties\Templates\DeferredRequirements;
use SilverStripe\Control\Middleware\HTTPCacheControlMiddleware;
/** /**
* Class \PageController * Class \PageController