Skip to content

Commit 6cf0399

Browse files
AC-106: Upgrade jQuery UI to latest version 1.12.1
1 parent 60d2cbb commit 6cf0399

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabOnStageSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-content-type=tab-item]')[{{arg1}} - 1]" parameterized="true"/>
1313
<element name="elementChildren" type="text" selector="(//*[@role=&quot;tabpanel&quot;])[{{arg1}}]//div[contains(@class, &quot;pagebuilder-tab-item&quot;)]//div[contains(@class, &quot;tab-item-container&quot;)]" parameterized="true"/>
1414
<element name="all" type="button" selector=".pagebuilder-tab-item"/>
15-
<element name="moveHandle" type="button" selector="(//div[@data-content-type='tabs'])[{{arg1}}]//li[@role='tab'][{{arg2}}]//span[@class='tab-drag-handle']" parameterized="true"/>
15+
<element name="moveHandle" type="button" selector="(//div[@data-content-type='tabs'])[{{arg1}}]//li[@role='tab'][{{arg2}}]//span[contains(@class, 'tab-drag-handle')]" parameterized="true"/>
1616
<element name="tabHeader" type="button" selector="(//ul[contains(@class, 'tabs-navigation')]//a[contains(@class, 'tab-title')])[{{arg1}}]" parameterized="true"/>
1717
<element name="tabHeaderCSS" type="button" selector="[data-content-type=tabs] [role=presentation]"/>
1818
<element name="tabHeaderEditableTitle" type="button" selector="(//ul[contains(@class, 'tabs-navigation')]//a[contains(@class, 'tab-title')])[{{arg1}}]//span[contains(@contenteditable, 'true')]" parameterized="true"/>

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/buttons/preview.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/preview.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slider/preview.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/panel.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/preview.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export default class Preview extends PreviewCollection {
5252
// Keeps track of number of button item to disable sortable if there is only 1.
5353
this.contentType.children.subscribe(() => {
5454
const sortableElement = $(this.wrapperElement).find(".buttons-container");
55-
if (!sortableElement.data("sortable")) {
55+
if (!sortableElement.data("ui-sortable")) {
5656
return;
5757
}
5858
if (this.contentType.children().length <= 1) {

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/preview.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ export default class Preview extends PreviewCollection {
595595
_.defer(() => {
596596
// Re-enable any disabled sortable areas
597597
group.find(".ui-sortable").each(function() {
598-
if ($(this).data("sortable")) {
598+
if ($(this).data("ui-sortable")) {
599599
$(this).sortable("option", "disabled", false);
600600
}
601601
});
@@ -873,7 +873,7 @@ export default class Preview extends PreviewCollection {
873873
event.pageY < (groupPosition.top + groupPosition.outerHeight) - 20
874874
) {
875875
// Disable the column group sortable instance
876-
if (elementChildrenParent.data("sortable")) {
876+
if (elementChildrenParent.data("ui-sortable")) {
877877
elementChildrenParent.sortable("option", "disabled", true);
878878
}
879879

@@ -892,7 +892,7 @@ export default class Preview extends PreviewCollection {
892892
}
893893
} else if (this.dropOverElement) {
894894
// Re-enable the column group sortable instance
895-
if (elementChildrenParent.data("sortable")) {
895+
if (elementChildrenParent.data("ui-sortable")) {
896896
elementChildrenParent.sortable("option", "disabled", false);
897897
}
898898
this.dropPosition = null;
@@ -917,7 +917,7 @@ export default class Preview extends PreviewCollection {
917917
_.defer(() => {
918918
// Re-enable the column group sortable instance & all children sortable instances
919919
group.parents(".element-children").each(function() {
920-
if ($(this).data("sortable")) {
920+
if ($(this).data("ui-sortable")) {
921921
$(this).sortable("option", "disabled", false);
922922
}
923923
});
@@ -926,7 +926,7 @@ export default class Preview extends PreviewCollection {
926926
activate() {
927927
if (getDraggedContentTypeConfig() === Config.getContentTypeConfig("column")) {
928928
group.find(".ui-sortable").each(function() {
929-
if ($(this).data("sortable")) {
929+
if ($(this).data("ui-sortable")) {
930930
$(this).sortable("option", "disabled", true);
931931
}
932932
});

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slider/preview.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ export default class Preview extends PreviewCollection {
533533
* @param {number} index
534534
*/
535535
private focusElement(event: JQueryEventObject, index: number) {
536-
const handleClassName = $(event.target).data("sortable").options.handle;
536+
const handleClassName = $(event.target).data("ui-sortable").options.handle;
537537

538538
$($(event.target).find(handleClassName)[index]).focus();
539539
}

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/panel.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ export default class Panel {
206206
* size this yields better results when dragging
207207
*/
208208
$(".content-type-container.ui-sortable").each(function() {
209-
if ($(this).data("sortable")) {
209+
if ($(this).data("ui-sortable")) {
210210
$(this).sortable("option", "tolerance", "intersect");
211211
}
212212
});
@@ -217,7 +217,7 @@ export default class Panel {
217217
},
218218
stop() {
219219
$(".content-type-container.ui-sortable").each(function() {
220-
if ($(this).data("sortable")) {
220+
if ($(this).data("ui-sortable")) {
221221
$(this).sortable("option", "tolerance", "pointer");
222222
}
223223
});

0 commit comments

Comments
 (0)