Skip to content

Commit 0edc93e

Browse files
committed
Merge remote-tracking branch 'origin' into AC-10720
2 parents 0244156 + fc6c7a3 commit 0edc93e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/EditPanelColorPickerWindowFunctionalityTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-common"/>
2121
<group value="pagebuilder-banner"/>
22+
<group value="pr_exclude" />
2223
</annotations>
2324
<before>
2425
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/PageBuilder/view/adminhtml/web/template/page-builder.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
<with args="stage">
3232
<render></render>
3333
</with>
34-
<iframe attr="id: 'render_frame_' + id" sandbox="allow-scripts" style="position: absolute; width:0; height:0; border: none;"></iframe>
34+
<iframe attr="id: 'render_frame_' + id" sandbox="allow-scripts allow-same-origin" style="position: absolute; width:0; height:0; border: none;"></iframe>
3535
</if>
3636
</div>

0 commit comments

Comments
 (0)