Skip to content

Commit 12c378c

Browse files
slopukhovslopukhov
committed
Merge branch '2.4-develop' of github.com:magento-commerce/magento2ce into MCP-304
2 parents 520b25a + f649184 commit 12c378c

File tree

64 files changed

+149
-149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+149
-149
lines changed

‎app/code/Magento/AdminNotification/view/adminhtml/web/template/grid/listing.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99
<div class="message-system-short">
1010
<button class="message-system-action-dropdown" toggleCollapsible>
1111
<span>
12-
<translate args="'System Messages'"/>:
13-
<text args="totalRecords"/>
12+
<translate args="'System Messages'"></translate>:
13+
<text args="totalRecords"></text>
1414
</span>
1515
</button>
1616
<div class="message-system-short-wrapper" if="rows[0]" repeat="foreach: [rows[0]], item: '$row'" visible="!$collapsible.opened()">
1717
<fastForEach args="data: getVisible(), as: '$col'" >
18-
<render args="$col.getBody()"/>
18+
<render args="$col.getBody()"></render>
1919
</fastForEach>
2020
</div>
2121
</div>
2222
<div class="message-system-collapsible">
2323
<ul class="message-system-list">
2424
<li repeat="foreach: rows, item: '$row'">
2525
<fastForEach args="data: getVisible(), as: '$col'" >
26-
<render args="$col.getBody()"/>
26+
<render args="$col.getBody()"></render>
2727
</fastForEach>
2828
</li>
2929
</ul>

‎app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99
<div class="message-system-short">
1010
<button class="message-system-action-dropdown" toggleCollapsible>
1111
<span>
12-
<translate args="'System Messages'"/>:
13-
<text args="totalRecords"/>
12+
<translate args="'System Messages'"></translate>:
13+
<text args="totalRecords"></text>
1414
</span>
1515
</button>
1616
<div class="message-system-short-wrapper" if="rows[0]" repeat="foreach: [rows[0]], item: '$row'" visible="!$collapsible.opened()">
1717
<fastForEach args="data: getVisible(), as: '$col'" >
18-
<render args="$col.getBody()"/>
18+
<render args="$col.getBody()"></render>
1919
</fastForEach>
2020
</div>
2121
</div>
2222
<div class="message-system-collapsible">
2323
<ul class="message-system-list">
2424
<li repeat="foreach: rows, item: '$row'">
2525
<fastForEach args="data: getVisible(), as: '$col'" >
26-
<render args="$col.getBody()"/>
26+
<render args="$col.getBody()"></render>
2727
</fastForEach>
2828
</li>
2929
</ul>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</div>
1212

1313
<div class="admin__field-complex-elements">
14-
<render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
14+
<render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"></render>
1515
<button attr="{disabled: disabled}"
1616
class="action-secondary"
1717
type="button"

‎app/code/Magento/Bundle/view/base/web/template/product/final_price.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@
77
<if args="hasPriceRange($row())">
88
<div class="price-from">
99
<with args="getPriceByCode('minimal_price')">
10-
<render args="getBody()" />
10+
<render args="getBody()" ></render>
1111
</with>
1212
<with args="getPriceByCode('minimal_regular_price')">
13-
<render args="getBody()" />
13+
<render args="getBody()" ></render>
1414
</with>
1515
</div>
1616
<div class="price-to">
1717
<with args="getPriceByCode('max_price')">
18-
<render args="getBody()" />
18+
<render args="getBody()" ></render>
1919
</with>
2020
<with args="getPriceByCode('max_regular_price')">
21-
<render args="getBody()" />
21+
<render args="getBody()" ></render>
2222
</with>
2323
</div>
2424
</if>
2525

2626
<ifnot args="hasPriceRange($row())">
2727
<with args="getPriceByCode('minimal_price')">
28-
<render args="getBody()" />
28+
<render args="getBody()" ></render>
2929
</with>
3030
<with args="getPriceByCode('minimal_regular_price')">
31-
<render args="getBody()" />
31+
<render args="getBody()" ></render>
3232
</with>
3333
</ifnot>

‎app/code/Magento/Bundle/view/base/web/template/product/price/minimal_price.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
html="getMinimalPriceUnsanitizedHtml($row())"></span>
2020

2121
<each args="data: getAdjustments(), as: '$adj'">
22-
<render args="$adj.getBody()"/>
22+
<render args="$adj.getBody()"></render>
2323
</each>
2424
</span>
2525
</if>

