Skip to content

Commit 29089d0

Browse files
committed
MC-5232: Prefix field names with section name to avoid field name collision
- Remove testing dot notation for layout - Resolve issue with background images converter
1 parent e175976 commit 29089d0

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/row.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
4848
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
4949
<style name="justify_content" source="justify_content" persistence_mode="read"/>
50-
<style name="layout.min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
50+
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
5151
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/converter/style/margins" preview_converter="Magento_PageBuilder/js/content-type/row/converter/style/margins"/>
5252
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings" preview_converter="Magento_PageBuilder/js/content-type/row/converter/style/paddings"/>
5353
<attribute name="enable_parallax" source="data-enable-parallax"/>

app/code/Magento/PageBuilder/view/adminhtml/web/js/mass-converter/background-images.js

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/background-images.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ export default class BackgroundImages implements ConverterInterface {
2020
public fromDom(data: ConverterDataInterface, config: ConverterConfigInterface): ConverterDataInterface {
2121
const directive = get<string>(data, config.attribute_name);
2222
if (directive) {
23-
const desktopImage = get<ImageArrayObject>(data, config.desktop_image_variable);
24-
const mobileImage = get<ImageArrayObject>(data, config.mobile_image_variable);
2523
const images = JSON.parse(directive.replace(/\\(.)/mg, "$1")) || {};
26-
if (!_.isUndefined(desktopImage)) {
24+
if (!_.isUndefined(images.desktop_image)) {
2725
set(data, config.desktop_image_variable, decodeUrl(images.desktop_image));
2826
}
29-
if (!_.isUndefined(mobileImage)) {
27+
if (!_.isUndefined(images.mobile_image)) {
3028
set(data, config.mobile_image_variable, decodeUrl(images.mobile_image));
3129
}
3230
delete data[config.attribute_name];

0 commit comments

Comments
 (0)