Skip to content

Commit 1f2c06d

Browse files
committed
Merge branch 'ACP2E-2087' of https://github.com/magento-l3/magento2ce into PR-L3-08112023
2 parents 9f6ee1f + 5b73547 commit 1f2c06d

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

app/code/Magento/Ui/view/base/ui_component/etc/definition.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,12 @@
122122
<multiple>true</multiple>
123123
</settings>
124124
</checkboxset>
125-
<wysiwyg class="Magento\Ui\Component\Form\Element\Wysiwyg" component="Magento_Ui/js/form/element/wysiwyg" template="ui/content/content">
125+
<wysiwyg class="Magento\Ui\Component\Form\Element\Wysiwyg" component="Magento_Ui/js/form/element/wysiwyg" template="ui/form/wysiwyg">
126126
<settings>
127127
<elementTmpl>ui/content/content</elementTmpl>
128+
<validation>
129+
<rule name="validate-no-utf8mb4-characters" xsi:type="boolean">true</rule>
130+
</validation>
128131
</settings>
129132
</wysiwyg>
130133
<actionDelete class="Magento\Ui\Component\Form\Element\ActionDelete" component="Magento_Ui/js/dynamic-rows/action-delete" template="ui/dynamic-rows/cells/action-delete"/>
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!--
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
-->
7+
<div css="$data.additionalClasses" visible="visible">
8+
<div html="getContentUnsanitizedHtml()"></div>
9+
<label class="admin__field-error" if="error" attr="for: uid" text="error"></label>
10+
</div>
11+
12+
<div data-role="spinner"
13+
class="admin__data-grid-loading-mask"
14+
visible="loading"
15+
if="showSpinner">
16+
<div class="spinner">
17+
<span repeat="8"></span>
18+
</div>
19+
</div>

0 commit comments

Comments
 (0)