Skip to content

Commit 0d29cd0

Browse files
committed
Merge remote-tracking branch 'performance-ce/MC-19246' into MC-19242
# Conflicts: # app/code/Magento/Theme/view/base/requirejs-config.js
2 parents 217ee88 + f6cffdc commit 0d29cd0

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ var config = {
2525
'MutationObserver': ['es6-collections'],
2626
'matchMedia': {
2727
'exports': 'mediaCheck'
28-
}
28+
},
29+
'magnifier/magnifier': ['jquery']
2930
},
3031
'paths': {
3132
'jquery/validate': 'jquery/jquery.validate',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ var config = {
4444
'Magento_Theme/js/view/breadcrumbs': {
4545
'Magento_Theme/js/view/add-home-breadcrumb': true
4646
},
47-
'jquery/jquery-ui': {
47+
'jquery/ui-modules/dialog': {
4848
'jquery/patches/jquery-ui': true
4949
}
5050
}

lib/web/jquery/patches/jquery-ui.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
*/
55

66
define([
7-
'jquery'
7+
'jquery',
8+
'jquery-ui-modules/widget'
9+
// 'jquery-ui-modules/dialog' - do not enable this dependency because this is already a mixin for the dialog ui component
810
], function ($) {
911
'use strict';
1012

0 commit comments

Comments
 (0)