Skip to content

Commit dfc712f

Browse files
committed
MC-17868: Break jQuery UI into widgets and make a prototype
- Fix adminhtml requirejs-config; - Fix js unit tests;
1 parent 9331531 commit dfc712f

File tree

8 files changed

+59
-32
lines changed

8 files changed

+59
-32
lines changed

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

Lines changed: 54 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,60 @@ var config = {
2828
},
2929
'map': {
3030
'*': {
31-
'translateInline': 'mage/translate-inline',
32-
'form': 'mage/backend/form',
33-
'button': 'mage/backend/button',
34-
'accordion': 'mage/accordion',
35-
'actionLink': 'mage/backend/action-link',
36-
'validation': 'mage/backend/validation',
37-
'notification': 'mage/backend/notification',
38-
'loader': 'mage/loader_old',
39-
'loaderAjax': 'mage/loader_old',
40-
'floatingHeader': 'mage/backend/floating-header',
41-
'suggest': 'mage/backend/suggest',
42-
'mediabrowser': 'jquery/jstree/jquery.jstree',
43-
'tabs': 'mage/backend/tabs',
44-
'treeSuggest': 'mage/backend/tree-suggest',
45-
'calendar': 'mage/calendar',
46-
'dropdown': 'mage/dropdown_old',
47-
'collapsible': 'mage/collapsible',
48-
'menu': 'mage/backend/menu',
49-
'jstree': 'jquery/jstree/jquery.jstree',
50-
'details': 'jquery/jquery.details',
51-
'jquery-ui-modules/widget': 'jquery/jquery-ui-widget-1.9.2'
31+
'translateInline': 'mage/translate-inline',
32+
'form': 'mage/backend/form',
33+
'button': 'mage/backend/button',
34+
'accordion': 'mage/accordion',
35+
'actionLink': 'mage/backend/action-link',
36+
'validation': 'mage/backend/validation',
37+
'notification': 'mage/backend/notification',
38+
'loader': 'mage/loader_old',
39+
'loaderAjax': 'mage/loader_old',
40+
'floatingHeader': 'mage/backend/floating-header',
41+
'suggest': 'mage/backend/suggest',
42+
'mediabrowser': 'jquery/jstree/jquery.jstree',
43+
'tabs': 'mage/backend/tabs',
44+
'treeSuggest': 'mage/backend/tree-suggest',
45+
'calendar': 'mage/calendar',
46+
'dropdown': 'mage/dropdown_old',
47+
'collapsible': 'mage/collapsible',
48+
'menu': 'mage/backend/menu',
49+
'jstree': 'jquery/jstree/jquery.jstree',
50+
'details': 'jquery/jquery.details',
51+
'jquery-ui-modules/widget': 'jquery/ui',
52+
'jquery-ui-modules/core': 'jquery/ui',
53+
'jquery-ui-modules/accordion': 'jquery/ui',
54+
'jquery-ui-modules/autocomplete': 'jquery/ui',
55+
'jquery-ui-modules/button': 'jquery/ui',
56+
'jquery-ui-modules/datepicker': 'jquery/ui',
57+
'jquery-ui-modules/dialog': 'jquery/ui',
58+
'jquery-ui-modules/draggable': 'jquery/ui',
59+
'jquery-ui-modules/droppable': 'jquery/ui',
60+
'jquery-ui-modules/effect-blind': 'jquery/ui',
61+
'jquery-ui-modules/effect-bounce': 'jquery/ui',
62+
'jquery-ui-modules/effect-clip': 'jquery/ui',
63+
'jquery-ui-modules/effect-drop': 'jquery/ui',
64+
'jquery-ui-modules/effect-explode': 'jquery/ui',
65+
'jquery-ui-modules/effect-fade': 'jquery/ui',
66+
'jquery-ui-modules/effect-fold': 'jquery/ui',
67+
'jquery-ui-modules/effect-highlight': 'jquery/ui',
68+
'jquery-ui-modules/effect-scale': 'jquery/ui',
69+
'jquery-ui-modules/effect-pulsate': 'jquery/ui',
70+
'jquery-ui-modules/effect-shake': 'jquery/ui',
71+
'jquery-ui-modules/effect-slide': 'jquery/ui',
72+
'jquery-ui-modules/effect-transfer': 'jquery/ui',
73+
'jquery-ui-modules/effect': 'jquery/ui',
74+
'jquery-ui-modules/menu': 'jquery/ui',
75+
'jquery-ui-modules/mouse': 'jquery/ui',
76+
'jquery-ui-modules/position': 'jquery/ui',
77+
'jquery-ui-modules/progressbar': 'jquery/ui',
78+
'jquery-ui-modules/resizable': 'jquery/ui',
79+
'jquery-ui-modules/selectable': 'jquery/ui',
80+
'jquery-ui-modules/slider': 'jquery/ui',
81+
'jquery-ui-modules/sortable': 'jquery/ui',
82+
'jquery-ui-modules/spinner': 'jquery/ui',
83+
'jquery-ui-modules/tabs': 'jquery/ui',
84+
'jquery-ui-modules/tooltip': 'jquery/ui'
5285
}
5386
},
5487
'deps': [

dev/tests/integration/testsuite/Magento/Framework/View/_files/static/theme/web/js/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
define([
66
"jquery",
77
"matchMedia",
8-
"jquery/ui",
8+
'jquery-ui-modules/menu',
99
"jquery/jquery.mobile.custom",
1010
"mage/translate"
1111
], function ($, mediaCheck) {

dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
/* eslint-disable max-nested-callbacks */
77
define([
88
'squire',
9-
'jquery',
10-
'jquery/ui'
9+
'jquery'
1110
], function (Squire, $) {
1211
'use strict';
1312

dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/view/product-ids-resolver.test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
define([
88
'squire',
99
'jquery',
10-
'ko',
11-
'jquery/ui'
10+
'ko'
1211
], function (Squire, $, ko) {
1312
'use strict';
1413

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ define([
88
'uiRegistry',
99
'Magento_Ui/js/form/client',
1010
'jquery',
11-
'mageUtils',
12-
'jquery/ui'
11+
'mageUtils'
1312
], function (_, registry, Constr, $, utils) {
1413
'use strict';
1514

dev/tests/js/jasmine/tests/lib/mage/calendar.test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
/* eslint-disable max-nested-callbacks */
77
define([
88
'jquery',
9-
'jquery/ui',
109
'mage/calendar'
1110
], function ($) {
1211
'use strict';

dev/tests/js/jasmine/tests/lib/mage/collapsible.test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
define([
99
'jquery',
10-
'jquery/ui',
1110
'mage/collapsible'
1211
], function ($) {
1312
'use strict';

dev/tests/js/jasmine/tests/lib/mage/tabs.test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
/* eslint-disable max-nested-callbacks */
77
define([
88
'jquery',
9-
'jquery/ui',
109
'mage/tabs',
1110
'text!tests/assets/lib/web/mage/tabs.html'
12-
], function ($, ui, tabs, tabsTmpl) {
11+
], function ($, tabs, tabsTmpl) {
1312
'use strict';
1413

1514
describe('mage/tabs', function () {

0 commit comments

Comments
 (0)