Skip to content

Commit 147484a

Browse files
Merge pull request #624 from magento/PB-684
PB-684: dotdigital content type not rendering
2 parents 3c24579 + e02dcf8 commit 147484a

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLocationAttributesDoNotRenderHtmlTest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
3838
<argument name="CMSPage" value="$$createCMSPage$$"/>
3939
</actionGroup>
40+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageAfterNavigate"/>
4041
<!-- Add Map to Stage -->
4142
<comment userInput="Add Map to Stage" stepKey="commentAddMapToStage"/>
4243
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelGroup">

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

+2-2
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/js/content-type/row/preview.js

+3-1
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/js/content-type/text/preview.js

-1
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/ts/js/content-type/observable-updater/attributes.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
import _ from "underscore";
67
import Config from "../../config";
78
import {ContentTypeConfigAppearanceElementInterface} from "../../content-type-config.types";
89
import ConverterPool from "../../converter/converter-pool";
@@ -43,7 +44,11 @@ export default function generate(
4344
}
4445

4546
// Replacing src attribute with data-tmp-src to prevent img requests in iframe during master format rendering
46-
if (attributeConfig.name === "src" && !value.indexOf("{{media url=") && Config.getMode() !== "Preview") {
47+
if (Config.getMode() !== "Preview"
48+
&& attributeConfig.name === "src"
49+
&& _.isString(value)
50+
&& !value.indexOf("{{media url=")
51+
) {
4752
attributeData["data-tmp-" + attributeConfig.name] = value;
4853
// @ts-ignore
4954
Object.defineProperty(attributeData, attributeConfig.name, { get() { return value; } });

0 commit comments

Comments
 (0)