Skip to content

Commit fa87f92

Browse files
krissyhiserotekrissyhiserote
committed
AC-106: Upgrade jQuery UI to latest version 1.12.1
1 parent 90733ec commit fa87f92

File tree

173 files changed

+38315
-45101
lines changed

Some content is hidden

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

173 files changed

+38315
-45101
lines changed

‎app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@
3232
3333
require([
3434
'jquery',
35-
'mage/backend/form',
36-
'mage/backend/validation'
35+
'mage/mage'
3736
], function($){
3837
39-
$('#edit_form').form()
40-
.validation({
38+
$('#edit_form').mage('form').mage('validation', {
4139
validationUrl: '{$block->escapeJs($block->getValidationUrl())}',
4240
highlight: function(element) {
4341
var detailsElement = $(element).closest('details');

‎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/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/jquery-ui-timepicker-addon'
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
}

‎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)