‎app/code/Magento/Catalog/view/adminhtml/web/template/attributes/grid/paging.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<span text="label"></span>
1111
</li>
1212
<li class="attributes-found">
13-
<text args="totalRecords"/> records found
14-
<text args="'(' + totalSelected + ' selected)'" if="totalSelected"/>
13+
<text args="totalRecords"></text> records found
14+
<text args="'(' + totalSelected + ' selected)'" if="totalSelected"></text>
1515
</li>
1616
</ul>

‎app/code/Magento/Catalog/view/adminhtml/web/template/form/field.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
</label>
1414
<div class="admin__field-control"
1515
css="'_with-tooltip': $data.tooltip, '_with-reset': $data.showFallbackReset && $data.isDifferedFromDefault">
16-
<render args="elementTmpl" ifnot="hasAddons()"/>
16+
<render args="elementTmpl" ifnot="hasAddons()"></render>
1717

1818
<div class="admin__control-addon" if="hasAddons()">
19-
<render args="elementTmpl"/>
19+
<render args="elementTmpl"></render>
2020

2121
<label class="admin__addon-prefix" if="addBefore()" attr="for: uid">
2222
<span text="addBefore()"></span>
@@ -26,9 +26,9 @@
2626
</label>
2727
</div>
2828

29-
<render args="tooltipTpl" if="$data.tooltip"/>
29+
<render args="tooltipTpl" if="$data.tooltip"></render>
3030

31-
<render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
31+
<render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"></render>
3232

3333
<label class="admin__field-error" if="error" attr="for: uid" text="error"></label>
3434

@@ -42,6 +42,6 @@
4242
<!-- /ko -->
4343
<!-- /ko -->
4444

45-
<render args="$data.service.template" if="$data.hasService()"/>
45+
<render args="$data.service.template" if="$data.hasService()"></render>
4646
</div>
4747
</div>

‎app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html

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

3434
<div class="file-uploader-filename" text="$file.name"></div>
3535
<div class="file-uploader-meta">
36-
<text args="$file.previewWidth"/>x<text args="$file.previewHeight"/>,
37-
<text args="$parent.formatSize($file.size)"/>
36+
<text args="$file.previewWidth"></text>x<text args="$file.previewHeight"></text>,
37+
<text args="$parent.formatSize($file.size)"></text>
3838
</div>
3939
</div>

‎app/code/Magento/Catalog/view/base/web/template/product/list/listing.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,35 @@
1717
<li class="product-item" repeat="foreach: filteredRows, item: '$row'">
1818
<div class="product-item-info">
1919
<fastForEach args="data: getRegion('general-area'), as: '$col'" >
20-
<render args="$col.getBody()"/>
20+
<render args="$col.getBody()"></render>
2121
</fastForEach>
2222

2323
<div class="product-item-details">
2424
<fastForEach args="data: getRegion('details-area'), as: '$col'" >
25-
<render args="$col.getBody()"/>
25+
<render args="$col.getBody()"></render>
2626
</fastForEach>
2727

2828
<div if="regionHasElements('action-primary-area') || regionHasElements('action-secondary-area')"
2929
class="product-item-actions">
3030
<div class="actions-primary" if="regionHasElements('action-primary-area')">
3131
<fastForEach args="data: getRegion('action-primary-area'), as: '$col'" >
32-
<render args="$col.getBody()"/>
32+
<render args="$col.getBody()"></render>
3333
</fastForEach>
3434
</div>
3535

3636
<div if="regionHasElements('action-secondary-area')"
3737
class="actions-secondary"
3838
data-role="add-to-links">
3939
<fastForEach args="data: getRegion('action-secondary-area'), as: '$col'" >
40-
<render args="$col.getBody()"/>
40+
<render args="$col.getBody()"></render>
4141
</fastForEach>
4242
</div>
4343
</div>
4444

4545
<div if="regionHasElements('description-area')"
4646
class="product-item-description">
4747
<fastForEach args="data: getRegion('description-area'), as: '$col'" >
48-
<render args="$col.getBody()"/>
48+
<render args="$col.getBody()"></render>
4949
</fastForEach>
5050
</div>
5151
</div>

‎app/code/Magento/Catalog/view/base/web/template/product/price/max_price.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
html="getMaxPriceUnsanitizedHtml($row())"></span>
2020

