Skip to content

Commit 797522b

Browse files
committed
Merge remote-tracking branch 'trigger/AC-398' into AC-246
2 parents 9c5052c + 5fd4087 commit 797522b

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/wysiwyg/tinymce.js

Lines changed: 5 additions & 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/wysiwyg/tinymce.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,9 @@ export default class Wysiwyg implements WysiwygInterface {
215215
.find(".tox-tinymce-inline")
216216
.css("top", "");
217217

218-
this.resizeObserver.unobserve(this.getFixedToolbarContainer().find(".tox-tinymce-inline").get(0));
218+
if (this.resizeObserver) {
219+
this.resizeObserver.unobserve(this.getFixedToolbarContainer().find(".tox-tinymce-inline").get(0));
220+
}
219221
this.toolbarHeight = 0;
220222

221223
events.trigger("stage:interactionStop");

0 commit comments

Comments
 (0)