Merge branch 'jquery-upgrade' of github.com:magento-lynx/magento2ce into jquery-upgrade

loginesta · loginesta · commit c1a52e0fe128 · 2021-05-07T09:48:11.000+02:00
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
@@ -11,12 +11,12 @@
         <label data-bind="attr: {for: 'billing-address-same-as-shipping-' + getCode($parent)}"><span
                 data-bind="i18n: 'My billing and shipping address are the same'"></span></label>
     </div>
-    <render args="detailsTemplate"/>
+    <render args="detailsTemplate"></render>
     <fieldset class="fieldset" data-bind="visible: !isAddressDetailsVisible()">
-        <each args="getRegion('billing-address-list')" render="" />
+        <each args="getRegion('billing-address-list')" render=""></each>
         <div data-bind="fadeVisible: isAddressFormVisible">
-            <render args="formTemplate"/>
+            <render args="formTemplate"></render>
         </div>
-        <render args="actionsTemplate"/>
+        <render args="actionsTemplate"></render>
     </fieldset>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/actions.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/actions.html
@@ -9,13 +9,13 @@
         <button class="action action-update"
                 type="button"
                 click="updateAddress">
-            <span translate="'Update'"/>
+            <span translate="'Update'"></span>
         </button>
         <button class="action action-cancel"
                 type="button"
                 click="cancelAddressEdit"
                 visible="canUseCancelBillingAddress()">
-            <span translate="'Cancel'"/>
+            <span translate="'Cancel'"></span>
         </button>
     </div>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
@@ -5,15 +5,17 @@
  */
 -->
 <div if="isAddressDetailsVisible() && currentBillingAddress()" class="billing-address-details">
-    <text args="currentBillingAddress().prefix"/> <text args="currentBillingAddress().firstname"/> <text args="currentBillingAddress().middlename"/>
-    <text args="currentBillingAddress().lastname"/> <text args="currentBillingAddress().suffix"/><br/>
-    <text args="currentBillingAddress().street.join(', ')"/><br/>
-    <text args="currentBillingAddress().city "/>, <span text="currentBillingAddress().region"></span> <text args="currentBillingAddress().postcode"/><br/>
-    <text args="getCountryName(currentBillingAddress().countryId)"/><br/>
+    <text args="currentBillingAddress().prefix"></text> <text args="currentBillingAddress().firstname"></text>
+    <text args="currentBillingAddress().middlename"></text>
+    <text args="currentBillingAddress().lastname"></text> <text args="currentBillingAddress().suffix"></text><br/>
+    <text args="currentBillingAddress().street.join(', ')"></text><br/>
+    <text args="currentBillingAddress().city "></text>, <span text="currentBillingAddress().region"></span>
+    <text args="currentBillingAddress().postcode"></text><br/>
+    <text args="getCountryName(currentBillingAddress().countryId)"></text><br/>
     <a if="currentBillingAddress().telephone" attr="'href': 'tel:' + currentBillingAddress().telephone" text="currentBillingAddress().telephone"></a><br/>
 
     <each args="data: currentBillingAddress().customAttributes, as: 'element'">
-        <text args="$parent.getCustomAttributeLabel(element)"/>
+        <text args="$parent.getCustomAttributeLabel(element)"></text>
         <br/>
     </each>
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/cart/shipping-rates.html b/app/code/Magento/Checkout/view/frontend/web/template/cart/shipping-rates.html
@@ -30,7 +30,7 @@
                                 "/>
                     <label class="label" data-bind="attr: {for: 's_method_' + carrier_code + '_' + method_code}">
                         <!-- ko text: $data.method_title --><!-- /ko -->
-                        <each args="element.getRegion('price')" render="" />
+                        <each args="element.getRegion('price')" render=""></each>
                     </label>
                     <!-- /ko -->
                 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
@@ -6,7 +6,7 @@
 -->
 <div class="block-title">
     <strong>
-        <span class="text" translate="'My Cart'"/>
+        <span class="text" translate="'My Cart'"></span>
         <span
             class="qty empty"
             text="getCartParam('summary_count')"
@@ -27,24 +27,24 @@
                 },
                 click: closeMinicart()
             ">
