Skip to content

Commit b0c57bf

Browse files
MC-36202: Support same site
- add src compatibility
1 parent 0b5af0f commit b0c57bf

File tree

3 files changed

+35
-13
lines changed
  • app/code/Magento/PageBuilder/view/adminhtml/web

3 files changed

+35
-13
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/observable-updater/attributes.js

Lines changed: 27 additions & 8 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/image/full-width/master.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77

88
<figure attr="data.main.attributes" ko-style="Object.assign({}, data.main.style(), !data.desktop_image.attributes().src ? {} : {borderStyle: 'none'})" css="data.main.css">
99
<a if="data.link.attributes().href" attr="data.link.attributes" ko-style="data.link.style" css="data.link.css">
10-
<img if="data.desktop_image.attributes()['data-src']"
10+
<img if="data.desktop_image.attributes().src"
1111
attr="data.desktop_image.attributes"
1212
class="pagebuilder-mobile-hidden"
1313
css="data.desktop_image.css"
1414
ko-style="data.desktop_image.style" />
15-
<img if="data.mobile_image.attributes()['data-src']"
15+
<img if="data.mobile_image.attributes().src"
1616
attr="data.mobile_image.attributes"
1717
class="pagebuilder-mobile-only"
1818
css="data.mobile_image.css"
1919
ko-style="data.mobile_image.style" />
2020
</a>
2121

2222
<ifnot args="data.link.attributes().href">
23-
<img if="data.desktop_image.attributes()['data-src']"
23+
<img if="data.desktop_image.attributes().src"
2424
attr="data.desktop_image.attributes"
2525
class="pagebuilder-mobile-hidden"
2626
css="data.desktop_image.css"
2727
ko-style="data.desktop_image.style"/>
28-
<img if="data.mobile_image.attributes()['data-src']"
28+
<img if="data.mobile_image.attributes().src"
2929
attr="data.mobile_image.attributes"
3030
class="pagebuilder-mobile-only"
3131
css="data.mobile_image.css"

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/attributes.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export default function generate(
3030
if ("read" === attributeConfig.persistence_mode) {
3131
continue;
3232
}
33+
// @ts-ignore
3334
let value;
3435
if (!!attributeConfig.static) {
3536
value = attributeConfig.value;
@@ -43,7 +44,9 @@ export default function generate(
4344

4445
// Replacing src attribute with data-src to prevent img requests in iframe during master format rendering
4546
if (attributeConfig.name === "src" && Config.getMode() !== "Preview") {
46-
attributeData["data-" + attributeConfig.name] = value;
47+
attributeData["data-" + attributeConfig.name] = value as string;
48+
// @ts-ignore
49+
Object.defineProperty(attributeData, attributeConfig.name, { get() { return value; } });
4750
} else {
4851
attributeData[attributeConfig.name] = value;
4952
}

0 commit comments

Comments
 (0)