Skip to content

Commit 3619710

Browse files
committed
New: Add Carbon.IncludeAssets:MonocleAssets
1 parent a0bd3fd commit 3619710

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
prototype(Carbon.IncludeAssets:MonocleAssets) < prototype(Carbon.IncludeAssets:Internal.Assets) {
2+
prototype(Carbon.IncludeAssets:Case) {
3+
alwaysInclude = true
4+
}
5+
6+
prototype(Carbon.IncludeAssets:Internal.Package) {
7+
monocle = true
8+
}
9+
}

Resources/Private/Fusion/Internal/Package.fusion

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@ prototype(Carbon.IncludeAssets:Internal.Package) < prototype(Neos.Fusion:Compone
88
// The config for the package
99
config = Neos.Fusion:DataStructure
1010

11+
// Is this package rendererd in Monocle?
12+
monocle = false
13+
1114
// Internal property
1215
mergedConfig = ${Array.concat(Configuration.setting('Carbon.IncludeAssets.Default'), this.config)}
16+
sitePackageKey = ${this.monocle ? sitePackageKey : node.context.currentSite.siteResourcesPackageKey}
1317

1418
renderer = Neos.Fusion:Component {
1519
@if.hasCustomCondition = Neos.Fusion:Case {
@@ -22,15 +26,15 @@ prototype(Carbon.IncludeAssets:Internal.Package) < prototype(Neos.Fusion:Compone
2226
renderer = true
2327
}
2428
}
25-
assetPackage = ${props.mergedConfig.Package == 'SitePackage' ? node.context.currentSite.siteResourcesPackageKey : props.mergedConfig.Package}
29+
assetPackage = ${props.mergedConfig.Package == 'SitePackage' ? props.sitePackageKey : props.mergedConfig.Package}
2630
cacheBuster = ${props.mergedConfig.CacheBuster}
2731
disableCacheBusterForPreloadAsset = ${props.mergedConfig.DisableCacheBusterForPreloadAsset}
2832
paths = ${props.mergedConfig.Path}
2933
wrapper = ${props.mergedConfig.Wrapper}
3034
collection = Neos.Fusion:Map {
3135
items = ${String.split(props.mergedConfig.Order, ',')}
3236
itemRenderer = Neos.Fusion:Value {
33-
condition = ${item == 'General' || (item == 'Backend' && node.context.inBackend) || (item == 'Live' && node.context.live)}
37+
condition = ${props.monocle ? item != 'Backend' : (item == 'General' || (item == 'Backend' && node.context.inBackend) || (item == 'Live' && node.context.live))}
3438
value = ${this.condition ? props.mergedConfig[item][props.location] : false}
3539
@process.convertToArray = ${Type.isString(value) ? String.split(value, ',') : value}
3640
}

0 commit comments

Comments
 (0)