Skip to content

Commit fa2f6c0

Browse files
committed
Merge branch 'develop' of https://github.com/magento-commerce/magento2-page-builder into develop
2 parents d074fdf + 8d9b6a0 commit fa2f6c0

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/stage-builder.js

Lines changed: 1 addition & 1 deletion
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/stage-builder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,14 +245,14 @@ function createInitialElementData(fields: ConfigFieldInterface): FieldDefaultsIn
245245
*/
246246
function getElementChildren(element: HTMLElement): HTMLElement[] {
247247
if (element.hasChildNodes()) {
248-
let children: any[] = [];
248+
const children: any[] = [];
249249
// Find direct children of the element
250250
_.forEach(element.childNodes, (child: HTMLElement) => {
251251
if (child.nodeType === Node.ELEMENT_NODE) {
252252
if (child.hasAttribute(Config.getConfig("dataContentTypeAttributeName"))) {
253253
children.push(child);
254254
} else {
255-
children = getElementChildren(child);
255+
children.push(...getElementChildren(child));
256256
}
257257
}
258258
});

app/code/Magento/PageBuilder/view/base/web/js/content-type/products/appearance/carousel/widget.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ define([
2727
$carouselElement.slick('unslick');
2828
}
2929

30-
config.slidesToScroll = config.slidesToShow;
30+
config.slidesToScroll = Math.floor(config.slidesToShow);
3131
$carouselElement.slick(config);
3232
}
3333

0 commit comments

Comments
 (0)