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

IMPR: minor

Browse Source
This commit is contained in:
Tony Air 2023-01-10 21:59:09 +02:00
parent cc43b7dca6
commit 4c3fb3cf73
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,7 +146,12 @@ class PageController extends ContentController
);
foreach ($elements as $element) {
$page = Page::get()->filter('ElementalAreaID', $element->getField('ParentID'))->first();
if (!is_a($element, \DNADesign\Elemental\Models\BaseElement::class)
&& !$element->hasMethod('getPage')) {
continue;
}
$page = $element->getPage();
if (! $page) {
continue;
}

2
webpack.config.js
View File

@ -164,7 +164,7 @@ minimizers.push(
reserved: ['$', 'jQuery', 'jquery'],
},
output: {
ecma: 5,
ecma: 6,
comments: false,
// Turned on because emoji and regex is not minified properly using default
// https://github.com/facebook/create-react-app/issues/2488