Merge pull request #70 from slub/use-f-spaceless

Use f:spaceless instead of own trim-ViewHelper
slub · Jun 30, 2021 · ece0476 · ece0476
2 parents 0fc6326 + 06c8c04
commit ece0476
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 81 deletions.
diff --git a/Classes/ViewHelpers/Format/TrimViewHelper.php b/Classes/ViewHelpers/Format/TrimViewHelper.php
diff --git a/Resources/Private/Partials/Event/Item.html b/Resources/Private/Partials/Event/Item.html
@@ -15,10 +15,10 @@ <h4>
 		</f:if>
 	</h4>
 
-	<strong><se:format.trim><f:render partial="Event/DateFromTo" arguments="{event : event}"/></se:format.trim></strong>,
-	<se:format.trim>
+	<strong><f:spaceless><f:render partial="Event/DateFromTo" arguments="{event : event}"/></f:spaceless></strong>,
+	<f:spaceless>
 		<f:render partial="Location/Link" arguments="{location: event.location, doLink: 'false', onlyParent: 'true'}" />
-	</se:format.trim>, {event.contact.name}
+	</f:spaceless>, {event.contact.name}
 
 	<div class="clear"></div>
 	<div class="teaser">

diff --git a/Resources/Private/Partials/Location/Link.html b/Resources/Private/Partials/Location/Link.html
@@ -1,5 +1,6 @@
 {namespace se=Slub\SlubEvents\ViewHelpers}
 <f:section name="locationLink">
+    <f:debug>{_all}</f:debug>
 	<f:if condition="{doLink}">
 		<f:then>
 		<f:if condition="{location.link}">
@@ -35,7 +36,7 @@
 	<f:then>
 		<f:for each="{location.parent}" as="parentLocation" iteration="i">
 			<f:if condition='{i.isFirst}'>
-				<se:format.trim><f:render section="locationLink" arguments="{location: parentLocation, doLink: doLink}" /></se:format.trim><f:if condition="{onlyParent}"><f:else>,</f:else></f:if>
+				<f:spaceless><f:render section="locationLink" arguments="{location: parentLocation, doLink: doLink}" /></f:spaceless><f:if condition="{onlyParent}"><f:else>,</f:else></f:if>
 			</f:if>
 		</f:for>
 		<f:if condition="{onlyParent}">

diff --git a/Resources/Private/Templates/Event/Show.html b/Resources/Private/Templates/Event/Show.html
@@ -7,10 +7,10 @@
 		<f:if condition="{event}">
 			<f:then>
 				<h3>{event.title}</h3>
-				<strong><se:format.trim><f:render partial="Event/DateFromTo" arguments="{event : event}" /></se:format.trim></strong>,
-				<se:format.trim>
+				<strong><f:spaceless><f:render partial="Event/DateFromTo" arguments="{event : event}" /></f:spaceless></strong>,
+				<f:spaceless>
 					<f:render partial="Location/Link" arguments="{location: event.location, doLink: 'false', onlyParent: 'true'}" />
-				</se:format.trim>, {event.contact.name}
+				</f:spaceless>, {event.contact.name}
 
 				<f:format.html>{event.description}</f:format.html>
 

diff --git a/Resources/Private/Templates/Subscriber/New.html b/Resources/Private/Templates/Subscriber/New.html
@@ -1,4 +1,3 @@
-{namespace se=Slub\SlubEvents\ViewHelpers}
 <f:layout name="Default" />
 
 <f:section name="main">
@@ -14,7 +13,7 @@ <h4><f:translate key="tx_slubevents_domain_model_event.individual_appointment" /
 			<h4><f:translate key="tx_slubevents_domain_model_event" />: {event.title}</h4>
 		</f:else>
 	</f:if>
-	<strong><se:format.trim><f:render partial="Event/DateFromTo" arguments="{event : event}" /></se:format.trim></strong>
+	<strong><f:spaceless><f:render partial="Event/DateFromTo" arguments="{event : event}" /></f:spaceless></strong>
 
 	<div class="location">
 		<f:translate key="tx_slubevents_domain_model_location" />: