Merge branch '2.4-develop' into L3_PR_21-12-10

Author: veloraven

app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

@@ -69,7 +69,7 @@ define([
         }
     });
 
-    $(document).ready(function () {
+    $(function () {
         $('#system_messages .message-system-short .error').on('click', function () {
             $('#message-system-all').systemMessageDialog('openModal', 1);
         });

app/code/Magento/AdvancedSearch/view/adminhtml/web/js/testconnection.js

@@ -44,7 +44,7 @@ define([
                 fieldToCheck = this.options.fieldToCheck || 'success';
 
             element.removeClass('success').addClass('fail');
-            $.each($.parseJSON(this.options.fieldMapping), function (key, el) {
+            $.each(JSON.parse(this.options.fieldMapping), function (key, el) {
                 params[key] = $('#' + el).val();
             });
             $.ajax({

app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml

@@ -40,7 +40,7 @@ if ($isField) {
         data-role="<?=  $block->escapeHtmlAttr($id) ?>-wrapper">
         <div class="fieldset-wrapper-title admin__fieldset-wrapper-title">
             <strong <?= /* @noEscape */ $isCollapsable ?
-                'class="admin__collapsible-title" data-toggle="collapse" data-target="#' . $id . '-content"' :
+                'class="admin__collapsible-title" data-bs-toggle="collapse" data-bs-target="#' . $id . '-content"' :
                 'class="title"'; ?>>
                 <span><?= $block->escapeHtml($element->getLegend()) ?></span>
             </strong>

app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml

@@ -13,8 +13,8 @@
         <div class="fieldset-wrapper admin__collapsible-block-wrapper opened"
              id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-wrapper">
             <div class="fieldset-wrapper-title">
-                <strong class="admin__collapsible-title" data-toggle="collapse"
-                        data-target="#<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-content">
+                <strong class="admin__collapsible-title" data-bs-toggle="collapse"
+                        data-bs-target="#<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-content">
                     <span><%- data.default_title %></span>
                 </strong>
                 <div class="actions">

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml

@@ -9,7 +9,7 @@
 
 <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="manage-titles-wrapper">
     <div class="fieldset-wrapper-title">
-        <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#manage-titles-content">
+        <strong class="admin__collapsible-title" data-bs-toggle="collapse" data-bs-target="#manage-titles-content">
             <span><?= $block->escapeHtml(__('Manage Titles (Size, Color, etc.)')) ?></span>
         </strong>
     </div>

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml

@@ -16,8 +16,8 @@
         <div class="fieldset-wrapper-title">
             <strong
                 class="admin__collapsible-title"
-                data-toggle="collapse"
-                data-target="#<%- data.id %>-content">
+                data-bs-toggle="collapse"
+                data-bs-target="#<%- data.id %>-content">
                 <span id="option_<%- data.id %>_header_title"><%- data.title %></span>
             </strong>
             <div class="actions">

app/code/Magento/Catalog/view/adminhtml/web/js/custom-options.js

@@ -177,7 +177,7 @@ define([
                                     'products[]': request,
                                     'form_key': widget.options.formKey
                                 }, function ($data) {
-                                    $.parseJSON($data).each(function (el) {
+                                    $.each(JSON.parse($data), function (el) {
                                         var i;
 
                                         el.id = widget.getFreeOptionId(el.id);

app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/variations/steps/summary-grid.html

@@ -7,7 +7,7 @@
 
 <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" data-bind="mageInit: {'collapsible':{'active':true,'openedState':'opened'}}">
     <div class="fieldset-wrapper-title toggle" data-role="title">
-        <strong class="admin__collapsible-title" data-toggle="collapse" data-bind="attr:{'data-target': '#'+id}">
+        <strong class="admin__collapsible-title" data-bs-toggle="collapse" data-bind="attr:{'data-bs-target': '#'+id}">
             <span data-bind="text: title"></span>
         </strong>
     </div>

app/code/Magento/Email/view/adminhtml/web/js/variables.js

@@ -133,7 +133,7 @@ define([
                 }
                 textareaElm.focus();
                 textareaElm.scrollTop = scrollPos;
-                jQuery(textareaElm).change();
+                jQuery(textareaElm).trigger('change');
                 textareaElm = null;
             }
         }

app/code/Magento/MediaStorage/App/Media.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Media application
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -45,8 +43,6 @@ class Media implements AppInterface
     private $isAllowed;
 
     /**
-     * Media directory path
-     *
      * @var string
      */
     private $mediaDirectoryPath;
@@ -238,7 +234,10 @@ private function createLocalCopy(): void
      */
     private function checkMediaDirectoryChanged(): bool
     {
-        return rtrim($this->mediaDirectoryPath, '/') !== rtrim($this->directoryMedia->getAbsolutePath(), '/');
+        $mediaDirectoryPath = $this->mediaDirectoryPath ? rtrim($this->mediaDirectoryPath, '/') : '';
+        $directoryMediaAbsolutePath = $this->directoryMedia->getAbsolutePath();
+        $directoryMediaAbsolutePath = $directoryMediaAbsolutePath ? rtrim($directoryMediaAbsolutePath, '/') : '';
+        return $mediaDirectoryPath !== $directoryMediaAbsolutePath;
     }
 
     /**