Merge branch '2.4-develop' of https://github.com/magento/magento2ce into MC-42243

Author: dhorytskyi

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

@@ -37,7 +37,7 @@
         <div class="admin__control-table-pagination" visible="!!element.getRecordCount()">
             <div class="admin__data-grid-pager">
                 <button class="action-previous" type="button" data-bind="attr: {title: $t('Previous Page')}, click: previousPage, disable: isFirst()"></button>
-                <input class="admin__control-text" type="number" data-bind="attr: {id: ++ko.uid}, value: currentPage">
+                <input class="admin__control-text" type="number" data-bind="attr: {id: ++ko.uid}, value: currentPage"/>
                 <label class="admin__control-support-text" data-bind="attr: {for: ko.uid}, text: 'of ' + pages()"></label>
                 <button class="action-next" type="button" data-bind="attr: {title: $t('Next Page')}, click: nextPage, disable: isLast()"></button>
             </div>
@@ -86,7 +86,7 @@
     <div class="message message-notice notice">
         <span
             translate="'Search strings are either normal strings or regular expressions (PCRE). They are matched in the same order as entered.'"></span>
-        <br>
+        <br/>
         <span
             translate="'Examples'"></span>:
         <span class="code-sample">Firefox: /^mozilla/i</span>

app/code/Magento/Checkout/view/frontend/web/template/cart/shipping-estimation.html

@@ -8,7 +8,7 @@
     <fieldset class="fieldset estimate">
         <legend class="legend">
             <span data-bind="text: isVirtual ? $t('Estimate Tax') : $t('Estimate Shipping and Tax') "></span>
-        </legend><br>
+        </legend><br/>
         <p class="field note" data-bind="text: isVirtual ? $t('Enter your billing address to get a tax estimate.') : $t('Enter your destination to get a shipping estimate.')"></p>
         <!-- ko foreach: getRegion('address-fieldsets') -->
         <!-- ko template: getTemplate() --><!-- /ko -->

app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml

@@ -35,9 +35,9 @@ require([
             var uploadButton = $('#css_uploader_button');
             /** Unbind click event on file change */
             uploadButton.off('click');
-            uploadButton.removeAttr('disabled');
+            uploadButton.prop('disabled', false);
 
-            uploadButton.click(function () {
+            uploadButton.on('click', function () {
                 $('#messages').html('');
                 $(this).attr('disabled', 'disabled');
                 data.submit();

app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml

@@ -57,9 +57,9 @@ require([
             });
 
             var uploadButton = $('#js_uploader_button');
-            uploadButton.removeAttr('disabled');
+            uploadButton.prop('disabled', false);
 
-            uploadButton.click(function () {
+            uploadButton.on('click', function () {
                 $('#messages').html('');
                 $(this).attr('disabled', 'disabled');
 
@@ -121,7 +121,7 @@ require([
         }
     });
 
-    $('#js_files_uploader').click(function () {
+    $('#js_files_uploader').on('click', function () {
         /** Unbind click event on file change */
         $('#js-file-uploader').html('');
         $('#js_uploader_button').off('click');

app/code/Magento/Ui/view/base/web/templates/dynamic-rows/cells/thumbnail.html

@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 -->
-<img class = 'admin__control-thumbnail' style="max-height: 75px; max-width: 75px;" data-bind="attr: {src: $data.value}">
+<img class="admin__control-thumbnail" style="max-height: 75px; max-width: 75px;" data-bind="attr: {src: $data.value}"/>

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

@@ -5,6 +5,6 @@
  */
 -->
 <div class="admin__control-addon">
-    <input class="admin__control-text" type="text" data-bind="value: value, attr: { id: uid, disabled: disabled, name: inputName }, hasFocus: focused">
     <label class="admin__addon-prefix" data-bind="attr: { for: uid }"><span data-bind="text: currency_sign"></span></label>
+    <input class="admin__control-text" type="text" data-bind="value: value, attr: { id: uid, disabled: disabled, name: inputName }, hasFocus: focused"/>
 </div>

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

@@ -7,7 +7,7 @@
 <div class="admin__actions-switch" data-role="switcher">
     <input class="admin__actions-switch-checkbox"
            type="checkbox"
-           data-bind="checked: value, attr: { id: uid, disabled: disabled, name: inputName }, hasFocus: focused">
+           data-bind="checked: value, attr: { id: uid, disabled: disabled, name: inputName }, hasFocus: focused"/>
     <label class="admin__actions-switch-label"
            data-bind="attr: { for: uid }">
         <span data-bind="attr: {

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

@@ -17,5 +17,4 @@
         placeholder: placeholder,
         id: uid,
         disabled: disabled
-    }"
-        ></textarea>
+    }"></textarea>

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

@@ -15,7 +15,7 @@
                 event="load: $parent.onPreviewLoad.bind($parent)"
                 attr="
                     src: $parent.getFilePreview($file),
-                    alt: $file.name">
+                    alt: $file.name"/>
         </a>
 
         <div class="actions">

app/code/Magento/Ui/view/base/web/templates/grid/cells/multiselect.html

@@ -12,6 +12,6 @@
             checkedValue: $row()[$col.indexField],
             attr: {
                 id: index + 'check' + $row()[$col.indexField]
-            }">
+            }"/>
     <label attr="for: index + 'check' + $row()[$col.indexField]"></label>
 </label>