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

@@ -37 +37 @@
                 return parseInt( n, 10 ) || 0;
         }
 
+        function isEmpty() {
+                return editor.getContent( { format: 'raw' } ).replace( /(?:<p[^>]*>)?(?:<br[^>]*>)?(?:<\/p>)?/, '' ) === '';
+        }
+
         /**
          * This method gets executed each time the editor needs to resize.
          */
@@ -48 +52 @@
                         return;
                 }
 
+                if ( isEmpty() ) {
+                        return;
+                }
+
                 doc = editor.getDoc();
                 if ( ! doc ) {
                         return;
@@ -108 +116 @@
                 // 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;