Skip to content

Commit 222823d

Browse files
authored
Merge pull request #314 from magento-obsessive-owls/PB-46
[Owls] Parallax Is Broken On Slide Out Forms
2 parents 286c481 + 5327402 commit 222823d

File tree

6 files changed

+418
-409
lines changed

6 files changed

+418
-409
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ var config = {
3636
},
3737
'Magento_Ui/js/form/form': {
3838
'Magento_PageBuilder/js/form/form-mixin': true
39+
},
40+
'Magento_PageBuilder/js/content-type/row/appearance/default/widget': {
41+
'Magento_PageBuilder/js/content-type/row/appearance/default/widget-mixin': true
3942
}
4043
}
4144
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
define(['underscore', 'jquery', 'Magento_PageBuilder/js/events'], function (_, $, events) {
6+
'use strict';
7+
8+
return function (target) {
9+
return function (config, element) {
10+
var result = target(config, element),
11+
stageId = $(element).parents('[data-role="pagebuilder-stage"]').attr('id'),
12+
$element = $(element);
13+
14+
if ($element.data('appearance') === 'contained') {
15+
$element = $(element).find('[data-element="inner"]');
16+
}
17+
18+
// If Parallax isn't enabled, let's not attach the event
19+
if ($element.data('enableParallax') !== 1) {
20+
return result;
21+
}
22+
23+
// Listen for full screen events and destroy and rebuild jarallax
24+
events.on('stage:' + stageId + ':fullScreenModeChangeAfter', function () {
25+
_.delay(function () {
26+
$element.jarallax('destroy');
27+
target(config, element);
28+
}, 350);
29+
});
30+
31+
return result;
32+
};
33+
};
34+
});

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/row/preview.js

Lines changed: 6 additions & 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/content-type/row/preview.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ export default class Preview extends PreviewCollection {
5252
jarallax(
5353
this.element,
5454
{
55-
imgSrc: (this.contentType.dataStore.get("background_image") as any[])[0].url as string,
5655
imgPosition: this.contentType.dataStore.get("background_position") as string || "50% 50%",
5756
imgRepeat: (
5857
(this
@@ -93,6 +92,11 @@ export default class Preview extends PreviewCollection {
9392
this.buildJarallax();
9493
}
9594
});
95+
events.on(`stage:${this.contentType.stageId}:fullScreenModeChangeAfter`, () => {
96+
_.delay(() => {
97+
this.buildJarallax();
98+
}, 350);
99+
});
96100
}
97101

98102
/**

0 commit comments

Comments
 (0)