Ticket #29307: 29307.4.patch

src/wp-admin/edit-form-advanced.php

@@ -496 +496 @@
         'dfw' => true,
         'drag_drop_upload' => true,
         'tabfocus_elements' => 'insert-media-button-1,save-post',
-        'editor_height' => 360,
+        'editor_height' => 300,
         'tinymce' => array(
                 'resize' => false,
                 'wp_autoresize_on' => ( ! empty( $_wp_autoresize_on ) && get_user_setting( 'editor_expand', 'on' ) === 'on' ),

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

@@ -34 +34 @@
                 pageYOffsetAtTop = 130,
                 pinnedToolsTop = 56,
                 autoresizeMinHeight = 300,
+                initialMode = window.getUserSetting( 'editor' ),
                 // These are corrected when adjust() runs, except on scrolling if already set.
                 heights = {
                         windowHeight: 0,
@@ -119 +120 @@
         }
 
         function textEditorResize() {
-                if ( mceEditor && ! mceEditor.isHidden() ) {
+                if ( ( mceEditor && ! mceEditor.isHidden() ) || ( ! mceEditor && initialMode === 'tinymce' ) ) {
                         return;
                 }
 

src/wp-includes/class-wp-editor.php

@@ -112 +112 @@
                 if ( empty( $set['editor_height'] ) )
                         return $set;
 
-                if ( 'content' === $editor_id ) {
+                if ( 'content' === $editor_id && empty( $set['tinymce']['wp_autoresize_on'] ) ) {
                         // A cookie (set when a user resizes the editor) overrides the height.
                         $cookie = (int) get_user_setting( 'ed_size' );
 

src/wp-includes/js/tinymce/plugins/wpautoresize/plugin.js

@@ -22 +22 @@
  */
 tinymce.PluginManager.add( 'wpautoresize', function( editor ) {
         var settings = editor.settings,
-                oldSize = 0,
+                oldSize = 300,
                 isActive = false;
 
         function isFullscreen() {