Skip to content

Commit ee030f0

Browse files
committed
Merge remote-tracking branch 'origin/AC-2544-update-jquery-ui' into AC-2425-update-elasticsearch-7.17
2 parents 8037056 + accd206 commit ee030f0

Some content is hidden

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

56 files changed

+18102
-18388
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,6 @@ var config = {
8888
'mage/backend/bootstrap',
8989
'mage/adminhtml/globals'
9090
],
91-
config: {
92-
mixins: {
93-
'jquery/jquery-ui': {
94-
'jquery/patches/jquery-ui-sortable': true
95-
}
96-
}
97-
},
9891
'paths': {
9992
'jquery/ui': 'jquery/jquery-ui'
10093
}

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/widgets/sortable': {
45-
'jquery/patches/jquery-ui-sortable': true
4643
}
4744
}
4845
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
<item type="file">Lib::chartjs/Chart.min.js</item>
263263
<item type="file">Lib::chartjs/chartjs-adapter-moment.js</item>
264264
<item type="file">Lib::jquery/jquery.min.js</item>
265-
<item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
265+
<item type="file">Lib::jquery/jquery-ui.js</item>
266266
<item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>
267267
<item type="file">Lib::requirejs/require.js</item>
268268
<item type="file">Lib::requirejs/text.js</item>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
<item type="file">Lib::chartjs/Chart.min.js</item>
274274
<item type="file">Lib::chartjs/chartjs-adapter-moment.js</item>
275275
<item type="file">Lib::jquery/jquery.min.js</item>
276-
<item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
276+
<item type="file">Lib::jquery/jquery-ui.js</item>
277277
<item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>
278278
<item type="file">Lib::requirejs/require.js</item>
279279
<item type="file">Lib::requirejs/text.js</item>

dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/etc/view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</vars>
1212
<exclude>
1313
<item type="file">Lib::jquery/jquery.min.js</item>
14-
<item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
14+
<item type="file">Lib::jquery/jquery-ui.js</item>
1515
<item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>
1616
<item type="file">Lib::requirejs/require.js</item>
1717
<item type="file">Lib::requirejs/text.js</item>

0 commit comments

Comments
 (0)