Skip to content

Commit d227383

Browse files
anthoulaanthoula
committed
MAGETWO-90441: Allow inline editing of Heading from stage
- refactor heading toolbar - fix issue with default value for text-align field - update icon names
1 parent 9fadea8 commit d227383

File tree

12 files changed

+155
-249
lines changed

12 files changed

+155
-249
lines changed

‎app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_base_form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<field name="text_align" sortOrder="10" formElement="select">
2727
<argument name="data" xsi:type="array">
2828
<item name="config" xsi:type="array">
29-
<item name="default" xsi:type="string">default</item>
29+
<item name="default" xsi:type="string"/>
3030
</item>
3131
</argument>
3232
<settings>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
@icon-pagebuilder-special-characters__content: '\e914';
3232
@icon-pagebuilder-tabs__content: '\e915';
3333
@icon-pagebuilder-text__content: '\e916';
34-
@icon-pagebuilder-text-center__content: '\e91a';
35-
@icon-pagebuilder-text-left__content: '\e91b';
36-
@icon-pagebuilder-text-right__content: '\e91c';
34+
@icon-pagebuilder-align-center__content: '\e91a';
35+
@icon-pagebuilder-align-left__content: '\e91b';
36+
@icon-pagebuilder-align-right__content: '\e91c';
3737
@icon-pagebuilder-variable__content: '\e917';
3838
@icon-pagebuilder-widgets__content: '\e918';
3939

@@ -139,16 +139,16 @@
139139
content: @icon-pagebuilder-text__content;
140140
}
141141

142-
.icon-pagebuilder-text-center:before {
143-
content: @icon-pagebuilder-text-center__content;
142+
.icon-pagebuilder-align-center:before {
143+
content: @icon-pagebuilder-align-center__content;
144144
}
145145

146-
.icon-pagebuilder-text-left:before {
147-
content: @icon-pagebuilder-text-left__content;
146+
.icon-pagebuilder-align-left:before {
147+
content: @icon-pagebuilder-align-left__content;
148148
}
149149

150-
.icon-pagebuilder-text-right:before {
151-
content: @icon-pagebuilder-text-right__content;
150+
.icon-pagebuilder-align-right:before {
151+
content: @icon-pagebuilder-align-right__content;
152152
}
153153

154154
.icon-pagebuilder-variable:before {

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type-toolbar/option.js

Lines changed: 0 additions & 61 deletions
This file was deleted.

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

Lines changed: 12 additions & 15 deletions
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/js/toolbar-options.js

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/toolbar.js

Lines changed: 61 additions & 13 deletions
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/template/content-type/heading/default/preview.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@
77

88
<div class="pagebuilder-content-type pagebuilder-entity pagebuilder-entity-preview pagebuilder-heading pagebuilder-no-blur pagebuilder-live-edit" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
99
<render args="getOptions().template" />
10-
<div class="pagebuilder-toolbar-container" tabindex="0" event="{ focusin: onToolbarFocusIn, focusout: onToolbarFocusOut }">
11-
<with args="getHeadingToolbar()">
10+
<div class="pagebuilder-toolbar-container" tabindex="0" event="{ focusin: toolbar.onFocusIn, focusout: toolbar.onFocusOut }">
11+
<with args="toolbar">
1212
<render args="template" />
1313
</with>
1414
<if args="data.main.heading_type() === 'h1'">
15-
<h1 attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" afterRender="function (element) { onRender.call($data, element); }" data-bind="liveEdit: { field: 'heading_text', placeholder: $t('Edit Heading Text') }"></h1>
15+
<h1 attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" afterRender="function (element) { afterRender.call($data, element); }" data-bind="liveEdit: { field: 'heading_text', placeholder: $t('Edit Heading Text') }"></h1>
1616
</if>
1717
<if args="data.main.heading_type() === 'h2'">
18-
<h2 attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" afterRender="function (element) { onRender.call($data, element); }" data-bind="liveEdit: { field: 'heading_text', placeholder: $t('Edit Heading Text') }"></h2>
18+
<h2 attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" afterRender="function (element) { afterRender.call($data, element); }" data-bind="liveEdit: { field: 'heading_text', placeholder: $t('Edit Heading Text') }"></h2>
1919
</if>
2020
<if args="data.main.heading_type() === 'h3'">
21-
<h3 attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" afterRender="function (element) { onRender.call($data, element); }" data-bind="liveEdit: { field: 'heading_text', placeholder: $t('Edit Heading Text') }"></h3>
21+
<h3 attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" afterRender="function (element) { afterRender.call($data, element); }" data-bind="liveEdit: { field: 'heading_text', placeholder: $t('Edit Heading Text') }"></h3>
2222
</if>
2323
<if args="data.main.heading_type() === 'h4'">
24-
<h4 attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" afterRender="function (element) { onRender.call($data, element); }" data-bind="liveEdit: { field: 'heading_text', placeholder: $t('Edit Heading Text') }"></h4>
24+
<h4 attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" afterRender="function (element) { afterRender.call($data, element); }" data-bind="liveEdit: { field: 'heading_text', placeholder: $t('Edit Heading Text') }"></h4>
2525
</if>
2626
<if args="data.main.heading_type() === 'h5'">
27-
<h5 attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" afterRender="function (element) { onRender.call($data, element); }" data-bind="liveEdit: { field: 'heading_text', placeholder: $t('Edit Heading Text') }"></h5>
27+
<h5 attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" afterRender="function (element) { afterRender.call($data, element); }" data-bind="liveEdit: { field: 'heading_text', placeholder: $t('Edit Heading Text') }"></h5>
2828
</if>
2929
<if args="data.main.heading_type() === 'h6'">
30-
<h6 attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" afterRender="function (element) { onRender.call($data, element); }" data-bind="liveEdit: { field: 'heading_text', placeholder: $t('Edit Heading Text') }"></h6>
30+
<h6 attr="data.main.attributes" ko-style="data.main.style" css="data.main.css" afterRender="function (element) { afterRender.call($data, element); }" data-bind="liveEdit: { field: 'heading_text', placeholder: $t('Edit Heading Text') }"></h6>
3131
</if>
3232
</div>
3333
</div>

‎app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/toolbar.html renamed to ‎app/code/Magento/PageBuilder/view/adminhtml/web/template/toolbar.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
<div class="pagebuilder-toolbar-options">
99
<div class="pagebuilder-toolbar-options-wrapper" each="options">
10-
<ul class="pagebuilder-toolbar-options-links" css="key" each="options">
10+
<ul class="pagebuilder-toolbar-options-links" css="key" each="values">
1111
<li class="pagebuilder-toolbar-options-link">
12-
<a href="#" click="function () { $parents[1].onClickOption($parents[0], $data); }" css="'toolbar-active': value == $parents[2].previewData[$parents[0].key]()">
12+
<a href="#" click="function () { $parents[1].onOptionClick($parents[0], $data); }" css="'toolbar-active': value == $parents[2].previewData[$parents[0].key]()">
1313
<if args="icon">
1414
<i css="icon"></i>
1515
</if>

‎app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-toolbar/option.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ import ValueInterface from "./value.d";
88
export interface OptionInterface {
99
key: string;
1010
type: string;
11-
options: ValueInterface[];
11+
values: ValueInterface[];
1212
}

0 commit comments

Comments
 (0)