Skip to content

Commit a8ea7a1

Browse files
committed
MC-3486: Need basic conflict resolution for toolbar in MC-1416
- Stabilization
1 parent e34fdd2 commit a8ea7a1

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/wysiwyg.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/ts/js/content-type/text/preview.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export default class Preview extends BasePreview {
5151
*/
5252
private onFocus() {
5353
$(this.element).closest(
54-
this.config.additional_data.wysiwygConfig.parentSelectorsToUnderlay.join(",")
54+
this.config.additional_data.wysiwygConfig.parentSelectorsToUnderlay.join(","),
5555
).css("z-index", 100);
5656
}
5757

@@ -61,7 +61,7 @@ export default class Preview extends BasePreview {
6161
*/
6262
private onBlur() {
6363
$(this.element).closest(
64-
this.config.additional_data.wysiwygConfig.parentSelectorsToUnderlay.join(",")
64+
this.config.additional_data.wysiwygConfig.parentSelectorsToUnderlay.join(","),
6565
).css("z-index", "");
6666
}
6767
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ export default class Wysiwyg {
8080

8181
// Wait for everything else to finish
8282
_.defer(() => {
83-
$(config.adapter.settings.fixed_toolbar_container + ' .mce-tinymce-inline').css('min-width', minToolbarWidth + "px");
84-
})
83+
$(config.adapter.settings.fixed_toolbar_container + " .mce-tinymce-inline")
84+
.css("min-width", minToolbarWidth + "px");
85+
});
8586
});
8687

8788
// resume normal interactability with opens when leaving editing mode

0 commit comments

Comments
 (0)