Skip to content
This repository was archived by the owner on Dec 19, 2019. It is now read-only.

Commit ea342f1

Browse files
author
Yaroslav Onischenko
authored
Merge pull request #267 from magento-frontend/bugs
[Frontend] Bugs
2 parents 4df438c + 678bb29 commit ea342f1

File tree

23 files changed

+47
-40
lines changed

23 files changed

+47
-40
lines changed

‎app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@
6969
<item name="fit" xsi:type="boolean">false</item>
7070
<item name="label" xsi:type="string">Search String</item>
7171
<item name="showFallbackReset" xsi:type="boolean">false</item>
72+
<item name="validation" xsi:type="array">
73+
<item name="required-entry" xsi:type="boolean">true</item>
74+
</item>
7275
</item>
7376
</argument>
7477
</field>
@@ -82,6 +85,9 @@
8285
<item name="fit" xsi:type="boolean">false</item>
8386
<item name="label" xsi:type="string">Theme Name</item>
8487
<item name="showFallbackReset" xsi:type="boolean">false</item>
88+
<item name="validation" xsi:type="array">
89+
<item name="required-entry" xsi:type="boolean">true</item>
90+
</item>
8591
</item>
8692
</argument>
8793
</field>

‎app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/cells/action-delete.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
title: $parent.deleteButtonLabel
1212
}
1313
">
14-
<span data-bind="text: $parent.deleteButtonLabel"></span>
14+
<span translate="$parent.deleteButtonLabel"></span>
1515
</button>

‎app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
class="action-secondary"
1717
type="button"
1818
click="processingAddChild.bind($data, false, false, false)">
19-
<span text="addButtonLabel"/>
19+
<span translate="addButtonLabel"/>
2020
</button>
2121
</div>
2222

@@ -30,7 +30,7 @@
3030
css="element.setClasses(element)"
3131
attr="'data-index': index">
3232
<label if="element.label" class="admin__field-label" attr="for: element.uid">
33-
<span text="element.label"/>
33+
<span translate="element.label"/>
3434
</label>
3535

3636
<div class="admin__field-control" data-role="grid-wrapper">
@@ -51,7 +51,7 @@
5151

5252
<th repeat="foreach: labels, item: '$label'"
5353
class="data-grid-th"
54-
text="$label().label"
54+
translate="$label().label"
5555
visible="$label().visible"
5656
disable="$label().disabled"
5757
css="setClasses($label())">

‎app/code/Magento/Catalog/view/adminhtml/web/template/form/element/action-delete.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
title: $parent.deleteButtonLabel
1313
}
1414
">
15-
<span data-bind="text: $parent.deleteButtonLabel"></span>
15+
<span translate="$parent.deleteButtonLabel"></span>
1616
</button>

