Merge pull request #6 from maze-consulting/feature/KSCU-39_extract-em…

…ails-forms KSCU-39, KSCU-40, KSCU-11, KSCU-10, KSCU-4, KSCU-3: clean-up & condit…
klaviyo · Mar 30, 2023 · 734f662 · 734f662
2 parents b3aafd5 + 8ae4b80
commit 734f662
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/cartridges/int_klaviyo/cartridge/templates/default/klaviyo/klaviyoFooter.isml b/cartridges/int_klaviyo/cartridge/templates/default/klaviyo/klaviyoFooter.isml
@@ -27,7 +27,7 @@
     <isif condition="${pdict.klid}">
         <isinclude template="klaviyo/klaviyoID" />
     </isif>
-    <isif condition="${dw.system.Site.getCurrent().getCustomPreferenceValue('klaviyo_email_selectors')}">
+    <isif condition="${dw.system.Site.getCurrent().getCustomPreferenceValue('klaviyo_email_selectors') && !empty(dw.system.Site.getCurrent().getCustomPreferenceValue('klaviyo_email_selectors'))}">
         <isinclude template="klaviyo/klaviyoListeners" />
     </isif>
 </isif>
diff --git a/cartridges/int_klaviyo_core/cartridge/templates/default/klaviyo/klaviyoListeners.isml b/cartridges/int_klaviyo_core/cartridge/templates/default/klaviyo/klaviyoListeners.isml
@@ -1,5 +1,5 @@
 <iscomment>
-    The JS in this template captures the selectors set in Business Manager and applies klaviyo to the correspondingiing input fields
+    The JS in this template captures the selectors set in Business Manager and applies klaviyo listeners to the corresponding input fields
     so users can be identified when filling out either phone number or email fields within any part of the site. This template is included in
     klaviyoFooter.isml within both SFRA & SiteGen.
 </iscomment>

diff --git a/cartridges/int_klaviyo_sfra/cartridge/templates/default/klaviyo/klaviyoFooter.isml b/cartridges/int_klaviyo_sfra/cartridge/templates/default/klaviyo/klaviyoFooter.isml
@@ -33,7 +33,7 @@ FOOBAR
     <isif condition="${pdict.klid}">
         <isinclude template="klaviyo/klaviyoID" />
     </isif>
-    <isif condition="${dw.system.Site.getCurrent().getCustomPreferenceValue('klaviyo_email_selectors')}">
+    <isif condition="${dw.system.Site.getCurrent().getCustomPreferenceValue('klaviyo_email_selectors') && !empty(dw.system.Site.getCurrent().getCustomPreferenceValue('klaviyo_email_selectors'))}">
         <isinclude template="klaviyo/klaviyoListeners" />
     </isif>
 </isif>
diff --git a/site_template/common/meta/custom-preference_KSCU-39.xml b/site_template/common/meta/custom-preference_KSCU-39.xml
@@ -44,7 +44,6 @@
                 <type>set-of-string</type>
                 <mandatory-flag>false</mandatory-flag>
                 <externally-managed-flag>false</externally-managed-flag>
-                <default-value>large</default-value>
             </attribute-definition>
 
         </custom-attribute-definitions>