Merge pull request #1660 from creative-commoners/pulls/2.1/fix-elemen…

…tal-htmleditor FIX HTMLEditorField::setRows with Elemental
silverstripe · Jan 25, 2024 · 20dbe25 · 20dbe25
2 parents bcd15c1 + 799add9
commit 20dbe25
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/legacy/HtmlEditorField.js b/client/src/legacy/HtmlEditorField.js
@@ -66,6 +66,9 @@ ss.editorWrappers.tinyMCE = (function() {
     },
 
     setHeight: function (event, height) {
+      if (typeof height === 'undefined') {
+        return;
+      }
       if (event.target && event.target.iframeElement) {
         event.target.iframeElement.height = height !== '' ? 'auto' : height;
         const parentDiv = event.target.iframeElement.closest('.tox-sidebar-wrap');
@@ -83,6 +86,7 @@ ss.editorWrappers.tinyMCE = (function() {
     getConfig: function() {
       var selector = "#" + editorID,
         config = jQuery(selector).data('config'),
+        height = config.row_height ? config.row_height : 'undefined',
         self = this;
 
       // Add instance specific data to config
@@ -94,7 +98,6 @@ ss.editorWrappers.tinyMCE = (function() {
           self.save();
         });
         ed.on('init', (event) => {
-          let height = document.querySelector(config.selector).style.height;
           self.setHeight(event, height);
         });
         ed.on('ResizeEditor', (event) => {