Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-1258

Author: Anna Bukatar

app/code/Magento/Backend/view/adminhtml/web/js/dashboard/chart.js

@@ -9,6 +9,7 @@ define([
     'chartJs',
     'jquery-ui-modules/widget',
     'chartjs/chartjs-adapter-moment',
+    'chartjs/es6-shim.min',
     'moment'
 ], function ($, Chart) {
     'use strict';

app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminDeleteActiveTextTermEntityTest.xml

@@ -20,6 +20,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
             <magentoCLI command="config:set checkout/options/enable_agreements 1" stepKey="setEnableTermsOnCheckout"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin" />
             <createData entity="SimpleTwo" stepKey="createdProduct"/>
@@ -30,6 +31,8 @@
             <actionGroup ref="AdminTermsConditionsSaveTermActionGroup" stepKey="saveNewTerm"/>
         </before>
         <after>
+            <!-- Disable shipping method for customer with default address -->
+            <magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
             <magentoCLI command="config:set checkout/options/enable_agreements 0" stepKey="setDisableTermsOnCheckout"/>
             <deleteData createDataKey="createdProduct" stepKey="deletedProduct"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

app/code/Magento/Swatches/view/adminhtml/web/js/form/element/swatch-visual.js

@@ -240,7 +240,7 @@ define([
                     };
 
                 swatchComponents.iframe.off('load');
-                swatchComponents.iframe.load(iframeHandler);
+                swatchComponents.iframe.on('load', iframeHandler);
                 swatchComponents.form.submit();
                 $(this).val('');
             });

app/code/Magento/Swatches/view/adminhtml/web/js/visual.js

@@ -374,7 +374,7 @@ define([
                     };
 
                 swatchComponents.iframe.off('load');
-                swatchComponents.iframe.load(iframeHandler);
+                swatchComponents.iframe.on('load', iframeHandler);
                 swatchComponents.form.submit();
                 $(this).val('');
             });

app/code/Magento/Theme/view/base/requirejs-config.js

@@ -52,7 +52,6 @@ var config = {
         }
     },
     shim: {
-        'jquery/jquery-migrate': ['jquery'],
         'mage/adminhtml/backup': ['prototype'],
         'mage/captcha': ['prototype'],
         'mage/new-gallery': ['jquery'],
@@ -76,9 +75,6 @@ var config = {
         'tinycolor': 'jquery/spectrum/tinycolor',
         'jquery-ui-modules': 'jquery/ui-modules'
     },
-    deps: [
-        'jquery/jquery-migrate'
-    ],
     config: {
         text: {
             'headers': {

app/code/Magento/Ui/view/base/requirejs-config.js

@@ -7,6 +7,7 @@ var config = {
     deps: [],
     shim: {
         'chartjs/chartjs-adapter-moment': ['moment'],
+        'chartjs/es6-shim.min': {},
         'tiny_mce_5/tinymce.min': {
             exports: 'tinyMCE'
         }

app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js

@@ -169,7 +169,7 @@ define([
          * Update image data when image preview is opened
          */
         updateImageData: function () {
-            var img = $(this.previewImageSelector + ' img');
+            var img = $(this.previewImageSelector + ' img'), self;
 
             if (!img.get(0)) {
                 setTimeout(function () {
@@ -179,10 +179,12 @@ define([
                 this.updateHeight();
                 this.scrollToPreview();
             } else {
-                img.load(function () {
-                    this.updateHeight();
-                    this.scrollToPreview();
-                }.bind(this));
+                self = this;
+
+                img.on('load', function () {
+                    self.updateHeight();
+                    self.scrollToPreview();
+                });
             }
         },
 

app/design/frontend/Magento/blank/etc/view.xml

@@ -261,6 +261,7 @@
     <exclude>
         <item type="file">Lib::chartjs/Chart.min.js</item>
         <item type="file">Lib::chartjs/chartjs-adapter-moment.js</item>
+        <item type="file">Lib::chartjs/es6-shim.min.js</item>
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery-ui.js</item>
         <item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>

app/design/frontend/Magento/luma/etc/view.xml

@@ -272,6 +272,7 @@
     <exclude>
         <item type="file">Lib::chartjs/Chart.min.js</item>
         <item type="file">Lib::chartjs/chartjs-adapter-moment.js</item>
+        <item type="file">Lib::chartjs/es6-shim.min.js</item>
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery-ui.js</item>
         <item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>

composer.json

@@ -347,8 +347,7 @@
             "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js",
             "components/jquery": [
                 "lib/web/jquery.js",
-                "lib/web/jquery/jquery.min.js",
-                "lib/web/jquery/jquery-migrate.js"
+                "lib/web/jquery/jquery.min.js"
             ],
             "blueimp/jquery-file-upload": "lib/web/jquery/fileUploader",
             "components/jqueryui": [