Skip to content

Commit 315547d

Browse files
engcom-Dashengcom-Dash
authored
Merge branch '2.4-develop' into patch-3
2 parents 563dc1b + 77c589a commit 315547d

File tree

75 files changed

+19874
-20015
lines changed

Some content is hidden

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

75 files changed

+19874
-20015
lines changed

‎app/code/Magento/Msrp/view/base/web/js/msrp.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ define([
5757
closeOnMouseLeave: false,
5858
autoPosition: true,
5959
closeOnClickOutside: false,
60-
'dialogClass': 'popup map-popup-wrapper',
60+
classes: {
61+
'ui-dialog': 'popup map-popup-wrapper'
62+
},
6163
position: {
6264
my: 'left top',
6365
collision: 'fit none',

‎app/code/Magento/Msrp/view/frontend/web/js/product/list/columns/msrp-price.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ define([
2222
dialogContentClass: 'active',
2323
closeOnMouseLeave: false,
2424
autoPosition: true,
25-
dialogClass: 'popup map-popup-wrapper',
25+
classes: {
26+
'ui-dialog': 'popup map-popup-wrapper'
27+
},
2628
position: {
2729
my: 'left top',
2830
collision: 'fit none',
@@ -51,7 +53,7 @@ define([
5153
this.popupOptions.triggerTarget = $trigger;
5254

5355
$popup.dropdownDialog(this.popupOptions)
54-
.dropdownDialog('open');
56+
.dropdownDialog('open');
5557
},
5658

5759
/**

‎app/code/Magento/PageCache/Model/App/CacheIdentifierForSavePlugin.php

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?php
2+
/**
3+
* Copyright 2025 Adobe
4+
* All rights reserved.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\PageCache\Model\App;
9+
10+
use Magento\Store\Model\StoreManager;
11+
12+
/**
13+
* Class CacheIdentifierForSavePlugin
14+
*
15+
* Should add design exceptions to identifier for built-in cache when saving
16+
*/
17+
class CacheIdentifierForSavePlugin
18+
{
19+
/**
20+
* @var \Magento\Framework\View\DesignExceptions
21+
*/
22+
private $designExceptions;
23+
24+
/**
25+
* @var \Magento\Framework\App\RequestInterface
26+
*/
27+
private $request;
28+
29+
/**
30+
* @var \Magento\PageCache\Model\Config
31+
*/
32+
private $config;
33+
34+
/**
35+
* @param \Magento\Framework\View\DesignExceptions $designExceptions
36+
* @param \Magento\Framework\App\RequestInterface $request
37+
* @param \Magento\PageCache\Model\Config $config
38+
*/
39+
public function __construct(
40+
\Magento\Framework\View\DesignExceptions $designExceptions,
41+
\Magento\Framework\App\RequestInterface $request,
42+
\Magento\PageCache\Model\Config $config
43+
) {
44+
$this->designExceptions = $designExceptions;
45+
$this->request = $request;
46+
$this->config = $config;
47+
}
48+
49+
/**
50+
* Adds a theme key to identifier for a built-in cache if user-agent theme rule is actual
51+
*
52+
* @param \Magento\PageCache\Model\App\Request\Http\IdentifierForSave $identifier
53+
* @param string $result
54+
* @return string
55+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
56+
*/
57+
public function afterGetValue(\Magento\PageCache\Model\App\Request\Http\IdentifierForSave $identifier, $result)
58+
{
59+
if ($this->config->getType() === \Magento\PageCache\Model\Config::BUILT_IN && $this->config->isEnabled()) {
60+
$identifierPrefix = '';
61+
62+
$ruleDesignException = $this->designExceptions->getThemeByRequest($this->request);
63+
if ($ruleDesignException !== false) {
64+
$identifierPrefix .= 'DESIGN' . '=' . $ruleDesignException . '|';
65+
}
66+
67+
if ($runType = $this->request->getServerValue(StoreManager::PARAM_RUN_TYPE)) {
68+
$identifierPrefix .= StoreManager::PARAM_RUN_TYPE . '=' . $runType . '|';
69+
}
70+
71+
if ($runCode = $this->request->getServerValue(StoreManager::PARAM_RUN_CODE)) {
72+
$identifierPrefix .= StoreManager::PARAM_RUN_CODE . '=' . $runCode . '|';
73+
}
74+
75+
return $identifierPrefix . $result;
76+
}
77+
return $result;
78+
}
79+
}

‎app/code/Magento/PageCache/etc/di.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2015 Adobe
5+
* All rights reserved.
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
9+
<type name="Magento\Framework\App\PageCache\Identifier">
10+
<plugin name="core-app-area-design-exception-plugin" type="Magento\PageCache\Model\App\CacheIdentifierPlugin" sortOrder="10"/>
11+
</type>
12+
<type name="Magento\PageCache\Model\App\Request\Http\IdentifierForSave">
13+
<plugin name="core-app-area-design-exception-plugin-for-save" type="Magento\PageCache\Model\App\CacheIdentifierForSavePlugin" sortOrder="10"/>
14+
</type>
915
<type name="Magento\Framework\App\PageCache\Cache">
1016
<plugin name="fpc-type-plugin" type="Magento\PageCache\Model\App\PageCachePlugin"/>
1117
</type>

‎app/code/Magento/Search/view/frontend/web/js/form-mini.js

Lines changed: 58 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ define([
1212
'mage/template',
1313
'matchMedia',
1414
'jquery-ui-modules/widget',
15-
'jquery-ui-modules/core',
1615
'mage/translate'
1716
], function ($, _, mageTemplate, mediaCheck) {
1817
'use strict';
@@ -212,71 +211,71 @@ define([
212211
var keyCode = e.keyCode || e.which;
213212

214213
switch (keyCode) {
215-
case $.ui.keyCode.HOME:
216-
if (this._getFirstVisibleElement()) {
217-
this._getFirstVisibleElement().addClass(this.options.selectClass);
218-
this.responseList.selected = this._getFirstVisibleElement();
219-
}
220-
break;
214+
case $.ui.keyCode.HOME:
215+
if (this._getFirstVisibleElement()) {
216+
this._getFirstVisibleElement().addClass(this.options.selectClass);
217+
this.responseList.selected = this._getFirstVisibleElement();
218+
}
219+
break;
221220

222-
case $.ui.keyCode.END:
223-
if (this._getLastElement()) {
224-
this._getLastElement().addClass(this.options.selectClass);
225-
this.responseList.selected = this._getLastElement();
226-
}
227-
break;
221+
case $.ui.keyCode.END:
222+
if (this._getLastElement()) {
223+
this._getLastElement().addClass(this.options.selectClass);
224+
this.responseList.selected = this._getLastElement();
225+
}
226+
break;
228227

229-
case $.ui.keyCode.ESCAPE:
230-
this._resetResponseList(true);
231-
this.autoComplete.hide();
232-
break;
228+
case $.ui.keyCode.ESCAPE:
229+
this._resetResponseList(true);
230+
this.autoComplete.hide();
231+
break;
233232

234-
case $.ui.keyCode.ENTER:
235-
if (this.element.val().length >= parseInt(this.options.minSearchLength, 10)) {
236-
this.searchForm.trigger('submit');
237-
e.preventDefault();
238-
}
239-
break;
240-
241-
case $.ui.keyCode.DOWN:
242-
if (this.responseList.indexList) {
243-
if (!this.responseList.selected) { //eslint-disable-line max-depth
244-
this._getFirstVisibleElement().addClass(this.options.selectClass);
245-
this.responseList.selected = this._getFirstVisibleElement();
246-
} else if (!this._getLastElement().hasClass(this.options.selectClass)) {
247-
this.responseList.selected = this.responseList.selected
248-
.removeClass(this.options.selectClass).next().addClass(this.options.selectClass);
249-
} else {
250-
this.responseList.selected.removeClass(this.options.selectClass);
251-
this._getFirstVisibleElement().addClass(this.options.selectClass);
252-
this.responseList.selected = this._getFirstVisibleElement();
253-
}
254-
this.element.val(this.responseList.selected.find('.qs-option-name').text());
255-
this.element.attr('aria-activedescendant', this.responseList.selected.attr('id'));
256-
this._updateAriaHasPopup(true);
257-
this.autoComplete.show();
233+
case $.ui.keyCode.ENTER:
234+
if (this.element.val().length >= parseInt(this.options.minSearchLength, 10)) {
235+
this.searchForm.trigger('submit');
236+
e.preventDefault();
237+
}
238+
break;
239+
240+
case $.ui.keyCode.DOWN:
241+
if (this.responseList.indexList) {
242+
if (!this.responseList.selected) { //eslint-disable-line max-depth
243+
this._getFirstVisibleElement().addClass(this.options.selectClass);
244+
this.responseList.selected = this._getFirstVisibleElement();
245+
} else if (!this._getLastElement().hasClass(this.options.selectClass)) {
246+
this.responseList.selected = this.responseList.selected
247+
.removeClass(this.options.selectClass).next().addClass(this.options.selectClass);
248+
} else {
249+
this.responseList.selected.removeClass(this.options.selectClass);
250+
this._getFirstVisibleElement().addClass(this.options.selectClass);
251+
this.responseList.selected = this._getFirstVisibleElement();
258252
}
259-
break;
253+
this.element.val(this.responseList.selected.find('.qs-option-name').text());
254+
this.element.attr('aria-activedescendant', this.responseList.selected.attr('id'));
255+
this._updateAriaHasPopup(true);
256+
this.autoComplete.show();
257+
}
258+
break;
260259

261-
case $.ui.keyCode.UP:
262-
if (this.responseList.indexList !== null) {
263-
if (!this._getFirstVisibleElement().hasClass(this.options.selectClass)) {
264-
this.responseList.selected = this.responseList.selected
265-
.removeClass(this.options.selectClass).prev().addClass(this.options.selectClass);
260+
case $.ui.keyCode.UP:
261+
if (this.responseList.indexList !== null) {
262+
if (!this._getFirstVisibleElement().hasClass(this.options.selectClass)) {
263+
this.responseList.selected = this.responseList.selected
264+
.removeClass(this.options.selectClass).prev().addClass(this.options.selectClass);
266265

267-
} else {
268-
this.responseList.selected.removeClass(this.options.selectClass);
269-
this._getLastElement().addClass(this.options.selectClass);
270-
this.responseList.selected = this._getLastElement();
271-
}
272-
this.element.val(this.responseList.selected.find('.qs-option-name').text());
273-
this.element.attr('aria-activedescendant', this.responseList.selected.attr('id'));
274-
this._updateAriaHasPopup(true);
275-
this.autoComplete.show();
266+
} else {
267+
this.responseList.selected.removeClass(this.options.selectClass);
268+
this._getLastElement().addClass(this.options.selectClass);
269+
this.responseList.selected = this._getLastElement();
276270
}
277-
break;
278-
default:
279-
return true;
271+
this.element.val(this.responseList.selected.find('.qs-option-name').text());
272+
this.element.attr('aria-activedescendant', this.responseList.selected.attr('id'));
273+
this._updateAriaHasPopup(true);
274+
this.autoComplete.show();
275+
}
276+
break;
277+
default:
278+
return true;
280279
}
281280
},
282281

‎app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ define([
798798

799799
$widget._Rebuild();
800800

801-
if ($priceBox.is(':data(mage-priceBox)')) {
801+
if ($priceBox.data('mage-priceBox') !== undefined) {
802802
$widget._UpdatePrice();
803803
}
804804

‎app/code/Magento/Theme/view/adminhtml/requirejs-config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ var config = {
4141
'menu': 'mage/backend/menu',
4242
'jstree': 'jquery/jstree/jquery.jstree',
4343
'jquery-ui-modules/widget': 'jquery/ui',
44-
'jquery-ui-modules/core': 'jquery/ui',
4544
'jquery-ui-modules/accordion': 'jquery/ui',
4645
'jquery-ui-modules/autocomplete': 'jquery/ui',
4746
'jquery-ui-modules/button': 'jquery/ui',

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ var config = {
1111
'knockout': 'knockoutjs/knockout',
1212
'mageUtils': 'mage/utils/main',
1313
'rjsResolver': 'mage/requirejs/resolver',
14-
'jquery-ui-modules/core': 'jquery/ui-modules/core',
1514
'jquery-ui-modules/accordion': 'jquery/ui-modules/widgets/accordion',
1615
'jquery-ui-modules/autocomplete': 'jquery/ui-modules/widgets/autocomplete',
1716
'jquery-ui-modules/button': 'jquery/ui-modules/widgets/button',

‎app/code/Magento/Ui/view/base/web/js/modal/modal.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ define([
1515
'text!ui/template/modal/modal-custom.html',
1616
'Magento_Ui/js/lib/key-codes',
1717
'jquery-ui-modules/widget',
18-
'jquery-ui-modules/core',
1918
'mage/translate',
2019
'jquery/z-index'
2120
], function ($, _, template, popupTpl, slideTpl, customTpl, keyCodes) {

‎composer.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)