Ticket #36482: 36482.5.patch

src/wp-admin/js/editor-expand.js

@@ -76 +76 @@
                 }
 
                 function textEditorResize() {
-                        var reduce, scrollHeight;
+                        var scrollHeight;
 
                         if ( mceEditor && ! mceEditor.isHidden() ) {
                                 return;
@@ -86 +86 @@
                                 return;
                         }
 
-                        reduce = textEditorLength > ( textEditorLength = textEditor.value.length );
-                        scrollHeight = textEditor.scrollHeight;
-
-                        if ( reduce ) {
+                        if ( textEditorLength > ( textEditorLength = textEditor.value.length ) ) {
                                 textEditor.style.height = 'auto';
-                                textEditor.style.height = scrollHeight + 'px';
-                                adjust();
-                        } else if ( parseInt( textEditor.style.height, 10 ) < scrollHeight ) {
-                                textEditor.style.height = scrollHeight + 'px';
+                                scrollHeight = textEditor.scrollHeight;
+
+                                if ( scrollHeight < autoresizeMinHeight ) {
+                                        textEditor.style.height = autoresizeMinHeight + 'px';
+                                } else {
+                                        textEditor.style.height = scrollHeight + 'px';
+                                }
+
                                 adjust();
+                        } else {
+                                scrollHeight = textEditor.scrollHeight;
+
+                                if ( parseInt( textEditor.style.height, 10 ) < scrollHeight ) {
+                                        textEditor.style.height = scrollHeight + 'px';
+                                        adjust();
+                                }
                         }
                 }