Merge remote-tracking branch 'trigger/AC-375' into AC-246

kieuphan2406 · kieuphan2406 · commit e4193536de7d · 2021-07-29T16:40:10.000-05:00
diff --git a/dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc-tinymce b/dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc-tinymce
@@ -2,10 +2,6 @@
     "rules": {
         'no-restricted-syntax': [
             'error',
-            {
-                message: "addCommand is removed. Update code to be compatible with tinymce5",
-                selector: "CallExpression[callee.object.name='editor'][callee.property.name='addCommand']"
-            },
             {
                 message: "addButton is removed. Update code to be compatible with tinymce5",
                 selector: "CallExpression[callee.object.name='editor'][callee.property.name='addButton']"
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter.js
@@ -269,6 +269,9 @@ define([
                 }
             };
 
+            // Set default initial height
+            settings['min_height'] = this.config.tinymce['min_height'] ? this.config.tinymce['min_height'] : 250;
+
             if (this.config.skin) {
                 settings.skin = this.config.skin;
             }

Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,9 @@ define([`
`269`	`269`	`}`
`270`	`270`	`};`
`271`	`271`
	`272`	`+ // Set default initial height`
	`273`	`+ settings['min_height'] = this.config.tinymce['min_height'] ? this.config.tinymce['min_height'] : 250;`
	`274`	`+`
`272`	`275`	`if (this.config.skin) {`
`273`	`276`	`settings.skin = this.config.skin;`
`274`	`277`	`}`