Skip to content

Commit 6e516d3

Browse files
Merge branch '514_content-snapshot-category-admin-page' of github.com:magento/magento2-page-builder into 514_4_content-snapshot-category-admin-page
Conflicts: app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/wysiwyg.js
2 parents bc89af1 + 37d9826 commit 6e516d3

File tree

4 files changed

+46
-9
lines changed

4 files changed

+46
-9
lines changed

app/code/Magento/PageBuilder/view/adminhtml/ui_component/category_form.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<item name="config" xsi:type="array">
1313
<item name="wysiwygConfigData" xsi:type="array">
1414
<item name="is_pagebuilder_enabled" xsi:type="boolean">true</item>
15+
<item name="pagebuilder_content_snapshot" xsi:type="boolean">true</item>
1516
<item name="pagebuilder_button" xsi:type="boolean">true</item>
1617
<item name="pagebuilder_stage_overlay" xsi:type="boolean">true</item>
1718
</item>

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_common.less

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,35 @@
4848
display: none !important;
4949
}
5050
}
51+
52+
//
53+
// Category Description
54+
// ---------------------------------------------
55+
56+
.catalog-category-edit {
57+
.admin__fieldset {
58+
> .admin__field {
59+
&[data-index="description"] {
60+
> .admin__field-label {
61+
text-align: left;
62+
63+
label {
64+
span {
65+
&:before {
66+
left: 0;
67+
}
68+
}
69+
}
70+
}
71+
72+
> .admin__field-control {
73+
float: right;
74+
75+
button.action-default {
76+
float: right;
77+
}
78+
}
79+
}
80+
}
81+
}
82+
}

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/wysiwyg.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ define([
3939
initialize: function () {
4040
this._super();
4141

42-
if (!this.wysiwygConfigData()['pagebuilder_button']) {
42+
if (!this.wysiwygConfigData()['pagebuilder_button'] ||
43+
this.wysiwygConfigData()['pagebuilder_content_snapshot']) {
4344
this.initPageBuilder();
4445
}
4546

@@ -95,10 +96,11 @@ define([
9596
if (this.wysiwygConfigData()['pagebuilder_stage_overlay']) {
9697
this.pageBuilder.hasStageOverlay(true);
9798
}
98-
}
9999

100-
if (!this.wysiwygConfigData()['pagebuilder_button']) {
101-
this.visiblePageBuilder(true);
100+
if (!this.wysiwygConfigData()['pagebuilder_button'] ||
101+
this.wysiwygConfigData()['pagebuilder_content_snapshot']) {
102+
this.visiblePageBuilder(true);
103+
}
102104
}
103105
},
104106

@@ -170,7 +172,8 @@ define([
170172
}.bind(this), 350);
171173
}
172174

173-
if (this.wysiwygConfigData()['pagebuilder_button']) {
175+
if (this.wysiwygConfigData()['pagebuilder_button'] &&
176+
!this.wysiwygConfigData()['pagebuilder_content_snapshot']) {
174177
// Force full screen mode whilst the animation occurs
175178
this.transitionOut(true);
176179
// Trigger animation out
@@ -190,7 +193,8 @@ define([
190193
});
191194
}
192195

193-
if (this.wysiwygConfigData()['pagebuilder_button']) {
196+
if (this.wysiwygConfigData()['pagebuilder_button'] &&
197+
!this.wysiwygConfigData()['pagebuilder_content_snapshot']) {
194198
this.visiblePageBuilder(true);
195199

196200
fullScreenDeferred.resolve();

app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/wysiwyg.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77

88
<div visible="visible" css="{'_disabled': disabled}">
9-
<button if="wysiwygConfigData()['pagebuilder_button']"
9+
<button if="wysiwygConfigData()['pagebuilder_button'] || wysiwygConfigData()['pagebuilder_content_snapshot']"
1010
type="button"
1111
class="action-default action"
1212
ko-disabled="disabled"
@@ -16,8 +16,8 @@
1616
<if args="isComponentInitialized">
1717
<div visible="visiblePageBuilder"
1818
class="pagebuilder-wysiwyg-wrapper"
19-
css="{'pagebuilder-transition-in': wysiwygConfigData()['pagebuilder_button'], 'trigger-transition': transition, 'pagebuilder-transition-out': transitionOut}">
20-
<with args="pageBuilder">
19+
css="{'pagebuilder-transition-in': wysiwygConfigData()['pagebuilder_button'] && !wysiwygConfigData()['pagebuilder_content_snapshot'], 'trigger-transition': transition, 'pagebuilder-transition-out': transitionOut}">
20+
<with args="pageBuilder">
2121
<render />
2222
</with>
2323
</div>

0 commit comments

Comments
 (0)