Skip to content

Commit c9510c4

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

File tree

6 files changed

+6
-137
lines changed

6 files changed

+6
-137
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/preview.js

Lines changed: 1 addition & 69 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/template/content-type/slide/collage-centered/preview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
attr="data.main.attributes"
1010
css="data.main.css"
1111
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
12-
<div ko-style="Object.assign(data.main.style(), data.desktop_image.style(), getPaddingStyles())"
12+
<div ko-style="Object.assign(data.main.style(), data.desktop_image.style(), {paddingLeft: 'calc(25% + ' + data.desktop_image.style().paddingLeft + ')', paddingRight: 'calc(25% + ' + data.desktop_image.style().paddingRight + ')'})"
1313
event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper}">
1414
<div class="pagebuilder-collage-overlay" ko-style="data.overlay.style()">
1515
<scope args="getUploader().getUiComponent()">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
attr="data.main.attributes"
1010
css="data.main.css"
1111
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
12-
<div ko-style="Object.assign(data.main.style(), data.desktop_image.style(), getPaddingStyles())"
12+
<div ko-style="Object.assign(data.main.style(), data.desktop_image.style(), {paddingRight: 'calc(50% + ' + data.desktop_image.style().paddingRight + ')'})"
1313
css="data.main.css"
1414
event="{ mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper }">
1515
<div class="pagebuilder-collage-overlay"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
attr="data.main.attributes"
1010
css="data.main.css"
1111
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
12-
<div ko-style="Object.assign(data.main.style(), data.desktop_image.style(), getPaddingStyles())"
12+
<div ko-style="Object.assign(data.main.style(), data.desktop_image.style(), {paddingLeft: 'calc(50% + ' + data.desktop_image.style().paddingLeft + ')'})"
1313
event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper}">
1414
<div class="pagebuilder-collage-overlay" ko-style="data.overlay.style">
1515
<scope args="getUploader().getUiComponent()">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
css="data.main.css"
1111
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
1212
<div class="pagebuilder-slide-wrapper"
13-
ko-style="Object.assign(getBackgroundStyles(), data.main.style())"
13+
ko-style="Object.assign(data.desktop_image.style(), data.main.style)"
1414
event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper}">
1515
<div class="pagebuilder-poster-overlay"
1616
attr="data.overlay.attributes"
17-
ko-style="Object.assign(data.desktop_image.style(), data.overlay.style(), getPaddingStyles())"
17+
ko-style="data.overlay.style"
1818
css="data.overlay.css">
1919
<scope args="getUploader().getUiComponent()">
2020
<render />

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/preview.ts

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -46,69 +46,6 @@ export default class Preview extends BasePreview {
4646
});
4747
}
4848

49-
/**
50-
* Get the background wrapper attributes for the preview
51-
*
52-
* @returns {any}
53-
*/
54-
public getBackgroundStyles() {
55-
const desktopStyles = this.data.desktop_image.style();
56-
return {
57-
...desktopStyles,
58-
paddingBottom: "",
59-
paddingLeft: "",
60-
paddingRight: "",
61-
paddingTop: "",
62-
borderStyle: "none",
63-
borderRadius: "0px",
64-
};
65-
}
66-
67-
/**
68-
* Get the slide wrapper attributes for the preview
69-
*
70-
* @returns {any}
71-
*/
72-
public getPaddingStyles() {
73-
const previewData = this.previewData;
74-
const appearance = this.data.main.attributes()["data-appearance"];
75-
const paddingData: any = {};
76-
switch (appearance) {
77-
case "collage-centered":
78-
paddingData.paddingLeft = `calc(25% + ${this.data.desktop_image.style().paddingLeft})`;
79-
paddingData.paddingRight = `calc(25% + ${this.data.desktop_image.style().paddingRight})`;
80-
break;
81-
case "collage-left":
82-
paddingData.paddingRight = `calc(50% + ${this.data.desktop_image.style().paddingRight})`;
83-
break;
84-
case "collage-right":
85-
paddingData.paddingLeft = `calc(50% + ${this.data.desktop_image.style().paddingLeft})`;
86-
break;
87-
default:
88-
break;
89-
}
90-
let backgroundImage: string = "none";
91-
if (previewData.background_image() && previewData.background_image() !== "" &&
92-
previewData.background_image() !== undefined &&
93-
previewData.background_image()[0] !== undefined) {
94-
backgroundImage = "url(" + previewData.background_image()[0].url + ")";
95-
}
96-
const styles = {
97-
backgroundImage,
98-
backgroundSize: previewData.background_size(),
99-
minHeight: previewData.min_height() ? previewData.min_height() + "px" : "300px",
100-
overflow: "hidden",
101-
paddingBottom: this.data.desktop_image.style().paddingBottom || "",
102-
paddingLeft: this.data.desktop_image.style().paddingLeft || "",
103-
paddingRight: this.data.desktop_image.style().paddingRight || "",
104-
paddingTop: this.data.desktop_image.style().paddingTop || "",
105-
};
106-
return {
107-
...styles,
108-
...paddingData,
109-
};
110-
}
111-
11249
/**
11350
* Set state based on overlay mouseover event for the preview
11451
*/

0 commit comments

Comments
 (0)