Skip to content

Commit 8b216c5

Browse files
sivaschenkosivaschenko
committed
Merge branch '2.4-develop' of github.com:magento-commerce/magento2ce into magento-coding-standard-v14
2 parents 162c374 + a262a50 commit 8b216c5

File tree

183 files changed

+38563
-43177
lines changed

Some content is hidden

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

183 files changed

+38563
-43177
lines changed

‎app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaCheckoutWithEnabledCaptchaTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRate"/>
6060
<actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="goToReview"/>
6161
<actionGroup ref="AssertCaptchaVisibleOnSecondCheckoutStepActionGroup" stepKey="assertCaptchaIsVisible"/>
62+
<waitForLoadingMaskToDisappear stepKey="waitForSpinner"/>
6263
<actionGroup ref="StorefrontFillCaptchaFieldOnCheckoutActionGroup" stepKey="placeOrderWithIncorrectValue">
6364
<argument name="captcha" value="{{WrongCaptcha.value}}"/>
6465
</actionGroup>

‎app/code/Magento/Captcha/view/frontend/web/js/action/refresh.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ define([
1212
return $.ajax({
1313
url: urlBuilder.build(refreshUrl),
1414
type: 'POST',
15-
async: false,
1615
data: JSON.stringify({
1716
'formId': formId
1817
}),

‎app/code/Magento/Captcha/view/frontend/web/js/captcha.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ define([
4242
$.ajax({
4343
url: this.options.url,
4444
type: 'post',
45-
async: false,
4645
dataType: 'json',
4746
context: this,
4847
data: {

‎app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection/StorefrontCategorySidebarSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<element name="removeFilter" type="button" selector="div.filter-current .remove" timeout="30"/>
1818
<element name="activeFilterOptions" type="text" selector=".filter-options-item.active .items"/>
1919
<element name="activeFilterOptionItemByPosition" type="text" selector=".filter-options-item.active .items li:nth-child({{itemPosition}}) a" parameterized="true" timeout="30"/>
20-
<element name="enabledFilterOptionItemByLabel" type="text" selector="//div[@class='filter-options']//li[@class='item']//a[contains(text(), '{{optionLabel}}')]" parameterized="true" timeout="30"/>
21-
<element name="disabledFilterOptionItemByLabel" type="text" selector="//div[@class='filter-options']//li[@class='item' and contains(text(), '{{optionLabel}}')]" parameterized="true" timeout="30"/>
20+
<element name="enabledFilterOptionItemByLabel" type="text" selector="//div[contains(@class, 'filter-options')]//li[@class='item']//a[contains(text(), '{{optionLabel}}')]" parameterized="true" timeout="30"/>
21+
<element name="disabledFilterOptionItemByLabel" type="text" selector="//div[contains(@class, 'filter-options')]//li[@class='item' and contains(text(), '{{optionLabel}}')]" parameterized="true" timeout="30"/>
2222
<element name="visibleOptionQty" type="text" selector=".filter-options-item.active .items li:nth-child({{itemPosition}}) a .count" parameterized="true" timeout="30"/>
2323
</section>
2424
</sections>

‎app/code/Magento/Catalog/view/adminhtml/web/catalog/product-attributes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ define([
5252
doc.execCommand('stop');
5353
self.iframe.remove();
5454
}
55-
self.modal.data('modal').modal.remove();
55+
self.modal.data('mageModal').modal.remove();
5656
$(window).off('resize.modal');
5757
}
5858
});
@@ -63,7 +63,7 @@ define([
6363
* @private
6464
*/
6565
_getHeight: function () {
66-
var modal = this.modal.data('modal').modal,
66+
var modal = this.modal.data('mageModal').modal,
6767
modalHead = modal.find('header'),
6868
modalHeadHeight = modalHead.outerHeight(),
6969
modalHeight = modal.outerHeight(),

‎app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermNewSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
<element name="numberOfUses" type="button" selector="#popularity"/>
1616
<element name="redirectUrl" type="text" selector="//div[@class='admin__field-control control']/input[@id='redirect']"/>
1717
<element name="displayInSuggestedTerm" type="select" selector="//select[@name='display_in_terms']"/>
18-
<element name="saveSearchButton" type="button" selector="//button[@id='save']/span[@class='ui-button-text']" timeout="30"/>
18+
<element name="saveSearchButton" type="button" selector="//button[@id='save']/span" timeout="30"/>
1919
</section>
20-
</sections>
20+
</sections>

‎app/code/Magento/JwtUserToken/Model/ResourceModel/RevokedRepository.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ class RevokedRepository implements RevokedRepositoryInterface
2828
/**
2929
* @param ResourceConnection $resourceConnection
3030
*/
31-
public function __construct(ResourceConnection $resourceConnection) {
31+
public function __construct(ResourceConnection $resourceConnection)
32+
{
3233
$this->connection = $resourceConnection;
3334
}
3435

@@ -38,7 +39,7 @@ public function __construct(ResourceConnection $resourceConnection) {
3839
public function saveRevoked(Revoked $revoked): void
3940
{
4041
$conn = $this->getAdapter();
41-
$table = $conn->getTableName(self::TABLE);
42+
$table = $conn->getTableName($this->connection->getTableName(self::TABLE));
4243

4344
$conn->insertOnDuplicate($table, $revoked->getData(), array_keys($revoked->getData()));
4445
}
@@ -49,7 +50,7 @@ public function saveRevoked(Revoked $revoked): void
4950
public function findRevoked(int $userTypeId, int $userId): ?Revoked
5051
{
5152
$conn = $this->getAdapter();
52-
$table = $conn->getTableName(self::TABLE);
53+
$table = $conn->getTableName($this->connection->getTableName(self::TABLE));
5354

5455
$data = $conn->fetchRow(
5556
$conn->select()
@@ -64,6 +65,11 @@ public function findRevoked(int $userTypeId, int $userId): ?Revoked
6465
return null;
6566
}
6667

68+
/**
69+
* Resource connection
70+
*
71+
* @return AdapterInterface
72+
*/
6773
private function getAdapter(): AdapterInterface
6874
{
6975
return $this->connection->getConnection(ResourceConnection::DEFAULT_CONNECTION);

‎app/code/Magento/Sales/view/adminhtml/web/order/create/giftmessage.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,10 @@ define([
203203

204204
var topMargin = jQuery(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 30;
205205

206-
jQuery(this).closest('.ui-dialog').css('margin-top', topMargin);
206+
jQuery(this).closest('.ui-dialog').css({
207+
'margin-top' : topMargin,
208+
'z-index': 1000
209+
});
207210
},
208211
close: function () {
209212
jQuery(this).closest('.ui-dialog').removeClass('ui-dialog-active');

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,6 @@ var config = {
8989
'mage/adminhtml/globals'
9090
],
9191
'paths': {
92-
'jquery/ui': 'jquery/jquery-ui-1.9.2'
92+
'jquery/ui': 'jquery/jquery-ui'
9393
}
9494
};

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

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,42 @@ var config = {
1010
'ko': 'knockoutjs/knockout',
1111
'knockout': 'knockoutjs/knockout',
1212
'mageUtils': 'mage/utils/main',
13-
'rjsResolver': 'mage/requirejs/resolver'
13+
'rjsResolver': 'mage/requirejs/resolver',
14+
'jquery-ui-modules/core': 'jquery/ui-modules/core',
15+
'jquery-ui-modules/accordion': 'jquery/ui-modules/widgets/accordion',
16+
'jquery-ui-modules/autocomplete': 'jquery/ui-modules/widgets/autocomplete',
17+
'jquery-ui-modules/button': 'jquery/ui-modules/widgets/button',
18+
'jquery-ui-modules/datepicker': 'jquery/ui-modules/widgets/datepicker',
19+
'jquery-ui-modules/dialog': 'jquery/ui-modules/widgets/dialog',
20+
'jquery-ui-modules/draggable': 'jquery/ui-modules/widgets/draggable',
21+
'jquery-ui-modules/droppable': 'jquery/ui-modules/widgets/droppable',
22+
'jquery-ui-modules/effect-blind': 'jquery/ui-modules/effects/effect-blind',
23+
'jquery-ui-modules/effect-bounce': 'jquery/ui-modules/effects/effect-bounce',
24+
'jquery-ui-modules/effect-clip': 'jquery/ui-modules/effects/effect-clip',
25+
'jquery-ui-modules/effect-drop': 'jquery/ui-modules/effects/effect-drop',
26+
'jquery-ui-modules/effect-explode': 'jquery/ui-modules/effects/effect-explode',
27+
'jquery-ui-modules/effect-fade': 'jquery/ui-modules/effects/effect-fade',
28+
'jquery-ui-modules/effect-fold': 'jquery/ui-modules/effects/effect-fold',
29+
'jquery-ui-modules/effect-highlight': 'jquery/ui-modules/effects/effect-highlight',
30+
'jquery-ui-modules/effect-scale': 'jquery/ui-modules/effects/effect-scale',
31+
'jquery-ui-modules/effect-pulsate': 'jquery/ui-modules/effects/effect-pulsate',
32+
'jquery-ui-modules/effect-shake': 'jquery/ui-modules/effects/effect-shake',
33+
'jquery-ui-modules/effect-slide': 'jquery/ui-modules/effects/effect-slide',
34+
'jquery-ui-modules/effect-transfer': 'jquery/ui-modules/effects/effect-transfer',
35+
'jquery-ui-modules/effect': 'jquery/ui-modules/effect',
36+
'jquery-ui-modules/menu': 'jquery/ui-modules/widgets/menu',
37+
'jquery-ui-modules/mouse': 'jquery/ui-modules/widgets/mouse',
38+
'jquery-ui-modules/position': 'jquery/ui-modules/position',
39+
'jquery-ui-modules/progressbar': 'jquery/ui-modules/widgets/progressbar',
40+
'jquery-ui-modules/resizable': 'jquery/ui-modules/widgets/resizable',
41+
'jquery-ui-modules/selectable': 'jquery/ui-modules/widgets/selectable',
42+
'jquery-ui-modules/slider': 'jquery/ui-modules/widgets/selectmenu',
43+
'jquery-ui-modules/sortable': 'jquery/ui-modules/widgets/sortable',
44+
'jquery-ui-modules/spinner': 'jquery/ui-modules/widgets/spinner',
45+
'jquery-ui-modules/tabs': 'jquery/ui-modules/widgets/tabs',
46+
'jquery-ui-modules/tooltip': 'jquery/ui-modules/widgets/tooltip',
47+
'jquery-ui-modules/widget': 'jquery/ui-modules/widget',
48+
'jquery-ui-modules/timepicker': 'jquery/timepicker'
1449
}
1550
},
1651
shim: {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ var config = {
4040
mixins: {
4141
'Magento_Theme/js/view/breadcrumbs': {
4242
'Magento_Theme/js/view/add-home-breadcrumb': true
43-
},
44-
'jquery/ui-modules/dialog': {
45-
'jquery/patches/jquery-ui': true
4643
}
4744
}
4845
}

‎app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,13 @@
3838
}
3939

4040
.ui-dialog-titlebar-close {
41+
background-color: @color-white;
42+
border-color: @color-white;
4143
cursor: pointer;
42-
.lib-icon-font(
43-
@_icon-font-content: @popup-close-icon__content,
44-
@_icon-font: @popup-close-icon__font,
45-
@_icon-font-size: @popup-close-icon__font-size,
46-
@_icon-font-color: @popup-close-icon__color,
47-
@_icon-font-color-hover: @popup-close-icon__hover__color
48-
);
44+
.lib-icon-font(@_icon-font-content: @popup-close-icon__content, @_icon-font: @popup-close-icon__font, @_icon-font-size: @popup-close-icon__font-size, @_icon-font-color: @popup-close-icon__color, @_icon-font-color-hover: @popup-close-icon__hover__color);
4945
position: absolute;
5046
right: @popup-close-icon__right;
47+
text-shadow: none;
5148
top: @popup-close-icon__top - .3;
5249

5350
.ui-icon {
@@ -57,6 +54,23 @@
5754
&.ui-state-hover {
5855
border: none;
5956
}
57+
58+
&.ui-button-icon-only {
59+
text-indent: -9999px;
60+
white-space: nowrap;
61+
}
62+
63+
&:before {
64+
float: left;
65+
text-indent: 0;
66+
}
67+
68+
&:hover {
69+
background-color: @color-white;
70+
border-color: @color-white;
71+
box-shadow: none;
72+
text-shadow: none;
73+
}
6074
}
6175

6276
.ui-dialog-content {
@@ -416,13 +430,14 @@
416430
// Attribute Popup
417431
// _____________________________________________
418432

419-
.attribute-popup { // ToDo UI: remove or refactor after New attribute popup refactored to sliding panel
433+
// ToDo UI: remove or refactor after New attribute popup refactored to sliding panel
434+
.attribute-popup {
420435
.page-content {
421436
padding: 0;
422437
}
423438
}
424-
425-
.attribute-popup-actions { // ToDo UI: remove or refactor after New attribute popup refactored to sliding panel
439+
// ToDo UI: remove or refactor after New attribute popup refactored to sliding panel
440+
.attribute-popup-actions {
426441
&:extend(.abs-clearfix all);
427442
background: @page-main-actions__background-color;
428443
border-bottom: 1px solid @page-main-actions__border-color;
@@ -433,7 +448,8 @@
433448
float: none;
434449
}
435450

436-
&.fixed { // ToDo UI: remove or refactor after New attribute popup refactored to sliding panel
451+
// ToDo UI: remove or refactor after New attribute popup refactored to sliding panel
452+
&.fixed {
437453
background: @color-white !important;
438454
border-bottom: 0 !important;
439455
left: 0 !important;

‎dev/tests/acceptance/.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
codeception.yml
55
tests/_output/*
66
tests/functional.suite.yml
7-
tests/functional/Magento/FunctionalTest/_generated
7+
tests/functional/Magento/_generated
88
vendor/*
99
mftf.log
1010
/.credentials.example
11-
/utils/
11+
/utils/

‎dev/tests/js/jasmine/tests/lib/mage/dropdown.test.js

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -268,37 +268,29 @@ define([
268268
}, 6);
269269
});
270270

271-
/*
272-
* jQuery ui version 1.9.2 belongs to the adminhtml.
273-
*
274-
* This test will fail on backend since backend's jquery.ui will
275-
* add ui-dialog-titlebar class anyway on create.
276-
*/
277-
if ($.ui.version !== '1.9.2') {
278-
it('check if the title bar is prevented from being created', function () {
279-
var dialog = $('<div/>'),
280-
uiClass = '.ui-dialog',
281-
ui;
282-
283-
dialog.dropdownDialog({
284-
'createTitleBar': true
285-
});
286-
287-
ui = $(uiClass);
288-
expect(ui.find('.ui-dialog-titlebar').length > 0).toBeTruthy();
271+
it('check if the title bar is prevented from being created', function () {
272+
var dialog = $('<div/>'),
273+
uiClass = '.ui-dialog',
274+
ui;
289275

290-
dialog.dropdownDialog('destroy');
276+
dialog.dropdownDialog({
277+
'createTitleBar': true
278+
});
291279

292-
dialog.dropdownDialog({
293-
'createTitleBar': false
294-
});
280+
ui = $(uiClass);
281+
expect(ui.find('.ui-dialog-titlebar').length > 0).toBeTruthy();
295282

296-
ui = $(uiClass);
297-
expect(ui.find('.ui-dialog-titlebar').length <= 0).toBeTruthy();
283+
dialog.dropdownDialog('destroy');
298284

299-
dialog.dropdownDialog('destroy');
285+
dialog.dropdownDialog({
286+
'createTitleBar': false
300287
});
301-
}
288+
289+
ui = $(uiClass);
290+
expect(ui.find('.ui-dialog-titlebar').length <= 0).toBeTruthy();
291+
292+
dialog.dropdownDialog('destroy');
293+
});
302294

303295
it('check if the position function gets disabled', function () {
304296
var dialog = $('<div/>'),

0 commit comments

Comments
 (0)