-        <span translate="'Close'"/>
+        <span translate="'Close'"></span>
     </button>
 
     <if args="getCartParam('summary_count')">
         <div class="items-total">
-            <span class="count" if="maxItemsToDisplay < getCartLineItemsCount()" text="maxItemsToDisplay"/>
-            <translate args="'of'" if="maxItemsToDisplay < getCartLineItemsCount()"/>
-            <span class="count" text="getCartParam('summary_count')"/>
+            <span class="count" if="maxItemsToDisplay < getCartLineItemsCount()" text="maxItemsToDisplay"></span>
+            <translate args="'of'" if="maxItemsToDisplay < getCartLineItemsCount()"></translate>
+            <span class="count" text="getCartParam('summary_count')"></span>
                 <!-- ko if: (getCartParam('summary_count') > 1) -->
-                    <span translate="'Items in Cart'"/>
+                    <span translate="'Items in Cart'"></span>
                 <!--/ko-->
                 <!-- ko if: (getCartParam('summary_count') === 1) -->
-                    <span translate="'Item in Cart'"/>
+                    <span translate="'Item in Cart'"></span>
                 <!--/ko-->
         </div>
 
-        <each args="getRegion('subtotalContainer')" render=""/>
-        <each args="getRegion('extraInfo')" render=""/>
+        <each args="getRegion('subtotalContainer')" render=""></each>
+        <each args="getRegion('extraInfo')" render=""></each>
 
         <div class="actions" if="getCartParam('possible_onepage_checkout')">
             <div class="primary">
@@ -59,34 +59,32 @@
                             },
                             click: closeMinicart()
                         "
-                        translate="'Proceed to Checkout'"
-                />
+                        translate="'Proceed to Checkout'">
+                </button>
                 <div data-bind="html: getCartParamUnsanitizedHtml('extra_actions')"></div>
             </div>
         </div>
     </if>
 
     <if args="getCartParam('summary_count')">
-        <strong class="subtitle" translate="'Recently added item(s)'"/>
+        <strong class="subtitle" translate="'Recently added item(s)'"></strong>
         <div data-action="scroll" class="minicart-items-wrapper">
             <ol id="mini-cart" class="minicart-items" data-bind="foreach: { data: getCartItems(), as: 'item' }">
                 <each args="$parent.getRegion($parent.getItemRenderer(item.product_type))"
-                      render="{name: getTemplate(), data: item, afterRender: function() {$parents[1].initSidebar()}}"
-                />
+                      render="{name: getTemplate(), data: item, afterRender: function() {$parents[1].initSidebar()}}"></each>
             </ol>
         </div>
     </if>
 
     <ifnot args="getCartParam('summary_count')">
         <strong class="subtitle empty"
-                translate="'You have no items in your shopping cart.'"
-        />
+                translate="'You have no items in your shopping cart.'"></strong>
         <if args="getCartParam('cart_empty_message')">
-            <p class="minicart empty text" text="getCartParam('cart_empty_message')"/>
+            <p class="minicart empty text" text="getCartParam('cart_empty_message')"></p>
             <div class="actions">
                 <div class="secondary">
                     <a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}">
-                        <span translate="'View and Edit Cart'"/>
+                        <span translate="'View and Edit Cart'"></span>
                     </a>
                 </div>
             </div>
@@ -96,13 +94,13 @@
     <div class="actions" if="getCartParam('summary_count')">
         <div class="secondary">
             <a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}">
-                <span translate="'View and Edit Cart'"/>
+                <span translate="'View and Edit Cart'"></span>
             </a>
         </div>
     </div>
 
     <div id="minicart-widgets" class="minicart-widgets" if="regionHasElements('promotion')">
-        <each args="getRegion('promotion')" render=""/>
+        <each args="getRegion('promotion')" render=""></each>
     </div>
 </div>
-<each args="getRegion('sign-in-popup')" render=""/>
+<each args="getRegion('sign-in-popup')" render=""></each>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
@@ -82,7 +82,7 @@
                            }, value: qty"
                            type="number"
                            size="4"
