Skip to content

Commit cf60fad

Browse files
committed
MC-3610: Remove use of legacy system within slide preview
- remove uses of getBackgroundStyles() and getPaddingStyles()
1 parent d797cb2 commit cf60fad

File tree

2 files changed

+10
-17
lines changed
  • app/code/Magento/PageBuilder/view

2 files changed

+10
-17
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/poster/preview.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
<div class="pagebuilder-content-type pagebuilder-slide"
99
attr="data.main.attributes"
1010
css="data.main.css"
11+
ko-style="data.main.style"
1112
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
1213
<div class="pagebuilder-slide-wrapper"
13-
ko-style="Object.assign(data.desktop_image.style(), data.main.style)"
14+
ko-style="data.desktop_image.style"
1415
event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper}">
1516
<div class="pagebuilder-poster-overlay"
1617
attr="data.overlay.attributes"

app/code/Magento/PageBuilder/view/base/pagebuilder/content_type/slide.xml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
3131
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
3232
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
33+
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/content-type/slide/converter/style/margins"/>
3334
<attribute name="name" source="data-role"/>
3435
<attribute name="slide_name" source="data-slide-name"/>
3536
<attribute name="appearance" source="data-appearance"/>
@@ -45,6 +46,7 @@
4546
</element>
4647
<element name="overlay">
4748
<style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/slide/converter/style/overlay-background-color" persistence_mode="write"/>
49+
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
4850
<attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color" persistence_mode="read"/>
4951
<attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-transparency" persistence_mode="read"/>
5052
<attribute name="virtual_overlay_transparency" storage_key="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color-transparency" persistence_mode="write"/>
@@ -57,8 +59,6 @@
5759
<style name="background_position" source="background_position"/>
5860
<style name="background_size" source="background_size"/>
5961
<style name="background_repeat" source="background_repeat"/>
60-
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/content-type/slide/converter/style/margins"/>
61-
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
6262
</element>
6363
<element name="mobile_image">
6464
<style name="text_align" source="text_align"/>
@@ -68,8 +68,6 @@
6868
<style name="background_position" source="background_position"/>
6969
<style name="background_size" source="background_size"/>
7070
<style name="background_repeat" source="background_repeat"/>
71-
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/content-type/slide/converter/style/margins"/>
72-
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
7371
</element>
7472
<element name="content">
7573
<html name="content" preview_converter="Magento_PageBuilder/js/converter/html/directive"/>
@@ -104,6 +102,7 @@
104102
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
105103
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
106104
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
105+
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/content-type/slide/converter/style/margins"/>
107106
<attribute name="name" source="data-role"/>
108107
<attribute name="slide_name" source="data-slide-name"/>
109108
<attribute name="appearance" source="data-appearance"/>
@@ -119,6 +118,7 @@
119118
</element>
120119
<element name="overlay">
121120
<style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/slide/converter/style/overlay-background-color" persistence_mode="write"/>
121+
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
122122
<attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color" persistence_mode="read"/>
123123
<attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-transparency" persistence_mode="read"/>
124124
<attribute name="virtual_overlay_transparency" storage_key="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color-transparency" persistence_mode="write"/>
@@ -131,8 +131,6 @@
131131
<style name="background_position" source="background_position"/>
132132
<style name="background_size" source="background_size"/>
133133
<style name="background_repeat" source="background_repeat"/>
134-
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/content-type/slide/converter/style/margins"/>
135-
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
136134
</element>
137135
<element name="mobile_image">
138136
<style name="text_align" source="text_align"/>
@@ -142,8 +140,6 @@
142140
<style name="background_position" source="background_position"/>
143141
<style name="background_size" source="background_size"/>
144142
<style name="background_repeat" source="background_repeat"/>
145-
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/content-type/slide/converter/style/margins"/>
146-
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
147143
</element>
148144
<element name="content">
149145
<html name="content" preview_converter="Magento_PageBuilder/js/converter/html/directive"/>
@@ -178,6 +174,7 @@
178174
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
179175
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
180176
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
177+
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/content-type/slide/converter/style/margins"/>
181178
<attribute name="name" source="data-role"/>
182179
<attribute name="slide_name" source="data-slide-name"/>
183180
<attribute name="appearance" source="data-appearance"/>
@@ -193,6 +190,7 @@
193190
</element>
194191
<element name="overlay">
195192
<style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/slide/converter/style/overlay-background-color" persistence_mode="write"/>
193+
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
196194
<attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color" persistence_mode="read"/>
197195
<attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-transparency" persistence_mode="read"/>
198196
<attribute name="virtual_overlay_transparency" storage_key="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color-transparency" persistence_mode="write"/>
@@ -205,8 +203,6 @@
205203
<style name="background_position" source="background_position"/>
206204
<style name="background_size" source="background_size"/>
207205
<style name="background_repeat" source="background_repeat"/>
208-
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/content-type/slide/converter/style/margins"/>
209-
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
210206
</element>
211207
<element name="mobile_image">
212208
<style name="text_align" source="text_align"/>
@@ -216,8 +212,6 @@
216212
<style name="background_position" source="background_position"/>
217213
<style name="background_size" source="background_size"/>
218214
<style name="background_repeat" source="background_repeat"/>
219-
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/content-type/slide/converter/style/margins"/>
220-
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
221215
</element>
222216
<element name="content">
223217
<html name="content" preview_converter="Magento_PageBuilder/js/converter/html/directive"/>
@@ -253,6 +247,7 @@
253247
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
254248
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
255249
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
250+
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/content-type/slide/converter/style/margins"/>
256251
<attribute name="name" source="data-role"/>
257252
<attribute name="slide_name" source="data-slide-name"/>
258253
<attribute name="appearance" source="data-appearance"/>
@@ -269,6 +264,7 @@
269264
<element name="overlay">
270265
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
271266
<style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/slide/converter/style/overlay-background-color" persistence_mode="write"/>
267+
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
272268
<attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color" persistence_mode="read"/>
273269
<attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-transparency" persistence_mode="read"/>
274270
<attribute name="virtual_overlay_transparency" storage_key="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color-transparency" persistence_mode="write"/>
@@ -281,8 +277,6 @@
281277
<style name="background_position" source="background_position"/>
282278
<style name="background_size" source="background_size"/>
283279
<style name="background_repeat" source="background_repeat"/>
284-
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/content-type/slide/converter/style/margins"/>
285-
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
286280
</element>
287281
<element name="mobile_image">
288282
<style name="text_align" source="text_align"/>
@@ -292,8 +286,6 @@
292286
<style name="background_position" source="background_position"/>
293287
<style name="background_size" source="background_size"/>
294288
<style name="background_repeat" source="background_repeat"/>
295-
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/content-type/slide/converter/style/margins"/>
296-
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
297289
</element>
298290
<element name="content">
299291
<html name="content" preview_converter="Magento_PageBuilder/js/converter/html/directive"/>

0 commit comments

Comments
 (0)