Skip to content

Commit b152709

Browse files
committed
#636: Responsive breakpoint switcher - worked on pulling mobile images in mobile viewport
1 parent cf223d0 commit b152709

File tree

6 files changed

+26
-33
lines changed

6 files changed

+26
-33
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_default.less

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,3 @@
4040
border-radius: inherit;
4141
}
4242
}
43-
44-
.mobile-viewport .pagebuilder-desktop-image,
45-
.desktop-viewport .pagebuilder-mobile-image {
46-
display: none;
47-
}

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_import.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@
88
// _____________________________________________
99

1010
@import './_default.less';
11-
@import './_mobile.less';

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_mobile.less

Lines changed: 0 additions & 12 deletions
This file was deleted.

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

Lines changed: 12 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/image/full-width/preview.html

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,11 @@
1111
<scope args="getUploader().getUiComponent()">
1212
<render />
1313
</scope>
14-
<div class="pagebuilder-desktop-image">
15-
<img if="data.desktop_image.attributes().src"
16-
attr="data.desktop_image.attributes"
17-
class="preview-image"
18-
css="data.desktop_image.css"
19-
ko-style="data.desktop_image.style" />
20-
</div>
21-
<div class="pagebuilder-mobile-image">
22-
<img if="data.mobile_image.attributes().src"
23-
attr="data.mobile_image.attributes"
24-
class="preview-image"
25-
css="data.mobile_image.css"
26-
ko-style="data.mobile_image.style" />
27-
</div>
14+
<img if="getViewportImageData().attributes().src"
15+
attr="getViewportImageData().attributes"
16+
class="preview-image"
17+
css="getViewportImageData().css"
18+
ko-style="getViewportImageData().style" />
2819
<figcaption if="data.caption.html()"
2920
attr="data.caption.attributes"
3021
css="data.caption.css"

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,13 @@ export default class Preview extends BasePreview {
8686
uploader.visibleControls = !this.isSnapshot();
8787
});
8888
}
89+
90+
/**
91+
* Get viewport image data
92+
*/
93+
public getViewportImageData() {
94+
const desktopImageData = this.data.desktop_image;
95+
const mobileImageData = this.data.mobile_image;
96+
return this.viewport() === "mobile" ? mobileImageData : desktopImageData
97+
}
8998
}

0 commit comments

Comments
 (0)