Merge branch 'master' into issue/CIF-2279

adobe · Aug 23, 2021 · e4231fc · e4231fc
2 parents e040551 + 99972f6
commit e4231fc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/.../ui.apps/src/main/content/jcr_root/apps/cif-components-examples/components/page/head.html b/.../ui.apps/src/main/content/jcr_root/apps/cif-components-examples/components/page/head.html
@@ -20,7 +20,7 @@
     data-sly-use.metadata="com.adobe.cq.commerce.core.components.models.page.PageMetadata"
 >
     <meta charset="UTF-8" />
-    <title>${metadata.metaTitle}</title>
+    <title>${metadata.metaTitle}${page.brandSlug ? ' | ' : ''}${page.brandSlug}</title>
     <meta data-sly-test.keywords="${metadata.metaKeywords}" name="keywords" content="${keywords}" />
     <meta data-sly-test.description="${metadata.metaDescription}" name="description" content="${description}" />
     <meta data-sly-test.templateName="${page.templateName}" name="template" content="${templateName}" />

diff --git a/...components/commerce/contentfragment/v1/contentfragment/clientlibs/editor/js/editDialog.js b/...components/commerce/contentfragment/v1/contentfragment/clientlibs/editor/js/editDialog.js
@@ -144,9 +144,6 @@
             this.linkElements.items.clear();
             this.linkElements.value = null;
         }
-
-        let a = null;
-        // alert(a.b);
     };
 
     /**

diff --git a/ui.apps/src/main/content/jcr_root/apps/core/cif/components/structure/page/v1/page/head.html b/ui.apps/src/main/content/jcr_root/apps/core/cif/components/structure/page/v1/page/head.html
@@ -20,7 +20,7 @@
     data-sly-use.metadata="com.adobe.cq.commerce.core.components.models.page.PageMetadata"
 >
     <meta charset="UTF-8" />
-    <title>${metadata.metaTitle}</title>
+    <title>${metadata.metaTitle}${page.brandSlug ? ' | ' : ''}${page.brandSlug}</title>
     <meta data-sly-test.keywords="${metadata.metaKeywords}" name="keywords" content="${keywords}" />
     <meta data-sly-test.description="${metadata.metaDescription}" name="description" content="${description}" />
     <meta data-sly-test.templateName="${page.templateName}" name="template" content="${templateName}" />