Skip to content

Commit 39f005e

Browse files
committed
MAGETWO-89294: Slider Data Separation
- Fixed slides hover test
1 parent 5a134f1 commit 39f005e

File tree

6 files changed

+39
-6
lines changed

6 files changed

+39
-6
lines changed

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

Lines changed: 17 additions & 1 deletion
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
@@ -7,7 +7,7 @@
77

88
<div class="pagebuilder-content-type pagebuilder-slide"
99
attr="data.main.attributes"
10-
ko-style="Object.assign(data.main.style(), data.desktop_image.style(), getBackgroundStyles())"
10+
ko-style="Object.assign(data.main.style(), data.desktop_image.style(), getPaddingStyles())"
1111
css="data.main.css"
1212
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
1313
<div event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper}">

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(), getBackgroundStyles())"
12+
<div ko-style="Object.assign(data.main.style(), data.desktop_image.style(), getPaddingStyles())"
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(), getBackgroundStyles())"
12+
<div ko-style="Object.assign(data.main.style(), data.desktop_image.style(), getPaddingStyles())"
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
css="data.main.css"
1111
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
1212
<div class="pagebuilder-slide-wrapper"
13+
ko-style="getBackgroundStyles()"
1314
event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper}">
1415
<div class="pagebuilder-poster-overlay"
1516
attr="data.overlay.attributes"
16-
ko-style="Object.assign(data.overlay.style(), data.desktop_image.style(), getBackgroundStyles())"
17+
ko-style="Object.assign(data.desktop_image.style(), data.overlay.style(), getPaddingStyles())"
1718
css="data.overlay.css">
1819
<scope args="getUploader().getUiComponent()">
1920
<render />

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,28 @@ export default class Preview extends BasePreview {
4747
this.displayLabel($t(`Slide ${slider.children().indexOf(this.parent) + 1}`));
4848
});
4949
}
50+
5051
/**
51-
* Get the slide wrapper attributes for the preview
52+
* Get the background wrapper attributes for the preview
5253
*
5354
* @returns {any}
5455
*/
5556
public getBackgroundStyles() {
57+
const desktopStyles = this.data.desktop_image.style();
58+
return {
59+
...desktopStyles,
60+
paddingBottom: "",
61+
paddingLeft: "",
62+
paddingRight: "",
63+
paddingTop: "",
64+
};
65+
}
66+
/**
67+
* Get the slide wrapper attributes for the preview
68+
*
69+
* @returns {any}
70+
*/
71+
public getPaddingStyles() {
5672
const previewData = this.previewData;
5773
const appearance = this.data.main.attributes()["data-appearance"];
5874
const paddingData: any = {};

0 commit comments

Comments
 (0)