Update: Remove checl if cookie punch is installed and add settings fo…

…r slipstream
CarbonPackages · Feb 7, 2024 · 0304374 · 0304374
1 parent 7a96a61
commit 0304374
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/Configuration/Settings.GeoMap.yaml b/Configuration/Settings.GeoMap.yaml
@@ -2,3 +2,7 @@ Carbon:
   GeoMap:
     defaultCountry: CH # ISO-Code from country
     defaultPinColor: '#009fe3' # Hex-Color
+    slipstream:
+      css: true
+      js: true
+      mjs: true
diff --git a/Resources/Private/Fusion/Presentation/Map.fusion b/Resources/Private/Fusion/Presentation/Map.fusion
@@ -13,29 +13,36 @@ prototype(Carbon.GeoMap:Presentation.Map) < prototype(Neos.Fusion:Component) {
 
     coordinates = null
 
-    // https://github.com/sandstorm/Sandstorm.CookiePunch is installed
-    _sandstormCookiePunchIsInstalled = ${Configuration.setting('Neos.Neos.fusion.autoInclude')['Sandstorm.CookiePunch']}
-    dataNeverBlock = ${!!this._sandstormCookiePunchIsInstalled}
     center = ${Carbon.Array.check(this.coordinates) ? Carbon.GeoMap.centerFromCoordinates(this.coordinates) : null}
+    slipstream = Neos.Fusion:DataStructure {
+        css = ${Configuration.setting('Carbon.GeoMap.slipstream.css')}
+        js = ${Configuration.setting('Carbon.GeoMap.slipstream.js')}
+        mjs = ${Configuration.setting('Carbon.GeoMap.slipstream.mjs')}
+    }
 
     renderer = afx`
         <div
             class={Carbon.String.merge("carbon-geomap", props.class, props.additionalClass)}
             data-center={Json.stringify(props.center)}
             data-zoom={props.zoom}
         >
-            <link @if.set={props.css} rel="stylesheet" href={props.css} data-slipstream />
+            <link
+                @if.set={props.css}
+                rel="stylesheet"
+                href={props.css}
+                data-slipstream={props.slipstream.css}
+            />
             <script
                 @if.set={props.js}
                 src={props.js}
-                data-never-block={props.dataNeverBlock}
-                data-slipstream defer
+                data-slipstream={props.slipstream.js}
+                defer
             ></script>
             <script
                 @if.set={props.mjs}
                 src={props.mjs}
-                data-never-block={props.dataNeverBlock}
-                data-slipstream defer
+                data-slipstream={props.slipstream.mjs}
+                defer
                 type="module"
             ></script>
             <div