‎app/code/Magento/Ui/view/base/web/js/grid/filters/filters.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ define([
3131
* @returns {Object}
3232
*/
3333
function removeEmpty(data) {
34-
return utils.mapRecursive(data, utils.removeEmptyValues.bind(utils));
34+
var result = utils.mapRecursive(data, utils.removeEmptyValues.bind(utils));
35+
36+
return utils.mapRecursive(result, function (value) {
37+
return _.isString(value) ? value.trim() : value;
38+
});
3539
}
3640

3741
return Collection.extend({

‎app/code/Magento/Ui/view/base/web/js/grid/search/search.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ define([
105105
apply: function (value) {
106106
value = value || this.inputValue;
107107

108-
this.value = this.inputValue = value;
108+
this.value = this.inputValue = value.trim();
109109

110110
return this;
111111
},

‎app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/tooltip.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,8 @@ define([
599599
}
600600

601601
tooltip.setContent.apply(null, arguments);
602+
603+
return false;
602604
},
603605

604606
/**

‎app/code/Magento/Ui/view/base/web/templates/dynamic-rows/cells/action-delete.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
title: $parent.deleteButtonLabel
1313
}
1414
">
15-
<span data-bind="text: $parent.deleteButtonLabel"></span>
15+
<span translate="$parent.deleteButtonLabel"></span>
1616
</button>

‎app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/collapsible.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<div class="admin__field" css="element.setClasses(element)">
88
<label if="element.label" class="admin__field-label" attr="for: element.uid">
9-
<span text="element.label"/>
9+
<span translate="element.label"/>
1010
</label>
1111

1212
<div class="admin__field-control" data-role="grid-wrapper">
@@ -22,7 +22,7 @@
2222

2323
<thead if="element.columnsHeader">
2424
<tr data-bind="foreach: {data: labels, as: 'label'}">
25-
<th text="label.config.label"
25+
<th translate="label.config.label"
2626
css="item.columnsHeaderClasses">
2727
</th>
2828
</tr>
@@ -39,7 +39,7 @@
3939
<render args="name: $parents[1].dndConfig.template, data: $parents[1].dnd"
4040
if="$parents[1].dndConfig.enabled" />
4141

42-
<span text="$parent.getLabel(elem)" />
42+
<span translate="$parent.getLabel(elem)" />
4343
</div>
4444

4545
<button class="action-delete"
@@ -48,7 +48,7 @@
4848
click="function(){
4949
$parents[1].deleteRecord($parent.index, $parent.recordId)
5050
}">
51-
<span text="'Delete'"/>
51+
<span translate="'Delete'"/>
5252
</button>
5353
</div>
5454

@@ -66,7 +66,7 @@
6666
<button attr="{disabled: disabled}"
6767
type="button"
6868
click="addChild.bind($data, false, false)">
69-
<span text="addButtonLabel"/>
69+
<span translate="addButtonLabel"/>
7070
</button>
7171
</div>
7272
</div>

‎app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<div class="admin__field" visible="visible" disable="disabled" css="element.setClasses(element)">
88
<label if="element.label" class="admin__field-label" attr="for: element.uid">
9-
<span text="element.label"/>
9+
<span translate="element.label"/>
1010
</label>
1111

1212
<div class="admin__field-control" data-role="grid-wrapper" attr="'data-index': index">
@@ -24,7 +24,7 @@
2424
<tr>
2525
<th if="dndConfig.enabled"/>
2626
<th repeat="foreach: labels, item: '$label'"
27-
text="$label().label"
27+
translate="$label().label"
2828
css="setClasses($label())"
2929
visible="$label().visible"
3030
disable="$label().disabled"
@@ -56,7 +56,7 @@
5656
attr="{disabled: disabled, 'data-action': 'add_new_row'}"
5757
type="button"
5858
click="processingAddChild.bind($data, false, false, false)">
59-
<span text="addButtonLabel"/>
59+
<span translate="addButtonLabel"/>
6060
</button>
6161

6262
<div class="admin__control-table-pagination" visible="!!$data.recordData().length && (pages() > 1)">

‎app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
css="element.setClasses(element)"
1212
attr="'data-index': index">
1313
<label if="element.label" class="admin__field-label" attr="for: element.uid">
14-
<span text="element.label"/>
14+
<span translate="element.label"/>
1515
</label>
1616

1717
<div class="admin__field-control" data-role="grid-wrapper">
@@ -40,7 +40,7 @@
4040

4141
<th repeat="foreach: labels, item: '$label'"
4242
class="data-grid-th"
43-
text="$label().label"
43+
translate="$label().label"
4444
visible="$label().visible"
4545
disable="$label().disabled"
4646
css="$label().columnsHeaderClasses">
@@ -73,7 +73,7 @@
7373
<button attr="{disabled: disabled}"
7474
type="button"
7575
click="addChild.bind($data, false, false)">
76-
<span text="addButtonLabel"/>
76+
<span translate="addButtonLabel"/>
7777
</button>
7878
</div>
7979
<render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>

‎app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<div class="admin__field" visible="visible" css="$data.additionalClasses">
88
<label class="admin__field-label" if="$data.label" attr="for: uid">
9-
<span text="label" attr="'data-config-scope': $data.scopeLabel"/>
9+
<span translate="label" attr="'data-config-scope': $data.scopeLabel"/>
1010
</label>
1111

1212
<div class="admin__field-control" css="'_with-tooltip': $data.tooltip">

‎app/code/Magento/Ui/view/base/web/templates/form/field.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
css="$data.additionalClasses"
1010
attr="'data-index': index">
1111
<label class="admin__field-label" if="$data.label" visible="$data.labelVisible" attr="for: uid">
12-
<span text="label" attr="'data-config-scope': $data.scopeLabel"/>
12+
<span translate="label" attr="'data-config-scope': $data.scopeLabel"/>
1313
</label>
1414
<div class="admin__field-control"
1515
css="'_with-tooltip': $data.tooltip, '_with-reset': $data.showFallbackReset && $data.isDifferedFromDefault">
@@ -33,7 +33,7 @@
3333
<label class="admin__field-error" if="error" attr="for: uid" text="error"/>
3434

3535
<div class="admin__field-note" if="$data.notice" attr="id: noticeId">
36-
<span text="notice"/>
36+
<span translate="notice"/>
3737
</div>
3838

3939
<div class="admin__additional-info" if="$data.additionalInfo" html="$data.additionalInfo"></div>

‎app/code/Magento/Ui/view/base/web/templates/form/fieldset.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
'_changed': changed,
2020
'_loading': loading,
2121
'_error': error">
22-
<span text="label"/>
22+
<span translate="label"/>
2323
<span class="admin__page-nav-item-messages" if="collapsible">
2424
<span class="admin__page-nav-item-message _changed">
2525
<span class="admin__page-nav-item-message-icon"></span>

‎app/code/Magento/Ui/view/base/web/templates/grid/columns/text.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
_draggable: draggable,
1111
_ascend: sorting === 'asc',
1212
_descend: sorting === 'desc'">
13-
<span class="data-grid-cell-content" text="label"/>
13+
<span class="data-grid-cell-content" translate="label"/>
1414
</th>

‎app/code/Magento/Ui/view/base/web/templates/grid/controls/columns.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
ko-checked="$col().visible"
1818
attr="id: ++ko.uid"/>
1919
<label class="admin__field-label"
20-
text="$col().label"
20+
translate="$col().label"
2121
attr="for: ko.uid, title: $col().label"/>
2222
</div>
2323
</div>

‎app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/group.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
*/
66
-->
77
<legend class="admin__form-field-legend">
8-
<span text="label"/>
8+
<span translate="label"/>
99
</legend>
1010
<div class="admin__form-field" outereach="elems" render=""/>

‎app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
class="admin__form-field-label"
1111
data-bind="attr: {for: uid}
1212
">
13-
<span data-bind="text: label"></span>
13+
<span translate="label"></span>
1414
</label>
1515
<!-- /ko -->
1616
<div
@@ -60,7 +60,7 @@
6060
<div class="admin__action-multiselect-text"
6161
data-bind="
6262
visible: !hasData(),
63-
text: selectedPlaceholders.defaultPlaceholder
63+
i18n: selectedPlaceholders.defaultPlaceholder
6464
">
6565
</div>
6666
<!-- ko foreach: { data: getSelected(), as: 'option'} -->
@@ -74,11 +74,7 @@
7474
tabindex="-1"
7575
data-bind="click: $parent.removeSelected.bind($parent, value)
7676
">
77-
<span
78-
class="action-close-text"
79-
data-bind="text: 'Close'
80-
">
81-
</span>
77+
<span class="action-close-text" translate="'Close'"></span>
8278
</button>
8379
</span>
8480
<!-- /ko -->
@@ -177,7 +173,7 @@
177173
data-action="close-advanced-select"
178174
type="button"
179175
data-bind="click: outerClick">
180-
<span data-bind="text: closeBtnLabel"></span>
176+
<span translate="closeBtnLabel"></span>
181177
</button>
182178
</div>
183179
<!-- /ko -->

‎app/code/Magento/Ui/view/base/web/templates/grid/filters/field.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
*/
66
-->
77
<label class="admin__form-field-label" attr="for: uid">
8-
<span text="label"/>
8+
<span translate="label"/>
99
</label>
1010
<div class="admin__form-field-control" render="elementTmpl"/>

‎app/code/Magento/Ui/view/base/web/templates/group/group.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
css="_required: required"
1010
attr="'data-index': index">
1111
<legend class="admin__field-label" if="showLabel">
12-
<span text="label" attr="'data-config-scope': $data.scopeLabel"/>
12+
<span translate="label" attr="'data-config-scope': $data.scopeLabel"/>
1313
</legend>
1414

1515
<div class="admin__field-control" css="$data.additionalClasses">

‎app/code/Magento/Ui/view/frontend/web/templates/form/element/helper/tooltip.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<!-- /ko -->
2222

2323
<div class="field-tooltip-content"
24-
data-target="dropdown">
25-
<!-- ko text: tooltip.description --><!-- /ko -->
24+
data-target="dropdown" translate="tooltip.description">
2625
</div>
2726
</div>

‎app/code/Magento/Ui/view/frontend/web/templates/form/field.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<label class="label" data-bind="attr: { for: element.uid }">
1010
<!-- ko if: element.label -->
11-
<span data-bind="text: element.label"></span>
11+
<span translate="element.label"></span>
1212
<!-- /ko -->
1313
</label>
1414

‎app/code/Magento/Ui/view/frontend/web/templates/group/group.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<fieldset class="field" data-bind="css: additionalClasses">
88
<legend class="label">
9-
<span data-bind="text: element.label"></span>
9+
<span translate="element.label"></span>
1010
</legend>
1111
<div class="control">
1212
<!-- ko foreach: { data: elems, as: 'element' } -->

0 commit comments

Comments
 (0)