Ticket #29307: 29307.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-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

@@ -108 +108 @@
                 // Resize content element
                 if (resizeHeight !== oldSize) {
                         deltaSize = resizeHeight - oldSize;
+                        console.log( resizeHeight, oldSize, parseInt( DOM.getStyle( editor.iframeElement, 'height', true ), 10 ) );
                         DOM.setStyle( editor.iframeElement, 'height', resizeHeight + 'px' );
                         oldSize = resizeHeight;