From ade6d34a326085156e0d7d1570827cfedeacfa59 Mon Sep 17 00:00:00 2001 From: Jon Uhlmann Date: Tue, 15 Sep 2020 08:54:06 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Allow=20to=20set=20the=20order=20of?= =?UTF-8?q?=20the=20inclusion=20groups=20General=20/=20Backend=20/=20Live?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configuration/Settings.Carbon.yaml | 1 + Resources/Private/Fusion/Internal/Package.fusion | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Configuration/Settings.Carbon.yaml b/Configuration/Settings.Carbon.yaml index 7ee60c6..9231007 100644 --- a/Configuration/Settings.Carbon.yaml +++ b/Configuration/Settings.Carbon.yaml @@ -24,6 +24,7 @@ Carbon: DisableCacheBusterForPreloadAsset: true ConditionPrototype: null Wrapper: null + Order: 'General,Backend,Live' Path: Inline: CSS: 'Private/Templates/InlineAssets' diff --git a/Resources/Private/Fusion/Internal/Package.fusion b/Resources/Private/Fusion/Internal/Package.fusion index 763962a..3531bdf 100644 --- a/Resources/Private/Fusion/Internal/Package.fusion +++ b/Resources/Private/Fusion/Internal/Package.fusion @@ -28,7 +28,7 @@ prototype(Carbon.IncludeAssets:Internal.Package) < prototype(Neos.Fusion:Compone paths = ${props.mergedConfig.Path} wrapper = ${props.mergedConfig.Wrapper} collection = Neos.Fusion:Map { - items = ${['General', 'Backend', 'Live']} + items = ${String.split(props.mergedConfig.Order, ',')} itemRenderer = Neos.Fusion:Value { condition = ${item == 'General' || (item == 'Backend' && node.context.inBackend) || (item == 'Live' && node.context.live)} value = ${this.condition ? props.mergedConfig[item][props.location] : false}