Merge branch 'main' into disable-featured-image-by-style

adobe · Feb 29, 2024 · 2efb0f5 · 2efb0f5
2 parents d77e070 + e333b37
commit 2efb0f5
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 12 deletions.
diff --git a/..._root/apps/core/wcm/components/form/container/v1/container/_cq_design_dialog/.content.xml b/..._root/apps/core/wcm/components/form/container/v1/container/_cq_design_dialog/.content.xml
@@ -56,7 +56,6 @@
                             <columns
                                 jcr:primaryType="nt:unstructured"
                                 sling:resourceType="granite/ui/components/coral/foundation/form/numberfield"
-                                defaultValue=""
                                 fieldDescription="Number of columns in the grid"
                                 fieldLabel="Columns"
                                 min="1"

diff --git a/..._root/apps/core/wcm/components/form/container/v2/container/_cq_design_dialog/.content.xml b/..._root/apps/core/wcm/components/form/container/v2/container/_cq_design_dialog/.content.xml
@@ -74,7 +74,6 @@
                             <columns
                                 jcr:primaryType="nt:unstructured"
                                 sling:resourceType="granite/ui/components/coral/foundation/form/numberfield"
-                                defaultValue=""
                                 fieldDescription="Number of columns in the grid"
                                 fieldLabel="Columns"
                                 min="1"

diff --git a/...c/content/jcr_root/apps/core/wcm/components/image/v1/image/_cq_design_dialog/.content.xml b/...c/content/jcr_root/apps/core/wcm/components/image/v1/image/_cq_design_dialog/.content.xml
@@ -33,7 +33,6 @@
                                         <field
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="granite/ui/components/coral/foundation/form/numberfield"
-                                            defaultValue="{Long}1280"
                                             min="{Long}0"
                                             name="./allowedRenditionWidths"
                                             required="{Boolean}true"/>
@@ -47,8 +46,7 @@
                                         typeHint="Long"
                                         required="{Boolean}true"
                                         min="{Long}0"
-                                        max="{Long}100"
-                                        defaultValue="{Long}82" />
+                                        max="{Long}100"/>
                                     <disableLazyLoading
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"

diff --git a/...c/content/jcr_root/apps/core/wcm/components/image/v2/image/_cq_design_dialog/.content.xml b/...c/content/jcr_root/apps/core/wcm/components/image/v2/image/_cq_design_dialog/.content.xml
@@ -138,7 +138,6 @@
                                         <field
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="granite/ui/components/coral/foundation/form/numberfield"
-                                            defaultValue="{Long}1280"
                                             min="{Long}0"
                                             name="./allowedRenditionWidths"
                                             required="{Boolean}true"/>
@@ -152,8 +151,7 @@
                                         typeHint="Long"
                                         required="{Boolean}true"
                                         min="{Long}0"
-                                        max="{Long}100"
-                                        defaultValue="{Long}82" />
+                                        max="{Long}100"/>
                                 </items>
                             </content>
                         </items>

diff --git a/...c/content/jcr_root/apps/core/wcm/components/image/v3/image/_cq_design_dialog/.content.xml b/...c/content/jcr_root/apps/core/wcm/components/image/v3/image/_cq_design_dialog/.content.xml
@@ -128,7 +128,6 @@
                                         name="./resizeWidth"
                                         typeHint="Long"
                                         required="{Boolean}false"
-                                        defaultValue="{Long}1280"
                                         min="{Long}1"
                                         max="{Long}3840"/>
                                     <heading
@@ -152,7 +151,6 @@
                                                 <field
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:resourceType="granite/ui/components/coral/foundation/form/numberfield"
-                                                    defaultValue="{Long}1280"
                                                     min="{Long}0"
                                                     name="./allowedRenditionWidths"
                                                     required="{Boolean}true"/>
@@ -179,8 +177,7 @@
                                         typeHint="Long"
                                         required="{Boolean}false"
                                         min="{Long}0"
-                                        max="{Long}100"
-                                        defaultValue="{Long}82" />
+                                        max="{Long}100" />
                                 </items>
                                 <granite:data
                                     jcr:primaryType="nt:unstructured"