From ce07dce8f4e666f9293da3b9358a91765512f043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Wed, 9 Mar 2022 15:09:52 +0100
Subject: [PATCH] Fix some js errors

---
 .../ep_products/Classes/Controller/MapController.php |  2 +-
 .../Private/Assets/js/controllers/osm_controller.js  |  4 ++--
 .../Resources/Private/Partials/Mobilenav.html        |  9 ++++++---
 .../Resources/Private/Templates/Map/General.html     | 12 +++++++-----
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/public/typo3conf/ext/ep_products/Classes/Controller/MapController.php b/public/typo3conf/ext/ep_products/Classes/Controller/MapController.php
index f570a1fa..612f6f77 100644
--- a/public/typo3conf/ext/ep_products/Classes/Controller/MapController.php
+++ b/public/typo3conf/ext/ep_products/Classes/Controller/MapController.php
@@ -94,7 +94,7 @@ class MapController extends ActionController
                     'name' => $product->getName(),
                     'uri' => $this->getUriForPageUid($product->getDetailPage()),
                     'externalLink' => $hotel->getExternalLink(),
-                    'teaser' => $product->getTeaser(),
+                    'teaser' => preg_replace("/[\r\n\t]/", "", $product->getTeaser()),
                     'lat' => $hotel->getLatitude(),
                     'lng' => $hotel->getLongitude(),
                 ];
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/osm_controller.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/osm_controller.js
index 5c4cd4b1..fd36532d 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/osm_controller.js
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/osm_controller.js
@@ -33,7 +33,7 @@ export default class extends Controller {
             this.map.setView(position)
         } else if (this.hasMarkersValue && this.markersValue.length) {
             const bounds = L.latLngBounds()
-            for (let item of this.markers) {
+            for (let item of this.markersValue) {
                 const position = L.latLng(item.lat, item.lng)
                 const marker = L.marker(position)
                 if (item.externalLink) {
@@ -41,7 +41,7 @@ export default class extends Controller {
                         window.open(item.externalLink, '_blank')
                     })
                 } else {
-                    const popupContent = '<div><strong>' + item.name + '</strong><br>' + item.teaser +
+                    const popupContent = '<div data-rte-content=""><strong>' + item.name + '</strong><br>' + item.teaser +
                         '<br><a href="' + item.uri + '">zu den Details</a></div>'
                     marker.bindPopup(popupContent)
                 }
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mobilenav.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mobilenav.html
index 79032393..e327c194 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mobilenav.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mobilenav.html
@@ -49,7 +49,7 @@
                                     <span>
                                         {topitem.title}
                                     </span>
-                                    <svg class="h-6 w-6 transform text-white" data-collapse-target="icon">
+                                    <svg class="h-6 w-6 transform text-white">
                                         <f:if condition="{topitem.active}">
                                             <f:then>
                                                 <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-chevron-down"></use>
@@ -123,8 +123,11 @@
         <ul class="m-0 px-4 divide-y divide-ep-primary-50 bg-gray-700">
             <f:for each="{mobilenav}" as="subitem">
                 <li class="py-2"
-                    data-controller="collapse"
-                    data-collapse-collapsed-value="true">
+                    <f:if condition="{subitem.children}">
+                        data-controller="collapse"
+                        data-collapse-collapsed-value="true"
+                    </f:if>
+                    >
                     <div class="flex items-center justify-between">
                         <a href="{subitemlink}"
                            class="uppercase text-xl text-white hover:text-white focus:text-white"
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Map/General.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Map/General.html
index 29586631..96eaa40b 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Map/General.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Map/General.html
@@ -5,11 +5,13 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <ep:container data="{data}">
-            <div class="w-full aspect-w-16 aspect-h-9 mb-8"
-                 data-controller="osm"
-                 data-osm-markers-value='{markerData -> f:format.raw()}'></div>
-        </ep:container>
+        <f:if condition="{markerData}">
+            <ep:container data="{data}">
+                <div class="w-full aspect-w-16 aspect-h-9 mb-8"
+                     data-controller="osm"
+                     data-osm-markers-value='{markerData -> f:format.raw()}'></div>
+            </ep:container>
+        </f:if>
     </f:section>
 
 </html>