Skip to content

Commit 6b96be2

Browse files
PB-265: Video background for Banner
- fix uploader - fix slider widget
1 parent fc11bfb commit 6b96be2

File tree

7 files changed

+26
-14
lines changed

7 files changed

+26
-14
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1982,6 +1982,8 @@
19821982
<comment userInput="Go to Media Storage from stage" stepKey="commentGoToMediaStorageFromStage1"/>
19831983
<actionGroup ref="goToMediaStorageFromStage" stepKey="goToMediaStorageFromStage1">
19841984
<argument name="contentType" value="PageBuilderBannerContentType"/>
1985+
<argument name="x" value="0"/>
1986+
<argument name="y" value="0"/>
19851987
</actionGroup>
19861988
<!-- Delete image A -->
19871989
<comment stepKey="deleteImageA" userInput="Delete image A"/>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,5 +155,14 @@
155155
max-width: 100%;
156156
word-break: break-word;
157157
}
158+
159+
.dragging {
160+
height: 100%;
161+
left: 0;
162+
position: absolute;
163+
top:0;
164+
width: 100%;
165+
z-index: 4;
166+
}
158167
}
159168
}

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-centered/preview.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
class="video-overlay"
2020
attr="data.video_overlay.attributes"
2121
ko-style="data.video_overlay.style" />
22+
<scope args="getUploader().getUiComponent()">
23+
<render />
24+
</scope>
2225
<div class="pagebuilder-overlay" css="data.overlay.css" attr="data.overlay.attributes" ko-style="data.overlay.style">
23-
<scope args="getUploader().getUiComponent()">
24-
<render />
25-
</scope>
2626
<div class="pagebuilder-collage-content" event="mousedown: activateEditor">
2727
<div class="pagebuilder-banner-text-content">
2828
<div if="isWysiwygSupported()"

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-left/preview.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
class="video-overlay"
2020
attr="data.video_overlay.attributes"
2121
ko-style="data.video_overlay.style" />
22+
<scope args="getUploader().getUiComponent()">
23+
<render />
24+
</scope>
2225
<div class="pagebuilder-overlay" css="data.overlay.css" attr="data.overlay.attributes" ko-style="data.overlay.style">
23-
<scope args="getUploader().getUiComponent()">
24-
<render />
25-
</scope>
2626
<div class="pagebuilder-collage-content" event="mousedown: activateEditor">
2727
<div class="pagebuilder-banner-text-content">
2828
<div if="isWysiwygSupported()"

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-right/preview.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
class="video-overlay"
2020
attr="data.video_overlay.attributes"
2121
ko-style="data.video_overlay.style" />
22+
<scope args="getUploader().getUiComponent()">
23+
<render />
24+
</scope>
2225
<div class="pagebuilder-overlay" attr="data.overlay.attributes" ko-style="data.overlay.style" css="data.overlay.css">
23-
<scope args="getUploader().getUiComponent()">
24-
<render />
25-
</scope>
2626
<div class="pagebuilder-collage-content" event="mousedown: activateEditor">
2727
<div class="pagebuilder-banner-text-content">
2828
<div if="isWysiwygSupported()"

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/poster/preview.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
class="video-overlay"
2020
attr="data.video_overlay.attributes"
2121
ko-style="data.video_overlay.style" />
22+
<scope args="getUploader().getUiComponent()">
23+
<render />
24+
</scope>
2225
<div class="pagebuilder-overlay pagebuilder-poster-overlay" attr="data.overlay.attributes" ko-style="data.overlay.style" css="data.overlay.css" event="mousedown: activateEditor">
23-
<scope args="getUploader().getUiComponent()">
24-
<render />
25-
</scope>
2626
<div class="pagebuilder-poster-content">
2727
<div class="pagebuilder-banner-text-content">
2828
<div if="isWysiwygSupported()"

app/code/Magento/PageBuilder/view/base/web/js/content-type/slide/appearance/default/widget.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
*/
55
define([
66
'jquery',
7+
'underscore',
78
'Magento_PageBuilder/js/widget/show-on-hover',
89
'Magento_PageBuilder/js/widget/video-background'
9-
], function ($, showOnHover, videoBackground) {
10+
], function ($, _, showOnHover, videoBackground) {
1011
'use strict';
1112

1213
return function (config, element) {
@@ -30,7 +31,7 @@ define([
3031
$slider.on('afterChange init', function () {
3132
var videoSlides = $slider[0].querySelectorAll('.jarallax');
3233

33-
videoSlides.forEach(function (videoSlide) {
34+
_.each(videoSlides, function (videoSlide) {
3435
videoSlide.jarallax && videoSlide.jarallax.onScroll();
3536
});
3637
});

0 commit comments

Comments
 (0)