Skip to content

Commit 85b8882

Browse files
committed
Merge remote-tracking branch 'performance-ce/MC-19591' into MC-19587
# Conflicts: # app/code/Magento/Theme/view/base/requirejs-config.js
2 parents 023a47d + 37a0e7a commit 85b8882

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
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
@@ -29,7 +29,8 @@ var config = {
2929
},
3030
'matchMedia': {
3131
'exports': 'mediaCheck'
32-
}
32+
},
33+
'magnifier/magnifier': ['jquery']
3334
},
3435
'paths': {
3536
'jquery/validate': 'jquery/jquery.validate',

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

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

66
define([
7-
'jquery'
7+
'jquery',
8+
'jquery/ui'
89
], function ($) {
910
'use strict';
1011

0 commit comments

Comments
 (0)