Skip to content

Commit 98c3108

Browse files
committed
Merge branch 'develop' of github.com:magento-commerce/magento2-page-builder into PB-108
2 parents fc5da41 + b66d68f commit 98c3108

File tree

26 files changed

+961
-1301
lines changed

26 files changed

+961
-1301
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Data/BackgroundFormData.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -598,21 +598,21 @@
598598
<data key="section">background</data>
599599
<data key="fieldName">video_source</data>
600600
<data key="value">https://www.youtube.com/embed/slOtnjsbff0</data>
601-
<data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
601+
<data key="renderedValue">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
602602
</entity>
603603
<entity name="PageBuilderVideoBackgroundUrl_YouTube_NonEmbedded" type="pagebuilder_video_background_url">
604604
<data key="name">Video URL</data>
605605
<data key="section">background</data>
606606
<data key="fieldName">video_source</data>
607607
<data key="value">https://www.youtube.com/watch?v=slOtnjsbff0</data>
608-
<data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
608+
<data key="renderedValue">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
609609
</entity>
610610
<entity name="PageBuilderVideoBackgroundUrl_YouTube_Insecure" type="pagebuilder_video_background_url">
611611
<data key="name">Video URL</data>
612612
<data key="section">background</data>
613613
<data key="fieldName">video_source</data>
614614
<data key="value">http://www.youtube.com/watch?v=slOtnjsbff0</data>
615-
<data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
615+
<data key="renderedValue">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
616616
</entity>
617617
<entity name="PageBuilderVideoBackgroundUrl_Vimeo_Embedded" type="pagebuilder_video_background_url">
618618
<data key="name">Video URL</data>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonBeforeButtonWithLongTextTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-buttons"/>
2121
<group value="pagebuilder-moveButtons"/>
22-
<skip>
23-
<issueId value="MQE-2288" />
24-
</skip>
2522
<group value="pr_exclude"/>
2623
</annotations>
2724
<before>
@@ -81,7 +78,7 @@
8178
<actionGroup ref="moveButton" stepKey="moveButton">
8279
<argument name="buttonIndexToMove" value="2"/>
8380
<argument name="buttonIndexToMoveTo" value="1"/>
84-
<argument name="y" value="-1000"/>
81+
<argument name="y" value="0"/>
8582
</actionGroup>
8683
<!-- Stage: Validate Changed Button Order -->
8784
<comment userInput="Stage: Validate Changed Button Order" stepKey="commentValidateStage2"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifySelectionInlineWYSIWYG.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<group value="pagebuilder-text"/>
2121
<skip>
2222
<issueId value="MQE-2288" />
23+
<issueId value="MQE-3208" />
2324
</skip>
2425
<group value="pr_exclude"/>
2526
</annotations>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
9+
<policies>
10+
<policy id="connect-src">
11+
<values>
12+
<value id="vimeo" type="host">vimeo.com</value>
13+
</values>
14+
</policy>
15+
<policy id="frame-src">
16+
<values>
17+
<value id="youtube" type="host">*.youtube.com</value>
18+
<value id="youtube_nocookie" type="host">*.youtube-nocookie.com</value>
19+
</values>
20+
</policy>
21+
</policies>
22+
</csp_whitelist>

app/code/Magento/PageBuilder/view/base/requirejs-config.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ var config = {
1010
'jarallax': 'Magento_PageBuilder/js/resource/jarallax/jarallax',
1111
'jarallaxVideo': 'Magento_PageBuilder/js/resource/jarallax/jarallax-video',
1212
'Magento_PageBuilder/js/resource/vimeo/player': 'vimeo/player',
13-
'Magento_PageBuilder/js/resource/vimeo/vimeo-wrapper': 'vimeo/vimeo-wrapper'
13+
'Magento_PageBuilder/js/resource/vimeo/vimeo-wrapper': 'vimeo/vimeo-wrapper',
14+
'jarallax-wrapper': 'Magento_PageBuilder/js/resource/jarallax/jarallax-wrapper'
1415
}
1516
},
1617
shim: {
1718
'Magento_PageBuilder/js/resource/slick/slick': {
1819
deps: ['jquery']
1920
},
2021
'Magento_PageBuilder/js/resource/jarallax/jarallax-video': {
21-
deps: ['jarallax', 'vimeoWrapper']
22+
deps: ['jarallax-wrapper', 'vimeoWrapper']
2223
}
2324
}
2425
};

0 commit comments

Comments
 (0)