2121
<each args="data: getAdjustments('max_price'), as: '$adj'">
22-
<render args="$adj.getBody()"/>
22+
<render args="$adj.getBody()"></render>
2323
</each>
2424
</span>
2525

‎app/code/Magento/Catalog/view/base/web/template/product/price/price_box.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
if="isAllowed()">
99
<each args="data: getPrices($row()), as: '$price'">
1010
<with args="$price">
11-
<render args="getBody()"/>
11+
<render args="getBody()"></render>
1212
</with>
1313
</each>
1414
</div>

‎app/code/Magento/Catalog/view/base/web/template/product/price/pricetype_box.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
*/
66
-->
77
<with args="getPrice($row())">
8-
<render args="getBody()"/>
8+
<render args="getBody()"></render>
99
</with>

‎app/code/Magento/Catalog/view/base/web/template/product/price/regular_price.html

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

2323
<if args="!hasSpecialPrice($row())">
2424
<each args="data: getAdjustments(), as: '$adj'">
25-
<render args="$adj.getBody()"/>
25+
<render args="$adj.getBody()"></render>
2626
</each>
2727
</if>
2828
</span>

‎app/code/Magento/Catalog/view/base/web/template/product/price/special_price.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
html="getPriceUnsanitizedHtml($row())"></span>
2121

2222
<each args="data: getAdjustments(), as: '$adj'">
23-
<render args="$adj.getBody()"/>
23+
<render args="$adj.getBody()"></render>
2424
</each>
2525
</span>
2626
</span>

‎app/code/Magento/Catalog/view/frontend/web/template/product/addtocart-button.html

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

1818
<if args="isAvailable($row()) === false">
1919
<div class="stock unavailable">
20-
<text args="$t('Availability')"/>
20+
<text args="$t('Availability')"></text>
2121
<span translate="'Out of stock'"></span>
2222
</div>
2323
</if>

‎app/code/Magento/Checkout/view/frontend/web/template/shipping.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
class="step-content"
1111
data-role="content">
1212

13-
<each if="!quoteIsVirtual" args="getRegion('customer-email')" render="" />
14-
<each args="getRegion('address-list')" render="" />
15-
<each args="getRegion('address-list-additional-addresses')" render="" />
13+
<each if="!quoteIsVirtual" args="getRegion('customer-email')" render="" ></each>
14+
<each args="getRegion('address-list')" render="" ></each>
15+
<each args="getRegion('address-list-additional-addresses')" render="" ></each>
1616

1717
<!-- Address form pop up -->
1818
<if args="!isFormInline">
@@ -29,10 +29,10 @@
2929
render="shippingFormTemplate"></div>
3030
</if>
3131

32-
<each args="getRegion('before-form')" render="" />
32+
<each args="getRegion('before-form')" render="" ></each>
3333

3434
<!-- Inline address form -->
35-
<render if="isFormInline" args="shippingFormTemplate"/>
35+
<render if="isFormInline" args="shippingFormTemplate"></render>
3636
</div>
3737
</li>
3838

@@ -46,7 +46,7 @@
4646
translate="'Shipping Methods'"
4747
data-role="title"></div>
4848

49-
<each args="getRegion('before-shipping-method-form')" render="" />
49+
<each args="getRegion('before-shipping-method-form')" render="" ></each>
5050

5151
<div id="checkout-step-shipping_method"
5252
class="step-content"
@@ -59,10 +59,10 @@
5959
submit="setShippingInformation"
6060
novalidate="novalidate">
6161

62-
<render args="shippingMethodListTemplate"/>
62+
<render args="shippingMethodListTemplate"></render>
6363

6464
<div id="onepage-checkout-shipping-method-additional-load">
65-
<each args="getRegion('shippingAdditional')" render="" />
65+
<each args="getRegion('shippingAdditional')" render="" ></each>
6666
</div>
6767
<div role="alert"
6868
if="errorValidationMessage().length"

‎app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/components/file-uploader.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<img class="file-uploader-image" attr="src: $data.thumbnailUrl()"/>
1515
<!-- /ko -->
1616
<!-- ko if: !$data.processedFile().url && !$data.thumbnail() -->
17-
<text args="$data.processedFile().name"/>
17+
<text args="$data.processedFile().name"></text>
1818
<!-- /ko -->
1919
<div class="file-uploader-area">
2020
<input type="file"