-                           class="item-qty cart-item-qty">
+                           class="item-qty cart-item-qty"/>
                     <button data-bind="attr: {
                            id: 'update-cart-item-'+item_id,
                            'data-cart-item': item_id,
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html b/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html
@@ -13,7 +13,7 @@
              class="step-title"
              data-role="title">
         </div>
-        <each args="data: getRegion($group().displayArea), as: 'method'" render=""/>
+        <each args="data: getRegion($group().displayArea), as: 'method'" render=""></each>
     </div>
 </div>
 <div ifnot="isPaymentMethodsAvailable()"
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/registration.html b/app/code/Magento/Checkout/view/frontend/web/template/registration.html
@@ -12,7 +12,7 @@
     <p data-bind="i18n: 'You can track your order status by creating an account.'"></p>
     <p><span data-bind="i18n: 'Email Address'"></span>: <span data-bind="text: getEmailAddress()"></span></p>
     <a class="action primary" data-bind="attr: { href: getUrl() }">
-        <span data-bind="i18n: 'Create an Account'" />
+        <span data-bind="i18n: 'Create an Account'"></span>
     </a>
     <!--/ko-->
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
@@ -5,15 +5,15 @@
  */
 -->
 <div class="shipping-address-item" css="'selected-item' : isSelected() , 'not-selected-item':!isSelected()">
-    <text args="address().prefix"/> <text args="address().firstname"/> <text args="address().middlename"/>
-    <text args="address().lastname"/> <text args="address().suffix"/><br/>
-    <text args="_.values(address().street).join(', ')"/><br/>
-    <text args="address().city "/>, <span text="address().region"></span> <text args="address().postcode"/><br/>
-    <text args="getCountryName(address().countryId)"/><br/>
+    <text args="address().prefix"></text> <text args="address().firstname"></text> <text args="address().middlename"></text>
+    <text args="address().lastname"></text> <text args="address().suffix"></text><br/>
+    <text args="_.values(address().street).join(', ')"></text><br/>
+    <text args="address().city "></text>, <span text="address().region"></span> <text args="address().postcode"></text><br/>
+    <text args="getCountryName(address().countryId)"></text><br/>
     <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
 
     <each args="data: address().customAttributes, as: 'element'">
-        <text args="$parent.getCustomAttributeLabel(element)"/>
+        <text args="$parent.getCustomAttributeLabel(element)"></text>
         <br/>
     </each>
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html
@@ -17,15 +17,15 @@
     </td>
     <!-- ko ifnot: (method.error_message) -->
     <td class="col col-price">
-        <each args="element.getRegion('price')" render="" />
+        <each args="element.getRegion('price')" render=""></each>
     </td>
     <!-- /ko -->
     <td class="col col-method"
         attr="'id': 'label_method_' + method.method_code + '_' + method.carrier_code"
-        text="method.method_title" />
+        text="method.method_title"></td>
     <td class="col col-carrier"
         attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code"
-        text="method.carrier_title" />
+        text="method.carrier_title"></td>
 </tr>
 <tr class="row row-error"
     if="method.error_message">
@@ -35,7 +35,7 @@
         </div>
         <span class="no-display">
             <input type="radio"
-                   attr="'value' : method.method_code, 'id': 's_method_' + method.method_code" />
+                   attr="'value' : method.method_code, 'id': 's_method_' + method.method_code">
         </span>
     </td>
 </tr>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
@@ -5,15 +5,15 @@
  */
 -->
 <if args="visible()">
-    <text args="address().prefix"/> <text args="address().firstname"/> <text args="address().middlename"/>
-    <text args="address().lastname"/> <text args="address().suffix"/><br/>
-    <text args="_.values(address().street).join(', ')"/><br/>
-    <text args="address().city "/>, <span text="address().region"></span> <text args="address().postcode"/><br/>
-    <text args="getCountryName(address().countryId)"/><br/>
+    <text args="address().prefix"></text> <text args="address().firstname"></text> <text args="address().middlename"></text>
+    <text args="address().lastname"></text> <text args="address().suffix"></text><br/>
+    <text args="_.values(address().street).join(', ')"></text><br/>
+    <text args="address().city "></text>, <span text="address().region"></span> <text args="address().postcode"></text><br/>
+    <text args="getCountryName(address().countryId)"></text><br/>
     <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
 
     <each args="data: address().customAttributes, as: 'element'">
