Merge branch 'master' into CIF-1462

adobe · Feb 11, 2021 · 082d1e2 · 082d1e2
2 parents f38b015 + 8f83768
commit 082d1e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...t/apps/core/cif/components/commerce/experiencefragment/v1/experiencefragment/.content.xml b/...t/apps/core/cif/components/commerce/experiencefragment/v1/experiencefragment/.content.xml
@@ -2,5 +2,5 @@
 <jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
     cq:icon="experience"
     jcr:primaryType="cq:Component"
-    jcr:title="Commerce Experience Fragment"
+    jcr:title="Commerce Experience Fragment Placeholder"
     componentGroup=".hidden"/>
diff --git a/.../cif/components/commerce/experiencefragment/v1/experiencefragment/experiencefragment.html b/.../cif/components/commerce/experiencefragment/v1/experiencefragment/experiencefragment.html
@@ -20,4 +20,6 @@
      id="${component.id}"
      class="cmp-experiencefragment cmp-experiencefragment--${fragment.name}">
 </div>
-<sly data-sly-call="${template.placeholder @ isEmpty = !xf}" />
+<sly data-sly-test.hasFragmentLocation="${properties.fragmentLocation}" data-sly-set.emptyText="${'Configured to display related Experience Fragments for \'{0}\' placeholder location.' @format=properties.fragmentLocation}" />
+<sly data-sly-call="${template.placeholder @ isEmpty = !xf && hasFragmentLocation, emptyTextAppend = emptyText}" />
+<sly data-sly-call="${template.placeholder @ isEmpty = !xf && !hasFragmentLocation}" />