Skip to content

Commit 0978040

Browse files
committed
Merge remote-tracking branch 'trigger/AC-378' into AC-246
2 parents 017e0c4 + 6fa0f57 commit 0978040

File tree

3 files changed

+34
-3
lines changed

3 files changed

+34
-3
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_default.less

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,16 @@
6363
left: -1px !important;
6464
right: -1px;
6565
}
66+
.tox-dialog-wrap {
67+
width: inherit;
68+
69+
.tox-dialog-wrap__backdrop {
70+
height: 120%;
71+
}
72+
.tox-dialog {
73+
max-height: none;
74+
}
75+
}
6676
.pagebuilder-empty-slide {
6777
left: 0;
6878
pointer-events: none;

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/wysiwyg/tinymce/component-initializer.js

Lines changed: 11 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/ts/js/content-type/slide/wysiwyg/tinymce/component-initializer.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import $ from "jquery";
77
import WysiwygEvents from "mage/adminhtml/wysiwyg/events";
8+
import _ from "underscore";
89
import {AdditionalDataConfigInterface} from "../../../../content-type-config.types";
910
import delayUntil from "../../../../utils/delay-until";
1011
import WysiwygComponentInitializerInterface from "../../../../wysiwyg/component-initializer-interface";
@@ -127,6 +128,15 @@ export default class ComponentInitializer implements WysiwygComponentInitializer
127128
() => !this.slideChanging,
128129
10,
129130
);
131+
132+
// Wait for everything else to finish
133+
_.defer(() => {
134+
// Add width for tinymce modal
135+
$(this.activeSlideSelector).find(".tox-tinymce-aux").css(
136+
"width",
137+
$(this.activeSlideSelector).width(),
138+
);
139+
});
130140
}
131141

132142
/**
@@ -151,5 +161,8 @@ export default class ComponentInitializer implements WysiwygComponentInitializer
151161
if (this.autoplay) {
152162
$slider.parent().slick("slickPlay");
153163
}
164+
165+
// Revert width for tinymce modal
166+
$(this.activeSlideSelector).find(".tox-tinymce-aux").css("width", "");
154167
}
155168
}

0 commit comments

Comments
 (0)