-        <text args="$parent.getCustomAttributeLabel(element)"/>
+        <text args="$parent.getCustomAttributeLabel(element)"></text>
         <br/>
     </each>
 </if>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html
@@ -7,11 +7,11 @@
 <div class="block items-in-cart" data-bind="mageInit: {'collapsible':{'openedState': 'active', 'active': isItemsBlockExpanded()}}">
     <div class="title" data-role="title">
         <strong role="heading" aria-level="1">
-            <translate args="maxCartItemsToDisplay" if="maxCartItemsToDisplay < getCartLineItemsCount()"/>
-            <translate args="'of'" if="maxCartItemsToDisplay < getCartLineItemsCount()"/>
+            <translate args="maxCartItemsToDisplay" if="maxCartItemsToDisplay < getCartLineItemsCount()"></translate>
+            <translate args="'of'" if="maxCartItemsToDisplay < getCartLineItemsCount()"></translate>
             <span data-bind="text: getCartSummaryItemsCount()"></span>
-            <translate args="'Item in Cart'" if="getCartSummaryItemsCount() === 1"/>
-            <translate args="'Items in Cart'" if="getCartSummaryItemsCount() > 1"/>
+            <translate args="'Item in Cart'" if="getCartSummaryItemsCount() === 1"></translate>
+            <translate args="'Items in Cart'" if="getCartSummaryItemsCount() > 1"></translate>
         </strong>
     </div>
     <div class="content minicart-items" data-role="content">
@@ -20,7 +20,7 @@
                 <each args="items()">
                     <li class="product-item">
                         <div class="product">
-                            <each args="$parent.elems()" render=""/>
+                            <each args="$parent.elems()" render=""></each>
                         </div>
                     </li>
                 </each>
diff --git a/app/code/Magento/InstantPurchase/view/frontend/web/template/instant-purchase.html b/app/code/Magento/InstantPurchase/view/frontend/web/template/instant-purchase.html
@@ -9,7 +9,7 @@
             class="action primary instant-purchase"
             click="instantPurchase"
             attr="title: $t(buttonText)">
-        <span translate="buttonText" />
+        <span translate="buttonText"></span>
     </button>
     <input if="paymentToken()"
            type="hidden"
diff --git a/app/code/Magento/Ui/view/base/web/templates/collection.html b/app/code/Magento/Ui/view/base/web/templates/collection.html
@@ -5,5 +5,5 @@
  */
 -->
 <each args="data: elems, as: 'element'">
-    <render if="hasTemplate()"/>
+    <render if="hasTemplate()"></render>
 </each>
diff --git a/app/code/Magento/Ui/view/frontend/web/templates/form/element/select.html b/app/code/Magento/Ui/view/frontend/web/templates/form/element/select.html
@@ -25,4 +25,4 @@
             ko.applyBindingsToNode(option, {attr: {disabled: true}}, item);
         }
     }"
-/>
+></select>
diff --git a/app/code/Magento/Ui/view/frontend/web/templates/form/field.html b/app/code/Magento/Ui/view/frontend/web/templates/form/field.html
@@ -33,19 +33,19 @@
 
         <!-- ko if: element.notice -->
             <div class="field-note" data-bind="attr: { id: element.noticeId }">
-                <span data-bind="text: element.notice"/>
+                <span data-bind="text: element.notice"></span>
             </div>
         <!-- /ko -->
 
         <!-- ko if: element.error() -->
             <div class="field-error" data-bind="attr: { id: element.errorId }" generated="true">
-                <span data-bind="text: element.error"/>
+                <span data-bind="text: element.error"></span>
             </div>
         <!-- /ko -->
 
         <!-- ko if: element.warn() -->
             <div role="alert" class="message warning" data-bind="attr: { id: element.warningId }" generated="true">
-                <span data-bind="text: element.warn"/>
+                <span data-bind="text: element.warn"></span>
             </div>
         <!-- /ko -->
     </div>