‎app/code/Magento/ConfigurableProduct/view/frontend/web/template/product/minimal_price.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</ifnot>
2121

2222
<each args="data: getAdjustments(), as: '$adj'">
23-
<render args="$adj.getBody()"/>
23+
<render args="$adj.getBody()"></render>
2424
</each>
2525
</ifnot>
2626
</span>

‎app/code/Magento/Customer/view/adminhtml/web/template/default-address.html

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,46 @@
88
<div data-bind="attr: {class: 'fieldset-wrapper address-information ' + defaultAddressClass}">
99
<address>
1010
<div class="address_caption">
11-
<text args="title"/>
11+
<text args="title"></text>
1212
<each args="data: elems, as: 'element'">
13-
<render if="hasTemplate()"/>
13+
<render if="hasTemplate()"></render>
1414
</each>
1515
</div>
1616
<div class="address_details" ifnot="_.isEmpty($data.address)">
17-
<text args="address.prefix" if="address.prefix"/>
18-
<text args="address.firstname"/>
19-
<text args="address.middlename" if="address.middlename"/>
20-
<text args="address.lastname"/>
21-
<text args="address.suffix" if="address.suffix"/>
17+
<text args="address.prefix" if="address.prefix"></text>
18+
<text args="address.firstname"></text>
19+
<text args="address.middlename" if="address.middlename"></text>
20+
<text args="address.lastname"></text>
21+
<text args="address.suffix" if="address.suffix"></text>
2222
<br/>
2323
<if args="address.company">
24-
<text args="address.company"/>
24+
<text args="address.company"></text>
2525
<br/>
2626
</if>
2727
<if args="address.street">
28-
<text args="address.street" if="_.isString(address.street)"/>
28+
<text args="address.street" if="_.isString(address.street)"></text>
2929
<text args="_.filter(_.values(address.street), function (value) { return _.isString(value)}).join(', ')"
30-
ifnot="_.isString(address.street)"/>
30+
ifnot="_.isString(address.street)"></text>
3131
<br/>
3232
</if>
33-
<text args="address.city + ', '" if="address.city"/>
34-
<text args="address.region + ', '" if="address.region"/>
33+
<text args="address.city + ', '" if="address.city"></text>
34+
<text args="address.region + ', '" if="address.region"></text>
3535
<if args="address.postcode">
36-
<text args="address.postcode"/>
36+
<text args="address.postcode"></text>
3737
<br/>
3838
</if>
39-
<text args="address.country"/>
39+
<text args="address.country"></text>
4040
<if args="address.telephone">
4141
<br/>T: <a attr="href: 'tel:' + address.telephone" text="address.telephone"></a>
4242
</if>
4343
<if args="address.fax">
44-
<br/>F: <text args="address.fax"/>
44+
<br/>F: <text args="address.fax"></text>
4545
</if>
4646
<if args="address.vat_id">
47-
<br/>VAT: <text args="address.vat_id"/>
47+
<br/>VAT: <text args="address.vat_id"></text>
4848
</if>
4949
</div>
50-
<translate args="notExistsMessage" if="_.isEmpty($data.address)"/>
50+
<translate args="notExistsMessage" if="_.isEmpty($data.address)"></translate>
5151
</address>
5252
</div>
5353
</div>

‎app/code/Magento/Downloadable/view/adminhtml/web/template/components/file-uploader.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<div class="file-uploader-summary">
1212
<div class="file-uploader-filename">
1313
<!-- ko if: $file.url --><a attr="href: $file.url" target="_blank" text="$file.name"></a><!-- /ko -->
14-
<!-- ko if: !$file.url --><text args="$file.name"/><!-- /ko -->
15-
(<text args="$parent.formatSize($file.size)"/>)
14+
<!-- ko if: !$file.url --><text args="$file.name"></text><!-- /ko -->
15+
(<text args="$parent.formatSize($file.size)"></text>)
1616
</div>
1717
</div>
1818
</each>

‎app/code/Magento/GroupedProduct/view/base/web/template/product/price/minimal_price.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
html="getPriceUnsanitizedHtml($row())"></span>
1919

2020
<each args="data: getAdjustments(), as: '$adj'">
21-
<render args="$adj.getBody()"/>
21+
<render args="$adj.getBody()"></render>
2222
</each>
2323
</span>
2424
</div>

0 commit comments

Comments
 (0)