Skip to content

Commit f4f71f9

Browse files
committed
#419: Nested Links If User Adds Link Attribute & Link Widget to Banner/Slide, backward compatibility.
1 parent 17eb009 commit f4f71f9

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed

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

Lines changed: 2 additions & 3 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/utils/nesting-link-dialog.js

Lines changed: 1 addition & 0 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/utils/nesting-widget-dialog.js

Lines changed: 1 addition & 0 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/banner/preview.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,8 @@ export default class Preview extends BasePreview {
260260
});
261261
editor.on("blur", () => {
262262
$(this.element).parents(this.bannerOverlaySelector).zIndex(this.defaultOverlayZIndex);
263+
nestingLinkDialog(this.contentType.dataStore, this.wysiwyg, "message", "link_url");
264+
nestingWidgetDialog(this.contentType.dataStore, this.wysiwyg, "message", "link_url");
263265
});
264266
_.defer(() => {
265267
this.element.blur();
@@ -497,8 +499,6 @@ export default class Preview extends BasePreview {
497499
this.contentType.dataStore.set("message", "");
498500
}
499501
events.trigger(`image:${this.contentType.id}:assignAfter`, imageObject);
500-
nestingLinkDialog(this.contentType.dataStore, this.wysiwyg, "message", "link_url");
501-
nestingWidgetDialog(this.contentType.dataStore, this.wysiwyg, "message", "link_url");
502502
});
503503
this.contentType.dataStore.subscribe(function(data: DataObject) {
504504
if (this.shouldUpdateVideo(data)) {

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/nesting-link-dialog.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ export default function nestingLinkDialog(
3737
linkUrl[linkUrl.type].length !== 0
3838
) {
3939
const inlineEditor = $("#" + wysiwyg.elementId);
40+
inlineEditor.blur();
4041
confirmationDialog({
4142
actions: {
4243
always: () => {

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/nesting-widget-dialog.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export default function nestingWidgetDialog(
3939
linkUrl[linkUrl.type].length !== 0
4040
) {
4141
const inlineEditor = $("#" + wysiwyg.elementId);
42+
inlineEditor.blur();
4243
confirmationDialog({
4344
actions: {
4445
always: () => {

0 commit comments

Comments
 (0)